Alexandre Julliard : configure: More aggressive disabling of Fortify.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 07ccfd952eb709fd264fdc88835316bad17d45cb
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=07ccfd952eb709fd264fdc8883...

Author: Alexandre Julliard 
Date:   Fri Oct 29 14:25:01 2010 +0200

configure: More aggressive disabling of Fortify.
(cherry picked from commit b10fb86a91c0fcef9db236076929842c8dc45baa)

---

configure    |    2 +-
 configure.ac |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 1832286..b92e6a0 100755
--- a/configure
+++ b/configure
@@ -11970,7 +11970,7 @@ fi
 $as_echo "$ac_cv_c_fortify_enabled" >&6; }
 if test "$ac_cv_c_fortify_enabled" = yes
 then
-    EXTRACFLAGS="$EXTRACFLAGS -D_FORTIFY_SOURCE=0"
+    CFLAGS="$CFLAGS -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0"
 fi

diff --git a/configure.ac b/configure.ac
index 8d1d298..85c6017 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1636,7 +1636,7 @@ AC_CACHE_CHECK([for the need to disable Fortify], ac_cv_c_fortify_enabled,
         [ac_cv_c_fortify_enabled=no],[ac_cv_c_fortify_enabled=yes]))
 if test "$ac_cv_c_fortify_enabled" = yes
 then
-    EXTRACFLAGS="$EXTRACFLAGS -D_FORTIFY_SOURCE=0"
+    CFLAGS="$CFLAGS -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0"
 fi

dnl **** Check for underscore on external symbols ****