summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorChristian Heimes <christian@python.org>2022-07-26 19:39:04 (GMT)
committerGitHub <noreply@github.com>2022-07-26 19:39:04 (GMT)
commit9af7f87d763ed6e1c5f56ae40d8242ab22866b33 (patch)
tree255e85f22679e0b6ed5c36d2fcf8a6b461bfd8dd /configure
parent152eb90311fdf294510b5d077332580ba18c0ee4 (diff)
downloadcpython-9af7f87d763ed6e1c5f56ae40d8242ab22866b33.zip
cpython-9af7f87d763ed6e1c5f56ae40d8242ab22866b33.tar.gz
cpython-9af7f87d763ed6e1c5f56ae40d8242ab22866b33.tar.bz2
gh-94801: Fix regression in configure's CPPFLAGS handling (GH-95288)
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure40
1 files changed, 20 insertions, 20 deletions
diff --git a/configure b/configure
index be045f2..6190680 100755
--- a/configure
+++ b/configure
@@ -11273,7 +11273,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 :
@@ -11402,7 +11402,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 :
@@ -12122,7 +12122,7 @@ save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
- CPPFLAGS="$CFLAGS $LIBFFI_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $LIBFFI_CFLAGS"
LDFLAGS="$LDFLAGS $LIBFFI_LIBS"
ac_fn_c_check_header_mongrel "$LINENO" "ffi.h" "ac_cv_header_ffi_h" "$ac_includes_default"
if test "x$ac_cv_header_ffi_h" = xyes; then :
@@ -12195,7 +12195,7 @@ save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
- CPPFLAGS="$CFLAGS $LIBFFI_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $LIBFFI_CFLAGS"
LDFLAGS="$LDFLAGS $LIBFFI_LIBS"
ac_fn_c_check_header_mongrel "$LINENO" "ffi.h" "ac_cv_header_ffi_h" "$ac_includes_default"
if test "x$ac_cv_header_ffi_h" = xyes; then :
@@ -12879,7 +12879,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"
@@ -13012,7 +13012,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"
@@ -13958,7 +13958,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
@@ -14023,7 +14023,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 :
@@ -16610,7 +16610,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 :
@@ -16740,7 +16740,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 :
@@ -16958,7 +16958,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 :
@@ -17041,7 +17041,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 :
@@ -17188,7 +17188,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 :
@@ -17271,7 +17271,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 :
@@ -18098,7 +18098,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; }
@@ -20687,7 +20687,7 @@ save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
- CPPFLAGS="$CFLAGS $LIBREADLINE_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $LIBREADLINE_CFLAGS"
LDFLAGS="$LDFLAGS $LIBREADLINE_LIBS"
for ac_header in readline/readline.h
do :
@@ -20768,7 +20768,7 @@ save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
- CPPFLAGS="$CFLAGS $LIBREADLINE_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $LIBREADLINE_CFLAGS"
LDFLAGS="$LDFLAGS $LIBREADLINE_LIBS"
for ac_header in readline/readline.h
do :
@@ -20921,7 +20921,7 @@ save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
- CPPFLAGS="$CFLAGS $LIBEDIT_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $LIBEDIT_CFLAGS"
LDFLAGS="$LDFLAGS $LIBEDIT_LIBS"
for ac_header in editline/readline.h
do :
@@ -21004,7 +21004,7 @@ save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
- CPPFLAGS="$CFLAGS $LIBEDIT_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $LIBEDIT_CFLAGS"
LDFLAGS="$LDFLAGS $LIBEDIT_LIBS"
for ac_header in editline/readline.h
do :
@@ -21113,7 +21113,7 @@ save_LDFLAGS=$LDFLAGS
save_LIBS=$LIBS
- CPPFLAGS="$READLINE_CFLAGS $CFLAGS"
+ CPPFLAGS="$CPPFLAGS $READLINE_CFLAGS"
LIBS="$READLINE_LIBS $LIBS"
LIBS_SAVE=$LIBS