From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 23 Oct 2012 19:39:36 +0000 (-0700)
Subject: * configure.ac (_FORTIFY_SOURCE): Do not multiply define.
X-Git-Tag: emacs-24.2.90~209^2~99
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7f8de58ca53c6a4f0844b244af2437b6d058723e;p=emacs.git

* 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 1a2a80fe39c..1d30382d34d 100644
--- 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 7104b9de170..4564bc3085e 100644
--- 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
   ])