From f0510eaae21d50a6f966a7ce0189d6c333d670d8 Mon Sep 17 00:00:00 2001
From: fche <fche>
Date: Sat, 9 Feb 2008 23:36:23 +0000
Subject: PR5751, -Werror emphasis on -fstack-protector-all trial build

2008-02-09  Frank Ch. Eigler  <fche@elastic.org>

	PR 5751.
	* configure.ac: Add -Werror to trial compilation with
	-fstack-protector-all, for hosts that don't quite support it.
	* configure: Regenerated.
---
 ChangeLog    | 7 +++++++
 configure    | 6 ++++--
 configure.ac | 8 +++++---
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8389ae04..e436b3d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-09  Frank Ch. Eigler  <fche@elastic.org>
+
+	PR 5751.
+	* configure.ac: Add -Werror to trial compilation with
+	-fstack-protector-all, for hosts that don't quite support it.
+	* configure: Regenerated.
+
 2008-02-08  David Smith  <dsmith@redhat.com>
 
 	PR 5650
diff --git a/configure b/configure
index 9d2a90f0..7f002d4e 100755
--- a/configure
+++ b/configure
@@ -5957,8 +5957,8 @@ if test "x$enable_ssp" != xno; then
 
    save_CFLAGS="$CFLAGS"
    save_CXXFLAGS="$CXXFLAGS"
-   CXXFLAGS="$CXXFLAGS -fstack-protector-all -D_FORTIFY_SOURCE=2"
-   CFLAGS="$CFLAGS -fstack-protector-all -D_FORTIFY_SOURCE=2"
+   CXXFLAGS="$CXXFLAGS -Werror -fstack-protector-all -D_FORTIFY_SOURCE=2"
+   CFLAGS="$CFLAGS -Werror -fstack-protector-all -D_FORTIFY_SOURCE=2"
    cat >conftest.$ac_ext <<_ACEOF
 int something ();
 _ACEOF
@@ -5982,6 +5982,8 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 
        { echo "$as_me:$LINENO: Compiling with gcc -fstack-protector-all et al." >&5
 echo "$as_me: Compiling with gcc -fstack-protector-all et al." >&6;}
+	CFLAGS="$save_CFLAGS -fstack-protector-all -D_FORTIFY_SOURCE=2"
+	CXFXLAGS="$save_CXXFLAGS -fstack-protector-all -D_FORTIFY_SOURCE=2"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
diff --git a/configure.ac b/configure.ac
index d8a7d38c..a486b6b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,10 +71,12 @@ AC_ARG_ENABLE([ssp],
 AS_IF([test "x$enable_ssp" != xno],[
    save_CFLAGS="$CFLAGS"
    save_CXXFLAGS="$CXXFLAGS"
-   CXXFLAGS="$CXXFLAGS -fstack-protector-all -D_FORTIFY_SOURCE=2"
-   CFLAGS="$CFLAGS -fstack-protector-all -D_FORTIFY_SOURCE=2"
+   CXXFLAGS="$CXXFLAGS -Werror -fstack-protector-all -D_FORTIFY_SOURCE=2"
+   CFLAGS="$CFLAGS -Werror -fstack-protector-all -D_FORTIFY_SOURCE=2"
    AC_COMPILE_IFELSE([int something ();], [
-       AC_MSG_NOTICE([Compiling with gcc -fstack-protector-all et al.])], [
+       AC_MSG_NOTICE([Compiling with gcc -fstack-protector-all et al.])
+	CFLAGS="$save_CFLAGS -fstack-protector-all -D_FORTIFY_SOURCE=2"
+	CXFXLAGS="$save_CXXFLAGS -fstack-protector-all -D_FORTIFY_SOURCE=2"],[
        AC_MSG_NOTICE([Compiler does not support -fstack-protector-all et al.])
        CFLAGS="$save_CFLAGS"
        CXXFLAGS="$save_CXXFLAGS"])])
-- 
cgit