From a72128f9b22281928fc4c36219c17a33d4a176ba Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Mon, 22 Nov 2021 13:12:19 +0100 Subject: [PATCH] bpo-45723: Use SAVE/RESTORE macros in configure.ac --- configure | 119 +++++++++++++++++++++++++--------------------- configure.ac | 131 +++++++++++++++++++++++++-------------------------- 2 files changed, 130 insertions(+), 120 deletions(-) diff --git a/configure b/configure index 9bd659efbf923a..29504c19edb922 100755 --- a/configure +++ b/configure @@ -3828,10 +3828,11 @@ then then found_gcc= found_clang= - as_save_IFS=$IFS; IFS=: + save_IFS=$IFS + IFS=: for as_dir in $PATH do - IFS=$as_save_IFS + IFS=$save_IFS if test -x "${as_dir}/gcc"; then if test -z "${found_gcc}"; then found_gcc="${as_dir}/gcc" @@ -3843,7 +3844,7 @@ then fi fi done - IFS=$as_save_IFS + IFS=$save_IFS if test -n "$found_gcc" -a -n "$found_clang" then @@ -5937,7 +5938,7 @@ if ${ac_cv_wl_no_as_needed+:} false; then : $as_echo_n "(cached) " >&6 else - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS as_fn_append LDFLAGS -Wl,--no-as-needed cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -5959,7 +5960,7 @@ else fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_wl_no_as_needed" >&5 @@ -6186,7 +6187,7 @@ if test "${enable_profiling+set}" = set; then : fi if test "x$enable_profiling" = xyes; then - ac_save_cc="$CC" + save_CC=$CC CC="$CC -pg" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -6199,7 +6200,7 @@ else fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - CC="$ac_save_cc" + CC=$save_CC else enable_profiling=no fi @@ -7393,9 +7394,13 @@ fi # GCC produce warnings for legal Python code. Enable # -fno-strict-aliasing on versions of GCC that support but produce # warnings. See Issue3326 - ac_save_cc="$CC" + save_CC=$CC CC="$CC -fno-strict-aliasing" - save_CFLAGS="$CFLAGS" + save_CFLAGS=$CFLAGS +save_CPPFLAGS=$CPPFLAGS +save_LDFLAGS=$LDFLAGS +save_LIBS=$LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts and needs -fno-strict-aliasing" >&5 $as_echo_n "checking whether $CC accepts and needs -fno-strict-aliasing... " >&6; } if ${ac_cv_no_strict_aliasing+:} false; then : @@ -7416,7 +7421,7 @@ main () _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - CC="$ac_save_cc -fstrict-aliasing" + CC="$save_CC -fstrict-aliasing" CFLAGS="$CFLAGS -Werror -Wstrict-aliasing" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7451,8 +7456,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_no_strict_aliasing" >&5 $as_echo "$ac_cv_no_strict_aliasing" >&6; } - CFLAGS="$save_CFLAGS" - CC="$ac_save_cc" + CFLAGS=$save_CFLAGS +CPPFLAGS=$save_CPPFLAGS +LDFLAGS=$save_LDFLAGS +LIBS=$save_LIBS + + CC=$save_CC if test "x$ac_cv_no_strict_aliasing" = xyes; then : BASECFLAGS="$BASECFLAGS -fno-strict-aliasing" fi @@ -7706,7 +7715,7 @@ $as_echo "$ac_cv_enable_strict_prototypes_warning" >&6; } CFLAGS_NODIST="$CFLAGS_NODIST -Wstrict-prototypes" fi - ac_save_cc="$CC" + save_CC=$CC CC="$CC -Werror=implicit-function-declaration" { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can make implicit function declaration an error in $CC" >&5 $as_echo_n "checking if we can make implicit function declaration an error in $CC... " >&6; } @@ -7739,13 +7748,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_implicit_function_declaration_error" >&5 $as_echo "$ac_cv_enable_implicit_function_declaration_error" >&6; } - CC="$ac_save_cc" + CC=$save_CC if test "x$ac_cv_enable_implicit_function_declaration_error" = xyes; then : CFLAGS_NODIST="$CFLAGS_NODIST -Werror=implicit-function-declaration" fi - ac_save_cc="$CC" + save_CC=$CC CC="$CC -fvisibility=hidden" { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can use visibility in $CC" >&5 $as_echo_n "checking if we can use visibility in $CC... " >&6; } @@ -7778,7 +7787,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_visibility" >&5 $as_echo "$ac_cv_enable_visibility" >&6; } - CC="$ac_save_cc" + CC=$save_CC if test "x$ac_cv_enable_visibility" = xyes; then : CFLAGS_NODIST="$CFLAGS_NODIST -fvisibility=hidden" @@ -8059,7 +8068,7 @@ $as_echo_n "checking whether $CC accepts -Kpthread... " >&6; } if ${ac_cv_kpthread+:} false; then : $as_echo_n "(cached) " >&6 else - ac_save_cc="$CC" + save_CC=$CC CC="$CC -Kpthread" if test "$cross_compiling" = yes; then : ac_cv_kpthread=no @@ -8090,7 +8099,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi -CC="$ac_save_cc" +CC=$save_CC fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_kpthread" >&5 $as_echo "$ac_cv_kpthread" >&6; } @@ -8108,7 +8117,7 @@ $as_echo_n "checking whether $CC accepts -Kthread... " >&6; } if ${ac_cv_kthread+:} false; then : $as_echo_n "(cached) " >&6 else - ac_save_cc="$CC" + save_CC=$CC CC="$CC -Kthread" if test "$cross_compiling" = yes; then : ac_cv_kthread=no @@ -8139,7 +8148,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi -CC="$ac_save_cc" +CC=$save_CC fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_kthread" >&5 $as_echo "$ac_cv_kthread" >&6; } @@ -8157,7 +8166,7 @@ $as_echo_n "checking whether $CC accepts -pthread... " >&6; } if ${ac_cv_pthread+:} false; then : $as_echo_n "(cached) " >&6 else - ac_save_cc="$CC" + save_CC=$CC CC="$CC -pthread" if test "$cross_compiling" = yes; then : ac_cv_pthread=no @@ -8188,7 +8197,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi -CC="$ac_save_cc" +CC=$save_CC fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthread" >&5 $as_echo "$ac_cv_pthread" >&6; } @@ -8201,7 +8210,7 @@ if test ! -z "$CXX" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX also accepts flags for thread support" >&5 $as_echo_n "checking whether $CXX also accepts flags for thread support... " >&6; } -ac_save_cxx="$CXX" +save_CXX=$CXX if test "$ac_cv_kpthread" = "yes" then @@ -8233,7 +8242,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_thread" >&5 $as_echo "$ac_cv_cxx_thread" >&6; } fi -CXX="$ac_save_cxx" +CXX=$save_CXX @@ -8479,7 +8488,7 @@ fi # bluetooth/bluetooth.h has been known to not compile with -std=c99. # http://permalink.gmane.org/gmane.linux.bluez.kernel/22294 -SAVE_CFLAGS=$CFLAGS +save_CFLAGS=$CFLAGS CFLAGS="-std=c99 $CFLAGS" for ac_header in bluetooth/bluetooth.h do : @@ -8493,7 +8502,7 @@ fi done -CFLAGS=$SAVE_CFLAGS +CFLAGS=$save_CFLAGS # On Darwin (OS X) net/if.h requires sys/socket.h to be imported first. for ac_header in net/if.h @@ -9492,7 +9501,7 @@ _ACEOF # if have pthread_t then define SIZEOF_PTHREAD_T -ac_save_cc="$CC" +save_CC=$CC if test "$ac_cv_kpthread" = "yes" then CC="$CC -Kpthread" elif test "$ac_cv_kthread" = "yes" @@ -9649,7 +9658,7 @@ $as_echo "#define PTHREAD_KEY_T_IS_COMPATIBLE_WITH_INT 1" >>confdefs.h fi -CC="$ac_save_cc" +CC=$save_CC case $ac_sys_system/$ac_sys_release in @@ -11661,7 +11670,7 @@ if test x$with_dbmliborder = xyes then as_fn_error $? "proper usage is --with-dbmliborder=db1:db2:..." "$LINENO" 5 else - as_save_IFS=$IFS + save_IFS=$IFS IFS=: for db in $with_dbmliborder; do if test x$db != xndbm && test x$db != xgdbm && test x$db != xbdb @@ -11669,7 +11678,7 @@ else as_fn_error $? "proper usage is --with-dbmliborder=db1:db2:..." "$LINENO" 5 fi done - IFS=$as_save_IFS + IFS=$save_IFS fi fi @@ -13716,7 +13725,7 @@ if test "x$ac_cv_header_zlib_h" = xyes; then : #define HAVE_ZLIB_H 1 _ACEOF - save_LIBS="$LIBS" + save_LIBS=$LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzread in -lz" >&5 $as_echo_n "checking for gzread in -lz... " >&6; } if ${ac_cv_lib_z_gzread+:} false; then : @@ -13762,7 +13771,7 @@ _ACEOF fi - LIBS="$save_LIBS" + LIBS=$save_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateCopy in -lz" >&5 $as_echo_n "checking for inflateCopy in -lz... " >&6; } if ${ac_cv_lib_z_inflateCopy+:} false; then : @@ -13805,7 +13814,7 @@ $as_echo "#define HAVE_ZLIB_COPY 1" >>confdefs.h fi - LIBS="$save_LIBS" + LIBS=$save_LIBS fi @@ -13820,7 +13829,7 @@ if test "x$ac_cv_header_bzlib_h" = xyes; then : #define HAVE_BZLIB_H 1 _ACEOF - save_LIBS="$LIBS" + save_LIBS=$LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzCompress in -lbz2" >&5 $as_echo_n "checking for BZ2_bzCompress in -lbz2... " >&6; } if ${ac_cv_lib_bz2_BZ2_bzCompress+:} false; then : @@ -13866,7 +13875,7 @@ _ACEOF fi - LIBS="$save_LIBS" + LIBS=$save_LIBS fi @@ -13881,7 +13890,7 @@ if test "x$ac_cv_header_lzma_h" = xyes; then : #define HAVE_LZMA_H 1 _ACEOF - save_LIBS="$LIBS" + save_LIBS=$LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzma_easy_encoder in -llzma" >&5 $as_echo_n "checking for lzma_easy_encoder in -llzma... " >&6; } if ${ac_cv_lib_lzma_lzma_easy_encoder+:} false; then : @@ -13927,7 +13936,7 @@ _ACEOF fi - LIBS="$save_LIBS" + LIBS=$save_LIBS fi @@ -16199,7 +16208,7 @@ if ${ac_cv_x87_double_rounding+:} false; then : else # $BASECFLAGS may affect the result -ac_save_cc="$CC" +save_CC=$CC CC="$CC $BASECFLAGS" if test "$cross_compiling" = yes; then : ac_cv_x87_double_rounding=no @@ -16236,7 +16245,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi -CC="$ac_save_cc" +CC=$save_CC fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_x87_double_rounding" >&5 @@ -17711,7 +17720,7 @@ $as_echo "#define HAVE_STAT_TV_NSEC2 1" >>confdefs.h fi # first curses header check -ac_save_cppflags="$CPPFLAGS" +save_CPPFLAGS=$CPPFLAGS if test "$cross_compiling" = no; then CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" fi @@ -18272,7 +18281,7 @@ fi -CPPFLAGS=$ac_save_cppflags +CPPFLAGS=$save_CPPFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking for device files" >&5 $as_echo "$as_me: checking for device files" >&6;} @@ -18967,8 +18976,8 @@ fi # checks for POSIX shared memory, used by Modules/_multiprocessing/posixshmem.c # shm_* may only be available if linking against librt -save_LIBS="$LIBS" -save_includes_default="$ac_includes_default" +save_LIBS=$LIBS +save_ac_includes_default=$ac_includes_default { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing shm_open" >&5 $as_echo_n "checking for library containing shm_open... " >&6; } if ${ac_cv_search_shm_open+:} false; then : @@ -19064,8 +19073,8 @@ fi done # we don't want to link with librt always, restore LIBS -LIBS="$save_LIBS" -ac_includes_default="$save_includes_default" +LIBS=$save_LIBS +ac_includes_default=$save_ac_includes_default # Check for usable OpenSSL @@ -19309,9 +19318,11 @@ if ${ac_cv_working_openssl+:} false; then : $as_echo_n "(cached) " >&6 else -save_LIBS="$LIBS" -save_CFLAGS="$CFLAGS" -save_LDFLAGS="$LDFLAGS" +save_CFLAGS=$CFLAGS +save_CPPFLAGS=$CPPFLAGS +save_LDFLAGS=$LDFLAGS +save_LIBS=$LIBS + LIBS="$LIBS $OPENSSL_LIBS" CFLAGS="$CFLAGS_NODIST $OPENSSL_INCLUDES" LDFLAGS="$LDFLAGS $OPENSSL_LDFLAGS" @@ -19360,9 +19371,11 @@ else fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -LIBS="$save_LIBS" -CFLAGS="$save_CFLAGS" -LDFLAGS="$save_LDFLAGS" +CFLAGS=$save_CFLAGS +CPPFLAGS=$save_CPPFLAGS +LDFLAGS=$save_LDFLAGS +LIBS=$save_LIBS + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_openssl" >&5 @@ -19442,7 +19455,7 @@ cat >>confdefs.h <<_ACEOF _ACEOF -as_save_IFS=$IFS +save_IFS=$IFS IFS=, for builtin_hash in $with_builtin_hashlib_hashes; do case $builtin_hash in #( @@ -19463,7 +19476,7 @@ for builtin_hash in $with_builtin_hashlib_hashes; do ;; esac done -IFS=$as_save_IFS +IFS=$save_IFS # --with-experimental-isolated-subinterpreters diff --git a/configure.ac b/configure.ac index 3b00735648b5ce..bdf98a1af41844 100644 --- a/configure.ac +++ b/configure.ac @@ -24,24 +24,24 @@ m4_ifdef( )dnl dnl Helpers for saving and restoring environment variables: -dnl - _SAVE_VAR([VAR]) Helper for SAVE_ENV; stores VAR as save_VAR -dnl - _RESTORE_VAR([VAR]) Helper for RESTORE_ENV; restores VAR from save_VAR +dnl - SAVE_VAR([VAR]) Helper for SAVE_ENV; stores VAR as save_VAR +dnl - RESTORE_VAR([VAR]) Helper for RESTORE_ENV; restores VAR from save_VAR dnl - SAVE_ENV Saves CFLAGS, LDFLAGS, LIBS, and CPPFLAGS dnl - RESTORE_ENV Restores CFLAGS, LDFLAGS, LIBS, and CPPFLAGS dnl - WITH_SAVE_ENV([SCRIPT]) Runs SCRIPT wrapped with SAVE_ENV/RESTORE_ENV -AC_DEFUN([_SAVE_VAR], [AS_VAR_COPY([save_][$1], [$1])])dnl -AC_DEFUN([_RESTORE_VAR], [AS_VAR_COPY([$1], [save_][$1])])dnl +AC_DEFUN([SAVE_VAR], [AS_VAR_COPY([save_][$1], [$1])])dnl +AC_DEFUN([RESTORE_VAR], [AS_VAR_COPY([$1], [save_][$1])])dnl AC_DEFUN([SAVE_ENV], -[_SAVE_VAR([CFLAGS])] -[_SAVE_VAR([CPPFLAGS])] -[_SAVE_VAR([LDFLAGS])] -[_SAVE_VAR([LIBS])] +[SAVE_VAR([CFLAGS])] +[SAVE_VAR([CPPFLAGS])] +[SAVE_VAR([LDFLAGS])] +[SAVE_VAR([LIBS])] )dnl AC_DEFUN([RESTORE_ENV], -[_RESTORE_VAR([CFLAGS])] -[_RESTORE_VAR([CPPFLAGS])] -[_RESTORE_VAR([LDFLAGS])] -[_RESTORE_VAR([LIBS])] +[RESTORE_VAR([CFLAGS])] +[RESTORE_VAR([CPPFLAGS])] +[RESTORE_VAR([LDFLAGS])] +[RESTORE_VAR([LIBS])] )dnl AC_DEFUN([WITH_SAVE_ENV], [SAVE_ENV] @@ -661,10 +661,11 @@ then then found_gcc= found_clang= - as_save_IFS=$IFS; IFS=: + SAVE_VAR([IFS]) + IFS=: for as_dir in $PATH do - IFS=$as_save_IFS + RESTORE_VAR([IFS]) if test -x "${as_dir}/gcc"; then if test -z "${found_gcc}"; then found_gcc="${as_dir}/gcc" @@ -676,7 +677,7 @@ then fi fi done - IFS=$as_save_IFS + RESTORE_VAR([IFS]) if test -n "$found_gcc" -a -n "$found_clang" then @@ -950,14 +951,14 @@ fi AC_SUBST(MULTIARCH_CPPFLAGS) AC_CACHE_CHECK([for -Wl,--no-as-needed], [ac_cv_wl_no_as_needed], [ - save_LDFLAGS="$LDFLAGS" + SAVE_VAR([LDFLAGS]) AS_VAR_APPEND([LDFLAGS], [-Wl,--no-as-needed]) AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])], [NO_AS_NEEDED="-Wl,--no-as-needed" ac_cv_wl_no_as_needed=yes], [NO_AS_NEEDED="" ac_cv_wl_no_as_needed=no]) - LDFLAGS="$save_LDFLAGS" + RESTORE_VAR([LDFLAGS]) ]) AC_SUBST(NO_AS_NEEDED) @@ -1147,12 +1148,12 @@ AC_MSG_CHECKING(for --enable-profiling) AC_ARG_ENABLE(profiling, AS_HELP_STRING([--enable-profiling], [enable C-level code profiling with gprof (default is no)])) if test "x$enable_profiling" = xyes; then - ac_save_cc="$CC" + SAVE_VAR([CC]) CC="$CC -pg" AC_LINK_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])], [], [enable_profiling=no]) - CC="$ac_save_cc" + RESTORE_VAR([CC]) else enable_profiling=no fi @@ -1717,16 +1718,16 @@ yes) # GCC produce warnings for legal Python code. Enable # -fno-strict-aliasing on versions of GCC that support but produce # warnings. See Issue3326 - ac_save_cc="$CC" + SAVE_VAR([CC]) CC="$CC -fno-strict-aliasing" - save_CFLAGS="$CFLAGS" + SAVE_ENV AC_CACHE_CHECK([whether $CC accepts and needs -fno-strict-aliasing], [ac_cv_no_strict_aliasing], AC_COMPILE_IFELSE( [ AC_LANG_PROGRAM([[]], [[]]) ],[ - CC="$ac_save_cc -fstrict-aliasing" + CC="$save_CC -fstrict-aliasing" CFLAGS="$CFLAGS -Werror -Wstrict-aliasing" AC_COMPILE_IFELSE( [ @@ -1740,8 +1741,8 @@ yes) ],[ ac_cv_no_strict_aliasing=no ])) - CFLAGS="$save_CFLAGS" - CC="$ac_save_cc" + RESTORE_ENV + RESTORE_VAR([CC]) AS_VAR_IF([ac_cv_no_strict_aliasing], [yes], [BASECFLAGS="$BASECFLAGS -fno-strict-aliasing"]) @@ -1787,7 +1788,7 @@ yes) AS_VAR_IF([ac_cv_enable_strict_prototypes_warning], [yes], [CFLAGS_NODIST="$CFLAGS_NODIST -Wstrict-prototypes"]) - ac_save_cc="$CC" + SAVE_VAR([CC]) CC="$CC -Werror=implicit-function-declaration" AC_CACHE_CHECK([if we can make implicit function declaration an error in $CC], [ac_cv_enable_implicit_function_declaration_error], @@ -1799,12 +1800,12 @@ yes) ],[ ac_cv_enable_implicit_function_declaration_error=no ])) - CC="$ac_save_cc" + RESTORE_VAR([CC]) AS_VAR_IF([ac_cv_enable_implicit_function_declaration_error], [yes], [CFLAGS_NODIST="$CFLAGS_NODIST -Werror=implicit-function-declaration"]) - ac_save_cc="$CC" + SAVE_VAR([CC]) CC="$CC -fvisibility=hidden" AC_CACHE_CHECK([if we can use visibility in $CC], [ac_cv_enable_visibility], AC_COMPILE_IFELSE( @@ -1815,7 +1816,7 @@ yes) ],[ ac_cv_enable_visibility=no ])) - CC="$ac_save_cc" + RESTORE_VAR([CC]) AS_VAR_IF([ac_cv_enable_visibility], [yes], [CFLAGS_NODIST="$CFLAGS_NODIST -fvisibility=hidden"]) @@ -2048,7 +2049,7 @@ else # so we need to run a program to see whether it really made the # function available. AC_CACHE_CHECK([whether $CC accepts -Kpthread], [ac_cv_kpthread], -[ac_save_cc="$CC" +[SAVE_VAR([CC]) CC="$CC -Kpthread" AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include @@ -2064,7 +2065,7 @@ int main(){ return 0; } ]])],[ac_cv_kpthread=yes],[ac_cv_kpthread=no],[ac_cv_kpthread=no]) -CC="$ac_save_cc"]) +RESTORE_VAR([CC])]) fi if test $ac_cv_kpthread = no -a $ac_cv_pthread_is_default = no @@ -2075,7 +2076,7 @@ then # so we need to run a program to see whether it really made the # function available. AC_CACHE_CHECK([whether $CC accepts -Kthread], [ac_cv_kthread], -[ac_save_cc="$CC" +[SAVE_VAR([CC]) CC="$CC -Kthread" AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include @@ -2091,7 +2092,7 @@ int main(){ return 0; } ]])],[ac_cv_kthread=yes],[ac_cv_kthread=no],[ac_cv_kthread=no]) -CC="$ac_save_cc"]) +RESTORE_VAR([CC])]) fi if test $ac_cv_kthread = no -a $ac_cv_pthread_is_default = no @@ -2102,7 +2103,7 @@ then # so we need to run a program to see whether it really made the # function available. AC_CACHE_CHECK([whether $CC accepts -pthread], [ac_cv_pthread], -[ac_save_cc="$CC" +[SAVE_VAR([CC]) CC="$CC -pthread" AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include @@ -2118,7 +2119,7 @@ int main(){ return 0; } ]])],[ac_cv_pthread=yes],[ac_cv_pthread=no],[ac_cv_pthread=no]) -CC="$ac_save_cc"]) +RESTORE_VAR([CC])]) fi # If we have set a CC compiler flag for thread support then @@ -2127,7 +2128,7 @@ ac_cv_cxx_thread=no if test ! -z "$CXX" then AC_MSG_CHECKING(whether $CXX also accepts flags for thread support) -ac_save_cxx="$CXX" +SAVE_VAR([CXX]) if test "$ac_cv_kpthread" = "yes" then @@ -2158,7 +2159,7 @@ then fi AC_MSG_RESULT($ac_cv_cxx_thread) fi -CXX="$ac_save_cxx" +RESTORE_VAR([CXX]) dnl # check for ANSI or K&R ("traditional") preprocessor dnl AC_MSG_CHECKING(for C preprocessor type) @@ -2194,10 +2195,10 @@ AC_HEADER_MAJOR # bluetooth/bluetooth.h has been known to not compile with -std=c99. # http://permalink.gmane.org/gmane.linux.bluez.kernel/22294 -SAVE_CFLAGS=$CFLAGS +SAVE_VAR([CFLAGS]) CFLAGS="-std=c99 $CFLAGS" AC_CHECK_HEADERS(bluetooth/bluetooth.h) -CFLAGS=$SAVE_CFLAGS +RESTORE_VAR([CFLAGS]) # On Darwin (OS X) net/if.h requires sys/socket.h to be imported first. AC_CHECK_HEADERS([net/if.h], [], [], @@ -2377,7 +2378,7 @@ AC_CHECK_SIZEOF(time_t, [], [ ]) # if have pthread_t then define SIZEOF_PTHREAD_T -ac_save_cc="$CC" +SAVE_VAR([CC]) if test "$ac_cv_kpthread" = "yes" then CC="$CC -Kpthread" elif test "$ac_cv_kthread" = "yes" @@ -2418,7 +2419,7 @@ AS_VAR_IF([ac_cv_pthread_key_t_is_arithmetic_type], [yes], [ [Define if pthread_key_t is compatible with int.]) ]) -CC="$ac_save_cc" +RESTORE_VAR([CC]) AC_SUBST(OTHER_LIBTOOL_OPT) case $ac_sys_system/$ac_sys_release in @@ -2878,9 +2879,9 @@ AS_VAR_IF([ac_cv_lib_uuid_uuid_generate_time_safe], [yes], [ ]) # check for libuuid from util-linux -save_LIBS=$LIBS +SAVE_VAR([LIBS]) AC_CHECK_LIB([uuid], [uuid_generate_time]) -LIBS=$save_LIBS +RESTORE_VAR([LIBS]) # AIX provides support for RFC4122 (uuid) in libc.a starting with AIX 6.1 (anno 2007) # FreeBSD and OpenBSD provides support in libc as well. @@ -3349,7 +3350,7 @@ if test x$with_dbmliborder = xyes then AC_MSG_ERROR([proper usage is --with-dbmliborder=db1:db2:...]) else - as_save_IFS=$IFS + SAVE_VAR([IFS]) IFS=: for db in $with_dbmliborder; do if test x$db != xndbm && test x$db != xgdbm && test x$db != xbdb @@ -3357,7 +3358,7 @@ else AC_MSG_ERROR([proper usage is --with-dbmliborder=db1:db2:...]) fi done - IFS=$as_save_IFS + RESTORE_VAR([IFS]) fi]) AC_MSG_RESULT($with_dbmliborder) @@ -4058,23 +4059,23 @@ fi dnl Check for compression libraries AC_CHECK_HEADERS([zlib.h], [ - save_LIBS="$LIBS" + SAVE_VAR([LIBS]) AC_CHECK_LIB([z], [gzread]) - LIBS="$save_LIBS" + RESTORE_VAR([LIBS]) AC_CHECK_LIB([z], [inflateCopy], [AC_DEFINE(HAVE_ZLIB_COPY, 1, [Define if the zlib library has inflateCopy])]) - LIBS="$save_LIBS" + RESTORE_VAR([LIBS]) ]) AC_CHECK_HEADERS([bzlib.h], [ - save_LIBS="$LIBS" + SAVE_VAR([LIBS]) AC_CHECK_LIB([bz2], [BZ2_bzCompress]) - LIBS="$save_LIBS" + RESTORE_VAR([LIBS]) ]) AC_CHECK_HEADERS([lzma.h], [ - save_LIBS="$LIBS" + SAVE_VAR([LIBS]) AC_CHECK_LIB([lzma], [lzma_easy_encoder]) - LIBS="$save_LIBS" + RESTORE_VAR([LIBS]) ]) PY_CHECK_FUNC([hstrerror], [#include ]) @@ -4663,7 +4664,7 @@ AS_VAR_IF([ac_cv_gcc_asm_for_mc68881], [yes], [ # 0 otherwise. See http://bugs.python.org/issue2937 for more info. AC_CACHE_CHECK([for x87-style double rounding], [ac_cv_x87_double_rounding], [ # $BASECFLAGS may affect the result -ac_save_cc="$CC" +SAVE_VAR([CC]) CC="$CC $BASECFLAGS" AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include @@ -4688,7 +4689,7 @@ int main() { [ac_cv_x87_double_rounding=no], [ac_cv_x87_double_rounding=yes], [ac_cv_x87_double_rounding=no]) -CC="$ac_save_cc" +RESTORE_VAR([CC]) ]) AS_VAR_IF([ac_cv_x87_double_rounding], [yes], [ @@ -5287,7 +5288,7 @@ then fi # first curses header check -ac_save_cppflags="$CPPFLAGS" +SAVE_VAR([CPPFLAGS]) if test "$cross_compiling" = no; then CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" fi @@ -5374,7 +5375,7 @@ PY_CHECK_CURSES_FUNC([filter]) PY_CHECK_CURSES_FUNC([has_key]) PY_CHECK_CURSES_FUNC([typeahead]) PY_CHECK_CURSES_FUNC([use_env]) -CPPFLAGS=$ac_save_cppflags +RESTORE_VAR([CPPFLAGS]) AC_MSG_NOTICE([checking for device files]) @@ -5784,8 +5785,8 @@ AS_VAR_IF([ac_cv_func_getrandom], [yes], [ # checks for POSIX shared memory, used by Modules/_multiprocessing/posixshmem.c # shm_* may only be available if linking against librt -save_LIBS="$LIBS" -save_includes_default="$ac_includes_default" +SAVE_VAR([LIBS]) +SAVE_VAR([ac_includes_default]) AC_SEARCH_LIBS(shm_open, rt) if test "$ac_cv_search_shm_open" = "-lrt"; then AC_DEFINE(SHM_NEEDS_LIBRT, 1, @@ -5803,8 +5804,8 @@ ${ac_includes_default} " AC_CHECK_FUNCS([shm_open shm_unlink]) # we don't want to link with librt always, restore LIBS -LIBS="$save_LIBS" -ac_includes_default="$save_includes_default" +RESTORE_VAR([LIBS]) +RESTORE_VAR([ac_includes_default]) # Check for usable OpenSSL AX_CHECK_OPENSSL([have_openssl=yes],[have_openssl=no]) @@ -5835,9 +5836,7 @@ AC_SUBST([OPENSSL_RPATH]) # check if OpenSSL libraries work as expected AC_CACHE_CHECK([whether OpenSSL provides required APIs], [ac_cv_working_openssl], [ -save_LIBS="$LIBS" -save_CFLAGS="$CFLAGS" -save_LDFLAGS="$LDFLAGS" +SAVE_ENV LIBS="$LIBS $OPENSSL_LIBS" CFLAGS="$CFLAGS_NODIST $OPENSSL_INCLUDES" LDFLAGS="$LDFLAGS $OPENSSL_LDFLAGS" @@ -5871,9 +5870,7 @@ EVP_PBE_scrypt(NULL, 0, NULL, 0, 2, 8, 1, 0, NULL, 0); ]])], [ac_cv_working_openssl=yes], [ac_cv_working_openssl=no]) -LIBS="$save_LIBS" -CFLAGS="$save_CFLAGS" -LDFLAGS="$save_LDFLAGS" +RESTORE_ENV ]) # ssl module default cipher suite string @@ -5931,7 +5928,7 @@ AC_ARG_WITH(builtin-hashlib-hashes, AC_MSG_RESULT($with_builtin_hashlib_hashes) AC_DEFINE_UNQUOTED(PY_BUILTIN_HASHLIB_HASHES, "$with_builtin_hashlib_hashes") -as_save_IFS=$IFS +SAVE_VAR([IFS]) IFS=, for builtin_hash in $with_builtin_hashlib_hashes; do AS_CASE($builtin_hash, @@ -5943,7 +5940,7 @@ for builtin_hash in $with_builtin_hashlib_hashes; do [blake2], [with_builtin_blake2=yes] ) done -IFS=$as_save_IFS +RESTORE_VAR([IFS]) # --with-experimental-isolated-subinterpreters AH_TEMPLATE(EXPERIMENTAL_ISOLATED_SUBINTERPRETERS,