* configure.ac (_FORTIFY_SOURCE): Do not multiply define.

This ports to Gentoo.  Problem originally reported against coreutils,
but Emacs has it too.

Fixes: debbugs:12714

diff --git a/ChangeLog b/ChangeLog
index 1a2a80fe39c80a59a1b2b86ca1cfd721c1f2ffce..1d30382d34dcdc0ded08fe931df70658c829adbf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * configure.ac (_FORTIFY_SOURCE): Do not multiply define (Bug#12714).
+       This ports to Gentoo.  Problem originally reported against coreutils,
+       but Emacs has it too.
+
 2012-10-23  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in (emacs_transform): Remove.

diff --git a/configure.ac b/configure.ac
index 7104b9de1701c04c77cedc0b9681473682297330..4564bc3085e3413b69595794c8cb6eca58af6002 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -743,7 +743,7 @@ else
   AH_VERBATIM([FORTIFY_SOURCE],
   [/* Enable compile-time and run-time bounds-checking, and some warnings,
       without upsetting glibc 2.15+. */
-   #if defined __OPTIMIZE__ && __OPTIMIZE__
+   #if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__
    # define _FORTIFY_SOURCE 2
    #endif
   ])