70e3c0c
From 00d61f21bfa3ccf40826ce22de12cfeeab8a40a5 Mon Sep 17 00:00:00 2001
70e3c0c
From: "Dmitry V. Levin" <ldv@altlinux.org>
70e3c0c
Date: Mon, 1 Apr 2019 02:23:59 +0300
70e3c0c
Subject: [PATCH] Revert "configure.ac: fix pkg_check_modules calls"
70e3c0c
MIME-Version: 1.0
70e3c0c
Content-Type: text/plain; charset=UTF-8
70e3c0c
Content-Transfer-Encoding: 8bit
70e3c0c
70e3c0c
CFLAGS and LIBS are variables that users are entitled to modify in order
70e3c0c
to compile the package, so do not tamper with CFLAGS and LIBS.
70e3c0c
70e3c0c
COM_ERR_CFLAGS, EXT2FS_CFLAGS, DBUS_CFLAGS, LIBNL3_CFLAGS, TIRPC_CFLAGS,
70e3c0c
COMM_ERR_LIBS, EXT2FS_LIBS, DBUS_LIBS, LIBNL3_LIBS, and TIRPC_LIBS
70e3c0c
should be used directly where appropriate and apparently they already
70e3c0c
are.
70e3c0c
70e3c0c
This reverts commit b54d97d677481287faa5d6b98c92f111141c1af3.
70e3c0c
70e3c0c
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
70e3c0c
Signed-off-by: Jan Kara <jack@suse.cz>
70e3c0c
Signed-off-by: Petr Písař <ppisar@redhat.com>
70e3c0c
---
70e3c0c
 configure.ac | 10 +++++-----
70e3c0c
 1 file changed, 5 insertions(+), 5 deletions(-)
70e3c0c
70e3c0c
diff --git a/configure.ac b/configure.ac
70e3c0c
index e8e6412..ff7b9df 100644
70e3c0c
--- a/configure.ac
70e3c0c
+++ b/configure.ac
70e3c0c
@@ -104,13 +104,13 @@ AC_ARG_ENABLE([ext2direct],
70e3c0c
 )
70e3c0c
 AS_IF([test "x$enable_ext2direct" != "xno"], [
70e3c0c
     build_ext2direct="yes"
70e3c0c
-    PKG_CHECK_MODULES([COM_ERR],[com_err], [CFLAGS="$CFLAGS $COM_ERR_CFLAGS" LIBS="$LIBS $COMM_ERR_LIBS"], [
70e3c0c
+    PKG_CHECK_MODULES([COM_ERR],[com_err], [], [
70e3c0c
         build_ext2direct="no"
70e3c0c
         AS_IF([test "x$enable_ext2direct" = "xyes"], [
70e3c0c
             AC_MSG_ERROR([Ext2direct requested but required com_err library not found])
70e3c0c
         ])
70e3c0c
     ])
70e3c0c
-    PKG_CHECK_MODULES([EXT2FS],[ext2fs], [CFLAGS="$CFLAGS $EXT2FS_CFLAGS" LIBS="$LIBS $EXT2FS_LIBS"], [
70e3c0c
+    PKG_CHECK_MODULES([EXT2FS],[ext2fs], [], [
70e3c0c
         build_ext2direct="no"
70e3c0c
         AS_IF([test "x$enable_ext2direct" = "xyes"], [
70e3c0c
             AC_MSG_ERROR([Ext2direct requested but required ext2fs library not found])
70e3c0c
@@ -138,13 +138,13 @@ AC_ARG_ENABLE([netlink],
70e3c0c
 )
70e3c0c
 AS_IF([test "x$enable_netlink" != "xno"], [
70e3c0c
     build_netlink="yes"
70e3c0c
-    PKG_CHECK_MODULES([DBUS], [dbus-1], [CFLAGS="$CFLAGS $DBUS_CFLAGS" LIBS="$LIBS $DBUS_LIBS"], [
70e3c0c
+    PKG_CHECK_MODULES([DBUS], [dbus-1], [], [
70e3c0c
         build_netlink="no"
70e3c0c
         AS_IF([test "x$enable_netlink" = "xyes"] , [
70e3c0c
             AC_MSG_ERROR([Required dbus libraries for quota netlink daemon not found.])
70e3c0c
         ])
70e3c0c
     ])
70e3c0c
-    PKG_CHECK_MODULES([LIBNL3], [libnl-3.0 >= 3.1 libnl-genl-3.0], [CFLAGS="$CFLAGS $LIBNL3_CFLAGS" LIBS="$LIBS $LIBNL3_LIBS"], [
70e3c0c
+    PKG_CHECK_MODULES([LIBNL3], [libnl-3.0 >= 3.1 libnl-genl-3.0], [], [
70e3c0c
         build_netlink="no"
70e3c0c
         AS_IF([test "x$enable_netlink" = "xyes"] , [
70e3c0c
             AC_MSG_ERROR([Required libnl3 libraries for quota netlink daemon not found.])
70e3c0c
@@ -207,7 +207,7 @@ AS_IF([test x"$enable_rpc" != "xno"], [
70e3c0c
 	build_rpc="no"
70e3c0c
     ])
70e3c0c
 
70e3c0c
-    PKG_CHECK_MODULES([TIRPC], [libtirpc], [CFLAGS="$CFLAGS $TIRPC_CFLAGS" LIBS="$LIBS $TIRPC_LIBS"], [
70e3c0c
+    PKG_CHECK_MODULES([TIRPC], [libtirpc], [], [
70e3c0c
 	AS_IF([test x"$enable_rpc" = "xyes"], [
70e3c0c
 	    AC_MSG_ERROR([could not locate required libtirpc])
70e3c0c
 	], [
70e3c0c
-- 
70e3c0c
2.20.1
70e3c0c