X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=configure.ac;h=f0bc9a63c1f518594b344704a7db2ebf6f054824;hb=981be1f880efeca4ecac1156317f6dbebf707087;hp=fb64def438c9dc92db995917c48d955f1163fe95;hpb=70a1c9616475c6978e4fa361c4263e0916d2649e;p=NextIRCd.git

diff --git a/configure.ac b/configure.ac
index fb64def..f0bc9a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,23 +35,23 @@ AC_FUNC_MALLOC
 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"
-  ])
+AC_CHECK_LIB(ws2_32, main, [ 
+  LIBS="$LIBS -lws2_32" 
+  is_win32="yes"
+], [
+  is_win32="no"
 ])
-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"
-      ])
-    ])
-  ])
+
+if test x$is_win32 = xyes ; then
+  openssl_deps="-lcrypto -lgdi32"
+else
+  openssl_deps="-lcrypto"
 fi
+
+AC_CHECK_LIB([ssl],[SSL_library_init], [
+  LIBS="$LIBS -lssl $openssl_deps"
+], [AC_MSG_ERROR([OpenSSL libraries required])], $openssl_deps)
+
 AC_CHECK_LIB(pthread, pthread_create, [
   AC_CHECK_HEADERS(pthread.h, [
     LIBS="$LIBS -lpthread"
@@ -63,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 src/IOHandler_test/resolv/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