Merge branch 'master' of git://sources.redhat.com/git/systemtap

1 files changed, 17 insertions, 0 deletions

diff --git a/configure b/configure
index b26fb390..ccca2d7f 100755
--- a/configure
+++ b/configure
@@ -1312,6 +1312,7 @@ Optional Features:
   --enable-dependency-tracking   do not reject slow dependency extractors
   --enable-perfmon                 enable perfmon support (default is disabled)
   --enable-prologues      make -P prologue-searching default
+  --enable-ssp            enable gcc stack-protector
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -5822,6 +5823,8 @@ fi
 
 
 
+
+
 # Check whether --enable-perfmon was given.
 if test "${enable_perfmon+set}" = set; then
   enableval=$enable_perfmon; perfmon_support=$enableval
@@ -6033,6 +6036,20 @@ sqlite3_LIBS="$LIBS"
 
 LIBS="$SAVE_LIBS"
 
+
+# Check whether --enable-ssp was given.
+if test "${enable_ssp+set}" = set; then
+  enableval=$enable_ssp;
+fi
+
+if test "x$enable_ssp" == xyes; then
+  CFLAGS="$CFLAGS -fstack-protector-all -D_FORTIFY_SOURCE=2"
+       CXXFLAGS="$CXXFLAGS -fstack-protector-all -D_FORTIFY_SOURCE=2"
+       { 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;}
+fi
+
+
 build_elfutils=no
 
 # Check whether --with-elfutils was given.