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

diff --git a/configure.ac b/configure.ac
index 6ddf591..1d3592a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,13 @@ AM_INIT_AUTOMAKE([foreign -Wall -Werror])
 
 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="-Wno-error=int-to-pointer-cast $CFLAGS"
@@ -36,10 +43,10 @@ if test "x$GCC" = xyes; then
     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],
               [AS_HELP_STRING([--enable-debug],[enable debug output])],
@@ -54,5 +61,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 tests/Makefile])
 AC_OUTPUT