Merge remote-tracking branch 'IOMultiplexer/v2'

[NextIRCd.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 318b98b476dc710695024b0d2f19d7dfe7377e82..aa5b500c48416c132aef6208d20914ec46576a36 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -36,22 +36,14 @@ AC_CHECK_FUNCS([usleep select socket inet_pton inet_ntop])
 AC_CHECK_HEADERS([fcntl.h sys/socket.h sys/select.h sys/time.h sys/types.h unistd.h windows.h winsock2.h errno.h sys/epoll.h sys/event.h])
 
 AC_CHECK_LIB(ws2_32, main, [ LIBS="$LIBS -lws2_32" ], [])
-have_gnutls="no"
-AC_CHECK_LIB(gnutls, gnutls_init, [
-  AC_CHECK_HEADERS(gnutls/gnutls.h, [
-    LIBS="$LIBS -lgnutls"
-    have_gnutls="yes"
-  ])
-])
-if test x"$have_gnutls" = xno; then
-  AC_CHECK_LIB(ssl, SSL_read, [
-    AC_CHECK_LIB(crypto, X509_new, [
-      AC_CHECK_HEADERS(openssl/ssl.h openssl/err.h openssl/rand.h, [
-        LIBS="$LIBS -lssl -lcrypto"
-      ])
+
+AC_CHECK_LIB(ssl, SSL_read, [
+  AC_CHECK_LIB(crypto, X509_new, [
+    AC_CHECK_HEADERS(openssl/ssl.h openssl/err.h openssl/rand.h, [
+      LIBS="$LIBS -lssl -lcrypto"
     ])
   ])
-fi
+])
 AC_CHECK_LIB(pthread, pthread_create, [
   AC_CHECK_HEADERS(pthread.h, [
     LIBS="$LIBS -lpthread"
@@ -74,6 +66,7 @@ AC_CONFIG_FILES([
   src/IOHandler_test/client_ssl/Makefile
   src/IOHandler_test/server_ssl/Makefile
   src/IOHandler_test/timer/Makefile
+  src/IOHandler_test/timer++/Makefile
   src/IOHandler_test/resolv/Makefile
 ])
 AC_OUTPUT