configure.ac: Use $CPPFLAGS for preprocessor flags.

[tlsproxy/tlsproxy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 82be75124597f229f49e626c176b030b55e02a13..db5285cd99db5333e7a100e57f9d5fd4613b8c4d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,3 +1,19 @@
+dnl Copyright (C) 2011-2012  Simon Ruderich
+dnl
+dnl This program is free software: you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation, either version 3 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
 AC_INIT([tlsproxy], [0.2], [simon@ruderich.org])
 
 AC_CONFIG_AUX_DIR([build-aux])
@@ -10,10 +26,14 @@ AC_PROG_CC
 
 if test "x$GCC" = xyes; then
     CFLAGS="-std=c89 -pedantic -Wall -Wextra -Werror $CFLAGS"
-    CFLAGS="-D_XOPEN_SOURCE=500 -Wno-error=int-to-pointer-cast $CFLAGS"
+    CFLAGS="-Wno-error=int-to-pointer-cast $CFLAGS"
+    CPPFLAGS="-D_XOPEN_SOURCE=500 $CPPFLAGS"
     # Additional security flags.
-    CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fstack-protector -fPIE -pie"
-    LDFLAGS="$LDFLAGS -z relro -z now"
+    CFLAGS="$CFLAGS -Wformat -Wformat-security -Werror=format-security"
+    CFLAGS="$CFLAGS -fstack-protector-all -Wstack-protector"
+    CFLAGS="$CFLAGS --param ssp-buffer-size=1"
+    CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fPIE"
+    LDFLAGS="$LDFLAGS -Wl,-z,relro -Wl,-z,now -fPIE -pie"
 fi
 
 AC_CHECK_LIB([pthread], [pthread_create],