@@ -3394,7 +3394,7 @@ AS_VAR_IF([have_uuid], [missing], [
3394
3394
AC_DEFINE ( [ HAVE_UUID_GENERATE_TIME_SAFE] , [ 1] )
3395
3395
] , [
3396
3396
WITH_SAVE_ENV([
3397
- CPPFLAGS="$CFLAGS $LIBUUID_CFLAGS"
3397
+ CPPFLAGS="$CPPFLAGS $LIBUUID_CFLAGS"
3398
3398
LDFLAGS="$LDFLAGS $LIBUUID_LIBS"
3399
3399
AC_CHECK_HEADERS ( [ uuid/uuid.h] , [
3400
3400
PY_CHECK_LIB([ uuid] , [ uuid_generate_time] , [ have_uuid=yes] )
@@ -3625,7 +3625,7 @@ have_libffi=missing
3625
3625
AS_VAR_IF ( [ with_system_ffi] , [ yes] , [
3626
3626
PKG_CHECK_MODULES([ LIBFFI] , [ libffi] , [ have_libffi=yes] , [
3627
3627
WITH_SAVE_ENV([
3628
- CPPFLAGS="$CFLAGS $LIBFFI_CFLAGS"
3628
+ CPPFLAGS="$CPPFLAGS $LIBFFI_CFLAGS"
3629
3629
LDFLAGS="$LDFLAGS $LIBFFI_LIBS"
3630
3630
AC_CHECK_HEADER ( [ ffi.h] , [
3631
3631
AC_CHECK_LIB ( [ ffi] , [ ffi_call] , [
@@ -3798,7 +3798,7 @@ PKG_CHECK_MODULES([LIBNSL], [libnsl], [have_nis=yes], [
3798
3798
3799
3799
AS_VAR_IF ( [ have_nis] , [ yes] , [
3800
3800
WITH_SAVE_ENV([
3801
- CPPFLAGS="$LIBNSL_CFLAGS $CFLAGS "
3801
+ CPPFLAGS="$CPPFLAGS $LIBNSL_CFLAGS "
3802
3802
AC_CHECK_HEADERS ( [ rpc/rpc.h] )
3803
3803
] )
3804
3804
] )
@@ -3831,7 +3831,7 @@ AC_DEFUN([PY_CHECK_SQLITE_FUNC], [
3831
3831
WITH_SAVE_ENV([
3832
3832
dnl bpo-45774/GH-29507: The CPP check in AC_CHECK_HEADER can fail on FreeBSD,
3833
3833
dnl hence CPPFLAGS instead of CFLAGS.
3834
- CPPFLAGS="$LIBSQLITE3_CFLAGS $CFLAGS "
3834
+ CPPFLAGS="$CPPFLAGS $LIBSQLITE3_CFLAGS "
3835
3835
LDFLAGS="$LIBSQLITE3_LIBS $LDFLAGS"
3836
3836
3837
3837
AC_CHECK_HEADER ( [ sqlite3.h] , [
@@ -3935,7 +3935,7 @@ AS_CASE([$ac_sys_system],
3935
3935
)
3936
3936
3937
3937
WITH_SAVE_ENV([
3938
- CPPFLAGS="$TCLTK_CFLAGS $CFLAGS "
3938
+ CPPFLAGS="$CPPFLAGS $TCLTK_CFLAGS "
3939
3939
LIBS="$TCLTK_LIBS $LDFLAGS"
3940
3940
3941
3941
AC_LINK_IFELSE ( [
@@ -3977,7 +3977,7 @@ dnl NOTE: gdbm does not provide a pkgconf file.
3977
3977
AC_ARG_VAR ( [ GDBM_CFLAGS] , [ C compiler flags for gdbm] )
3978
3978
AC_ARG_VAR ( [ GDBM_LIBS] , [ additional linker flags for gdbm] )
3979
3979
WITH_SAVE_ENV([
3980
- CPPFLAGS="$GDBM_CFLAGS $CFLAGS "
3980
+ CPPFLAGS="$CPPFLAGS $GDBM_CFLAGS "
3981
3981
LDFLAGS="$GDBM_LIBS $LDFLAGS"
3982
3982
AC_CHECK_HEADERS ( [ gdbm.h] , [
3983
3983
AC_CHECK_LIB ( [ gdbm] , [ gdbm_open] , [
@@ -4830,7 +4830,7 @@ PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.0], [
4830
4830
AC_DEFINE ( [ HAVE_ZLIB_COPY] , [ 1] )
4831
4831
] , [
4832
4832
WITH_SAVE_ENV([
4833
- CPPFLAGS="$CFLAGS $ZLIB_CFLAGS"
4833
+ CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS"
4834
4834
LDFLAGS="$LDFLAGS $ZLIB_LIBS"
4835
4835
AC_CHECK_HEADERS ( [ zlib.h] , [
4836
4836
PY_CHECK_LIB([ z] , [ gzread] , [ have_zlib=yes] , [ have_zlib=no] )
@@ -4854,7 +4854,7 @@ PY_CHECK_EMSCRIPTEN_PORT([BZIP2], [-sUSE_BZIP2])
4854
4854
4855
4855
PKG_CHECK_MODULES([ BZIP2] , [ bzip2] , [ have_bzip2=yes] , [
4856
4856
WITH_SAVE_ENV([
4857
- CPPFLAGS="$CFLAGS $BZIP2_CFLAGS"
4857
+ CPPFLAGS="$CPPFLAGS $BZIP2_CFLAGS"
4858
4858
LDFLAGS="$LDFLAGS $BZIP2_LIBS"
4859
4859
AC_CHECK_HEADERS ( [ bzlib.h] , [
4860
4860
AC_CHECK_LIB ( [ bz2] , [ BZ2_bzCompress] , [ have_bzip2=yes] , [ have_bzip2=no] )
@@ -4868,7 +4868,7 @@ PKG_CHECK_MODULES([BZIP2], [bzip2], [have_bzip2=yes], [
4868
4868
4869
4869
PKG_CHECK_MODULES([ LIBLZMA] , [ liblzma] , [ have_liblzma=yes] , [
4870
4870
WITH_SAVE_ENV([
4871
- CPPFLAGS="$CFLAGS $LIBLZMA_CFLAGS"
4871
+ CPPFLAGS="$CPPFLAGS $LIBLZMA_CFLAGS"
4872
4872
LDFLAGS="$LDFLAGS $LIBLZMA_LIBS"
4873
4873
AC_CHECK_HEADERS ( [ lzma.h] , [
4874
4874
AC_CHECK_LIB ( [ lzma] , [ lzma_easy_encoder] , [ have_liblzma=yes] , [ have_liblzma=no] )
@@ -4960,7 +4960,7 @@ PKG_CHECK_MODULES([LIBCRYPT], [libxcrypt >= 3.1.1], [
4960
4960
] )
4961
4961
4962
4962
WITH_SAVE_ENV([
4963
- CPPFLAGS="$LIBCRYPT_CFLAGS $CFLAGS "
4963
+ CPPFLAGS="$CPPFLAGS $LIBCRYPT_CFLAGS "
4964
4964
LIBS="$LIBCRYPT_LIBS $LIBS"
4965
4965
AC_CACHE_CHECK ( [ for crypt or crypt_r] , [ ac_cv_crypt_crypt] , [
4966
4966
AC_LINK_IFELSE ( [ AC_LANG_PROGRAM ( [
@@ -5845,7 +5845,7 @@ AS_VAR_IF([with_readline], [readline], [
5845
5845
READLINE_LIBS=$LIBREADLINE_LIBS
5846
5846
] , [
5847
5847
WITH_SAVE_ENV([
5848
- CPPFLAGS="$CFLAGS $LIBREADLINE_CFLAGS"
5848
+ CPPFLAGS="$CPPFLAGS $LIBREADLINE_CFLAGS"
5849
5849
LDFLAGS="$LDFLAGS $LIBREADLINE_LIBS"
5850
5850
AC_CHECK_HEADERS ( [ readline/readline.h] , [
5851
5851
AC_CHECK_LIB ( [ readline] , [ readline] , [
@@ -5866,7 +5866,7 @@ AS_VAR_IF([with_readline], [edit], [
5866
5866
READLINE_LIBS=$LIBEDIT_LIBS
5867
5867
] , [
5868
5868
WITH_SAVE_ENV([
5869
- CPPFLAGS="$CFLAGS $LIBEDIT_CFLAGS"
5869
+ CPPFLAGS="$CPPFLAGS $LIBEDIT_CFLAGS"
5870
5870
LDFLAGS="$LDFLAGS $LIBEDIT_LIBS"
5871
5871
AC_CHECK_HEADERS ( [ editline/readline.h] , [
5872
5872
AC_CHECK_LIB ( [ edit] , [ readline] , [
@@ -5890,7 +5890,7 @@ AS_VAR_IF([with_readline], [no], [
5890
5890
AC_MSG_RESULT ( [ $with_readline (CFLAGS: $READLINE_CFLAGS, LIBS: $READLINE_LIBS)] )
5891
5891
5892
5892
WITH_SAVE_ENV([
5893
- CPPFLAGS="$READLINE_CFLAGS $CFLAGS "
5893
+ CPPFLAGS="$CPPFLAGS $READLINE_CFLAGS "
5894
5894
LIBS="$READLINE_LIBS $LIBS"
5895
5895
LIBS_SAVE=$LIBS
5896
5896
0 commit comments