summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfigure11
-rw-r--r--configure.in9
2 files changed, 15 insertions, 5 deletions
diff --git a/configure b/configure
index a4287bc..7afe2c8 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 80576 .
+# From configure.in Revision: 80648 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for python 3.2.
#
@@ -3176,7 +3176,9 @@ then
(it is also a good idea to do 'make clean' before compiling)" "$LINENO" 5
fi
-save_CFLAGS=$CFLAGS
+# If the user set CFLAGS, use this instead of the automatically
+# determined setting
+preset_cflags="$CFLAGS"
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3968,7 +3970,10 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-CFLAGS=$save_CFLAGS
+if test ! -z "$preset_cflags"
+then
+ CFLAGS=$preset_cflags
+fi
diff --git a/configure.in b/configure.in
index c127a63..0cd867c 100644
--- a/configure.in
+++ b/configure.in
@@ -478,9 +478,14 @@ then
(it is also a good idea to do 'make clean' before compiling)])
fi
-save_CFLAGS=$CFLAGS
+# If the user set CFLAGS, use this instead of the automatically
+# determined setting
+preset_cflags="$CFLAGS"
AC_PROG_CC
-CFLAGS=$save_CFLAGS
+if test ! -z "$preset_cflags"
+then
+ CFLAGS=$preset_cflags
+fi
AC_SUBST(CXX)
AC_SUBST(MAINCC)