From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 12 Sep 2011 14:09:28 +0000 (-0400)
Subject: Merge branch 'new_configure_options'
X-Git-Tag: release-2.1.1-alpha~202
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=caf133f90198961c1f9b8bdc74dd6f5385ec00b3;p=libevent

Merge branch 'new_configure_options'
---

caf133f90198961c1f9b8bdc74dd6f5385ec00b3
diff --cc configure.in
index 397b12ea,532c6297..5d889efb
--- a/configure.in
+++ b/configure.in
@@@ -54,17 -53,17 +54,26 @@@ if test "$GCC" = "yes" ; the
  	CFLAGS="$CFLAGS -fno-strict-aliasing"
  fi
  
 +# OS X Lion started deprecating the system openssl. Let's just disable
 +# all deprecation warnings on OS X.
 +case "$host_os" in
 +
 + darwin*)
 +    CFLAGS="$CFLAGS -Wno-deprecated-declarations"
 +    ;;
 +esac
 +
  AC_ARG_ENABLE(gcc-warnings,
-      AS_HELP_STRING(--enable-gcc-warnings, enable verbose warnings with GCC))
+      AS_HELP_STRING(--disable-gcc-warnings, disable verbose warnings with GCC))
+ 
+ AC_ARG_ENABLE(gcc-hardening,
+      AS_HELP_STRING(--enable-gcc-hardening, enable compiler security checks),
+ [if test x$enableval = xyes; then
+     CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fstack-protector-all"
+     CFLAGS="$CFLAGS -fwrapv -fPIE -Wstack-protector"
+     CFLAGS="$CFLAGS --param ssp-buffer-size=1"
+ fi])
+ 
  AC_ARG_ENABLE(thread-support,
       AS_HELP_STRING(--disable-thread-support, disable support for threading),
  	[], [enable_thread_support=yes])