configure: correctly set up CFLAGS while setting up libarchive

Fix a regression where the debugging options ("-g -O") got dropped
while setting up the include path for libarchive.

Fixes: c54a2e825847 ("Use the libarchive library reported by pkg-config")
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/configure b/configure
index 6518f36439c080f2763139e0b5f78e8c8aacdf5b..2ed61db3602dc9d86184134a8162d668c5d9d61f 100755 (executable)
--- a/configure
+++ b/configure
@@ -13984,7 +13984,7 @@ printf "%s\n" "yes" >&6; }
 
        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: pkg-config found libarchive" >&5
 printf "%s\n" "pkg-config found libarchive" >&6; }
-       CFLAGS="$ARCHIVE_CFLAGS $CPPFLAGS"
+       CFLAGS="$ARCHIVE_CFLAGS $CFLAGS"
 
 fi
     if test -n "$ARCHIVE_LIBS" ; then

diff --git a/configure.ac b/configure.ac
index 7c20035c0ec12eb8682ad41b78c2f24ff5c93af2..bdd5f1f69d267def9d2db74c6fd489c03909bbc8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1343,7 +1343,7 @@ then
     PKG_CHECK_MODULES([ARCHIVE],[libarchive],
     [
        AC_MSG_RESULT([pkg-config found libarchive])
-       CFLAGS="$ARCHIVE_CFLAGS $CPPFLAGS"
+       CFLAGS="$ARCHIVE_CFLAGS $CFLAGS"
     ],[
         AC_CHECK_LIB(archive, archive_read_new, [ARCHIVE_LIBS=-larchive])
     ])