summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorChristian Heimes <christian@python.org>2022-07-27 10:51:36 (GMT)
committerGitHub <noreply@github.com>2022-07-27 10:51:36 (GMT)
commitc72c1d65cbdd14c6984285100bb8f16b982b7b33 (patch)
tree88dbf9c8090fbd2096a035375443fb333b4dd5b9 /configure
parent9640c4c88cb3b0dfef88d5a00daa3a02eff6347d (diff)
downloadcpython-c72c1d65cbdd14c6984285100bb8f16b982b7b33.zip
cpython-c72c1d65cbdd14c6984285100bb8f16b982b7b33.tar.gz
cpython-c72c1d65cbdd14c6984285100bb8f16b982b7b33.tar.bz2
[3.11] gh-94801: Fix regression in configure's CPPFLAGS handling (GH-95288) (GH-95297)
(cherry picked from commit 9af7f87d763ed6e1c5f56ae40d8242ab22866b33) Co-authored-by: Christian Heimes <christian@python.org>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure26
1 files changed, 13 insertions, 13 deletions
diff --git a/configure b/configure
index 378103a..19316ba 100755
--- a/configure
+++ b/configure
@@ -11180,7 +11180,7 @@ save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
- CPPFLAGS="$CFLAGS $LIBUUID_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $LIBUUID_CFLAGS"
LDFLAGS="$LDFLAGS $LIBUUID_LIBS"
for ac_header in uuid/uuid.h
do :
@@ -11309,7 +11309,7 @@ save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
- CPPFLAGS="$CFLAGS $LIBUUID_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $LIBUUID_CFLAGS"
LDFLAGS="$LDFLAGS $LIBUUID_LIBS"
for ac_header in uuid/uuid.h
do :
@@ -12352,7 +12352,7 @@ save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
- CPPFLAGS="$LIBNSL_CFLAGS $CFLAGS"
+ CPPFLAGS="$CPPFLAGS $LIBNSL_CFLAGS"
for ac_header in rpc/rpc.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "rpc/rpc.h" "ac_cv_header_rpc_rpc_h" "$ac_includes_default"
@@ -12485,7 +12485,7 @@ save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
- CPPFLAGS="$LIBSQLITE3_CFLAGS $CFLAGS"
+ CPPFLAGS="$CPPFLAGS $LIBSQLITE3_CFLAGS"
LDFLAGS="$LIBSQLITE3_LIBS $LDFLAGS"
ac_fn_c_check_header_mongrel "$LINENO" "sqlite3.h" "ac_cv_header_sqlite3_h" "$ac_includes_default"
@@ -13431,7 +13431,7 @@ save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
- CPPFLAGS="$TCLTK_CFLAGS $CFLAGS"
+ CPPFLAGS="$CPPFLAGS $TCLTK_CFLAGS"
LIBS="$TCLTK_LIBS $LDFLAGS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13496,7 +13496,7 @@ save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
- CPPFLAGS="$GDBM_CFLAGS $CFLAGS"
+ CPPFLAGS="$CPPFLAGS $GDBM_CFLAGS"
LDFLAGS="$GDBM_LIBS $LDFLAGS"
for ac_header in gdbm.h
do :
@@ -16020,7 +16020,7 @@ save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
- CPPFLAGS="$CFLAGS $ZLIB_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS"
LDFLAGS="$LDFLAGS $ZLIB_LIBS"
for ac_header in zlib.h
do :
@@ -16150,7 +16150,7 @@ save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
- CPPFLAGS="$CFLAGS $ZLIB_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS"
LDFLAGS="$LDFLAGS $ZLIB_LIBS"
for ac_header in zlib.h
do :
@@ -16368,7 +16368,7 @@ save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
- CPPFLAGS="$CFLAGS $BZIP2_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $BZIP2_CFLAGS"
LDFLAGS="$LDFLAGS $BZIP2_LIBS"
for ac_header in bzlib.h
do :
@@ -16451,7 +16451,7 @@ save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
- CPPFLAGS="$CFLAGS $BZIP2_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $BZIP2_CFLAGS"
LDFLAGS="$LDFLAGS $BZIP2_LIBS"
for ac_header in bzlib.h
do :
@@ -16598,7 +16598,7 @@ save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
- CPPFLAGS="$CFLAGS $LIBLZMA_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $LIBLZMA_CFLAGS"
LDFLAGS="$LDFLAGS $LIBLZMA_LIBS"
for ac_header in lzma.h
do :
@@ -16681,7 +16681,7 @@ save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
- CPPFLAGS="$CFLAGS $LIBLZMA_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $LIBLZMA_CFLAGS"
LDFLAGS="$LDFLAGS $LIBLZMA_LIBS"
for ac_header in lzma.h
do :
@@ -17508,7 +17508,7 @@ save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
- CPPFLAGS="$LIBCRYPT_CFLAGS $CFLAGS"
+ CPPFLAGS="$CPPFLAGS $LIBCRYPT_CFLAGS"
LIBS="$LIBCRYPT_LIBS $LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt or crypt_r" >&5
$as_echo_n "checking for crypt or crypt_r... " >&6; }