X-Git-Url: http://git.pk910.de/?p=NextIRCd.git;a=blobdiff_plain;f=configure.ac;h=4275959d2caf16b73054236bb343d5bfcd31e588;hp=dfd4bc6b372992c604a952ae538b3858c3bcdc46;hb=8af3ea51f146bf1c797dedfd345a88e3db98a568;hpb=7c7d9a51ab765ac4cc1bcea802369bd7d20165bc

diff --git a/configure.ac b/configure.ac
index dfd4bc6..4275959 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ AM_INIT_AUTOMAKE([foreign])
 AM_SILENT_RULES([yes])
 AC_CONFIG_HEADERS([config.h])
 
-#LT_INIT([disable-static])
+LT_INIT([disable-static])
 
 AC_MSG_RESULT($MODULES)
 AC_SUBST(MODULES)
@@ -19,7 +19,7 @@ AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
-AC_PROG_RANLIB
+AC_PROG_LIBTOOL
 
 AC_ARG_ENABLE([debug],
   [AS_HELP_STRING([--enable-debug], [debug mode (compile using -O0 -Wall -Wshadow -Werror)])],
@@ -36,13 +36,22 @@ 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" ], [])
-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"
-    ])
+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"
+      ])
+    ])
+  ])
+fi
 AC_CHECK_LIB(pthread, pthread_create, [
   AC_CHECK_HEADERS(pthread.h, [
     LIBS="$LIBS -lpthread"
@@ -54,5 +63,18 @@ AC_CHECK_LIB(cares, ares_init, [
   ])
 ])
 
-AC_CONFIG_FILES([Makefile src/Makefile src/IOHandler/Makefile src/IOHandler++/Makefile src/IOHandler_test/Makefile src/IOHandler_test/socket/Makefile src/IOHandler_test/socket++/Makefile src/IOHandler_test/timer/Makefile])
+AC_CONFIG_FILES([
+  Makefile
+  src/Makefile
+  src/IOHandler/Makefile
+  src/IOHandler++/Makefile
+  src/IOHandler_test/Makefile
+  src/IOHandler_test/client/Makefile
+  src/IOHandler_test/client++/Makefile
+  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