grep branch, master, updated. v2.14-2-gad2b8b4

[Eric Blake]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  ad2b8b437a09942a5f98077593a3ffd2c144adb8 (commit)
      from  58202fb7619b28cd06ce32913f8650052d5b0c5d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=ad2b8b437a09942a5f98077593a3ffd2c144adb8


commit ad2b8b437a09942a5f98077593a3ffd2c144adb8
Author: Eric Blake <address@hidden>
Date:   Sat Sep 1 09:08:31 2012 -0700

    build: work with new glibc when not optimizing
    
    Starting with glibc 2.15, the system headers refuse to compile
    unconditional use of FORTIFY_SOURCE if optimization is disabled
    but -Werror is in effect.
    
    * configure.ac (FORTIFY_SOURCE): Make conditional.

diff --git a/configure.ac b/configure.ac
index dc1e582..a6168c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -152,8 +152,13 @@ if test "$gl_gcc_warnings" = yes; then
   AC_SUBST([WARN_CFLAGS])
 
   AC_DEFINE([lint], [1], [Define to 1 if the compiler is checking for lint.])
-  AC_DEFINE([_FORTIFY_SOURCE], [2],
-    [enable compile-time and run-time bounds-checking, and some warnings])
+  AH_VERBATIM([FORTIFY_SOURCE],
+  [/* Enable compile-time and run-time bounds-checking, and some warnings,
+      without upsetting glibc 2.15+. */
+   #if defined __OPTIMIZE__ && __OPTIMIZE__
+   # define _FORTIFY_SOURCE 2
+   #endif
+  ])
   AC_DEFINE([GNULIB_PORTCHECK], [1], [enable some gnulib portability checks])
 
   # We use a slightly smaller set of warning options for lib/.

-----------------------------------------------------------------------

Summary of changes:
 configure.ac |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
grep