From: Theodore Ts'o <tytso@mit.edu>
Date: Wed, 2 Jul 2025 19:22:46 +0000 (-0400)
Subject: configure: correctly set up CFLAGS while setting up libarchive
X-Git-Tag: v1.47.3-rc3~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=00f71b527f31381f34fc32bfb3c719e8dbf57487;p=thirdparty%2Fe2fsprogs.git

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 6518f364..2ed61db3 100755
--- 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 7c20035c..bdd5f1f6 100644
--- 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])
     ])