X-Git-Url: http://git.pk910.de/?p=NextIRCd.git;a=blobdiff_plain;f=configure.ac;fp=configure.ac;h=aa5b500c48416c132aef6208d20914ec46576a36;hp=44f4e88c1f7f52e9981d1bd612deda67d5edb5e7;hb=e17a8a5dc929df2a5ae6169f1955fcde7c70e04b;hpb=285018f265af0f32438a5de357905963daaaa86f diff --git a/configure.ac b/configure.ac index 44f4e88..aa5b500 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ AC_INIT([IOMultiplexer], [2.0], [iohandler@pk910.de], [pk910], [http://pk910.de] AC_PREFIX_DEFAULT([~/iotest]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([foreign]) -AM_SILENT_RULES([no]) +AM_SILENT_RULES([yes]) AC_CONFIG_HEADERS([config.h]) LT_INIT([disable-static]) @@ -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"