-dnl Copyright (C) 2011-2012 Simon Ruderich
+dnl Copyright (C) 2011-2013 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 along with this program. If not, see <http://www.gnu.org/licenses/>.
-AC_INIT([tlsproxy], [0.2], [simon@ruderich.org])
+AC_PREREQ([2.69])
+AC_INIT([tlsproxy],[0.2],[simon@ruderich.org])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_HEADERS([config.h])
AC_CONFIG_SRCDIR([src/tlsproxy.c])
AM_INIT_AUTOMAKE([foreign -Wall -Werror])
CFLAGS="-std=c89 -pedantic -Wall -Wextra -Werror $CFLAGS"
CFLAGS="-Wno-error=int-to-pointer-cast $CFLAGS"
CPPFLAGS="-D_XOPEN_SOURCE=500 $CPPFLAGS"
- # Additional security flags.
- 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"
+ # Additional hardening flags.
+ CFLAGS="-fPIE -fstack-protector-all -Wformat -Werror=format-security $CFLAGS"
+ CPPFLAGS="-D_FORTIFY_SOURCE=2 $CPPFLAGS"
+ LDFLAGS="-fPIE -pie -Wl,-z,relro -Wl,-z,now $LDFLAGS"
fi
AC_CHECK_LIB([pthread], [pthread_create],
[], [AC_MSG_ERROR([pthread is required])])
AC_CHECK_LIB([gnutls], [gnutls_certificate_verify_peers2],
[], [AC_MSG_ERROR([GnuTLS is required])])
+dnl Check for additional GnuTLS functions.
+AX_CHECK_LIB_FUNC([gnutls],[gnutls_transport_set_int2])
AC_ARG_ENABLE([debug],
- [AC_HELP_STRING([--enable-debug], [enable debug output])],
+ [AS_HELP_STRING([--enable-debug],[enable debug output])],
[if test "x$enableval" = xyes; then
AC_DEFINE([DEBUG], 1, [Define to enable debug output.])
fi])
AC_ARG_ENABLE([ipv6],
- [AC_HELP_STRING([--disable-ipv6],
+ [AS_HELP_STRING([--disable-ipv6],
[disable IPv6, for IPv4 only network stacks])],
[if test "x$enableval" = xno; then
AC_DEFINE([USE_IPV4_ONLY], 1, [Define to not use IPv6.])
fi])
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile])
+AC_CONFIG_FILES([Makefile man/Makefile src/Makefile tests/Makefile])
AC_OUTPUT