X-Git-Url: https://ruderich.org/simon/gitweb/?p=tlsproxy%2Ftlsproxy.git;a=blobdiff_plain;f=configure.ac;h=2b559b651a7fa2f97de13aae1c93a2710ccf356b;hp=6ddf591b91f7f4b52cc729bd571a42561372d538;hb=HEAD;hpb=8c1ed800d8962f196e03efe9ea6c26f7f540cf28

diff --git a/configure.ac b/configure.ac
index 6ddf591..2b559b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2011-2013  Simon Ruderich
+dnl Copyright (C) 2011-2014  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
@@ -23,23 +23,33 @@ AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/tlsproxy.c])
 
 AM_INIT_AUTOMAKE([foreign -Wall -Werror])
+LT_INIT([disable-static])
 
 AC_PROG_CC
 
+# Do this before setting additional flags as the code from AX_PTHREAD fails to
+# build with -Werror.
+AX_PTHREAD([],[AC_MSG_ERROR([pthread is required])])
+LIBS="$PTHREAD_LIBS $LIBS"
+CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
+CC="$PTHREAD_CC"
+
 if test "x$GCC" = xyes; then
-    CFLAGS="-std=c89 -pedantic -Wall -Wextra -Werror $CFLAGS"
+    CFLAGS="-std=c89 -pedantic -Wall -Wextra $CFLAGS"
     CFLAGS="-Wno-error=int-to-pointer-cast $CFLAGS"
-    CPPFLAGS="-D_XOPEN_SOURCE=500 $CPPFLAGS"
+    CPPFLAGS="-D_XOPEN_SOURCE=600 $CPPFLAGS"
     # 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_SEARCH_LIBS([dlsym], [dl], [], [AC_MSG_ERROR([dlsym() 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],
               [AS_HELP_STRING([--enable-debug],[enable debug output])],
@@ -54,5 +64,5 @@ AC_ARG_ENABLE([ipv6],
                    AC_DEFINE([USE_IPV4_ONLY], 1, [Define to not use IPv6.])
                fi])
 
-AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile])
+AC_CONFIG_FILES([Makefile man/Makefile src/Makefile lib/Makefile tests/Makefile])
 AC_OUTPUT