From: pk910 <philipp@zoelle1.de>
Date: Wed, 28 Jan 2015 01:20:45 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/IOMultiplexer/v2'
X-Git-Url: http://git.pk910.de/?p=NextIRCd.git;a=commitdiff_plain;h=2d694e116e0f9c5bf9f72c78d12892266cfa8288;hp=-c

Merge remote-tracking branch 'remotes/IOMultiplexer/v2'

Conflicts:
	configure.ac
---

2d694e116e0f9c5bf9f72c78d12892266cfa8288
diff --combined configure.ac
index f0bc9a6,f424ed7..29e9827
--- a/configure.ac
+++ b/configure.ac
@@@ -35,6 -35,8 +35,6 @@@ AC_FUNC_MALLO
  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" 
    is_win32="yes"
@@@ -42,16 -44,24 +42,24 @@@
    is_win32="no"
  ])
  
- if test x$is_win32 = xyes ; then
-   openssl_deps="-lcrypto -lgdi32"
- else
-   openssl_deps="-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
+   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)
  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,6 -73,7 +71,7 @@@ AC_CHECK_LIB(cares, ares_init, 
    ])
  ])
  
+ 
  AC_CONFIG_FILES([
    Makefile
    src/Makefile
@@@ -72,6 -83,7 +81,7 @@@
    src/IOHandler_test/client/Makefile
    src/IOHandler_test/client++/Makefile
    src/IOHandler_test/client_ssl/Makefile
+   src/IOHandler_test/server/Makefile
    src/IOHandler_test/server_ssl/Makefile
    src/IOHandler_test/timer/Makefile
    src/IOHandler_test/timer++/Makefile