[Emacs-diffs] /srv/bzr/emacs/trunk r110641: * configure.ac (_FORTIFY_SOURCE): Do not multiply define.

[Paul Eggert]

------------------------------------------------------------
revno: 110641
fixes bug: http://debbugs.gnu.org/12714
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Tue 2012-10-23 12:39:36 -0700
message:
  * configure.ac (_FORTIFY_SOURCE): Do not multiply define.
  
  This ports to Gentoo.  Problem originally reported against coreutils,
  but Emacs has it too.
modified:
  ChangeLog
  configure.ac

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-10-23 17:33:22 +0000
+++ b/ChangeLog 2012-10-23 19:39:36 +0000
@@ -1,3 +1,9 @@
+2012-10-23  Paul Eggert  <address@hidden>
+
+       * 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  <address@hidden>
 
        * Makefile.in (emacs_transform): Remove.

=== modified file 'configure.ac'
--- a/configure.ac      2012-10-21 07:23:34 +0000
+++ b/configure.ac      2012-10-23 19:39:36 +0000
@@ -743,7 +743,7 @@
   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
   ])