Don't permanently add -D_FORTIFY_SOURCE=2 to CPPFLAGS

--HG--
branch : 1.7

diff --git a/configure b/configure
index f178ba4217511d6ccfa05ce5ad56863cbbbfb832..2c159c40fa63005d69dd09921de5ec72b2c5f9ac 100755 (executable)
--- a/configure
+++ b/configure
@@ -16144,7 +16144,8 @@ fi
 fi
 done
 
-O_CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
+O_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
 ac_fn_c_check_func "$LINENO" "__sprintf_chk" "ac_cv_func___sprintf_chk"
 if test "x$ac_cv_func___sprintf_chk" = xyes; then :
 

diff --git a/configure.in b/configure.in
index 7392baecf02da6c5a1d1fc03a90e9a548136bed0..09d9aea969eb4b643d95eff3b5368bd825a885c9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2024,7 +2024,8 @@ AC_CHECK_FUNCS(setsid, [], [
 dnl
 dnl If libc supports _FORTIFY_SOURCE check functions, use it.
 dnl
-O_CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
+O_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
 AC_CHECK_FUNC(__sprintf_chk, [
     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[char buf[4]; (void)sprintf(buf, "%s", "foo");]])], [OSDEFS="${OSDEFS} -D_FORTIFY_SOURCE=2"], [])
 ], [])