Removed conditional addition of -D_FORTIFY_SOURCE=2 from CPPFLAGS.

And added to CFLAGS in build_nmh.

diff --git a/build_nmh b/build_nmh
index 832bd58..8e6ede6 100755 (executable)
--- a/build_nmh
+++ b/build_nmh
@@ -366,7 +366,7 @@ if [ -z "$CFLAGS" ]; then
     #### isn't defined.
     CFLAGS='-g -std=c99 -pedantic'
     if [ "$config_debug" = n ]; then
-      CFLAGS="$CFLAGS -O2"
+      CFLAGS="$CFLAGS -O2 -D_FORTIFY_SOURCE=2"
     else
       CFLAGS="$CFLAGS -O0"
     fi

diff --git a/configure.ac b/configure.ac
index cb23a22..677a54c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -154,20 +154,6 @@ dnl Check for any platform-specific additional AM_CPPFLAGS.  This depends on
 dnl MULTIBYTE_ENABLED having already been set.
 NMH_ADDL_CPPFLAGS
 
-if test "$GCC" = yes; then
-  dnl Do this regardless of auto_cflags value.
-  dnl Enable _FORTIFY_SOURCE checking, which is supported by
-  dnl gcc 4.1 and later, but only when optimization is enabled.
-  dnl It shouldn't hurt with earlier versions because it's a cpp macro.
-  dnl If the user configures with a CFLAGS that contains a -O flag
-  dnl but then removes it a make time, they'll also have to remove
-  dnl -D_FORTIFY_SOURCE from CPPFLAGS because it requires optimization.
-  dnl Use "\ " instead of ' ' or " " for compatiblity with posh.
-  AS_CASE([$CFLAGS],
-          [-O|*\ -O|-O[[!0]]*|*\ -O[[!0]]*],
-          [CPPFLAGS="${CPPFLAGS:+$CPPFLAGS }-D_FORTIFY_SOURCE=2"])
-fi
-
 dnl FreeBSD needs a bit of magic to bring getline() into scope.
 dnl We do this here rather than in (say) h/mh.h because this macro must
 dnl be defined before <stdio.h> is pulled in.