Merge branch 'development'

[NeonServV5.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 4ba0fac9cdbd2f5580e610771b0f8582c89b3bd9..0a6c9d97fed62c693d182de37660b2d8bed28938 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 
-AC_PREREQ([2.67])
-AC_INIT([NeonServ], [5.5], [bugs@pk910.de], [neonserv], [http://neonserv.krypton-bouncer.de])
+AC_PREREQ([2.63])
+AC_INIT([NeonServ], [5.6], [bugs@pk910.de], [neonserv], [http://neonserv.krypton-bouncer.de])
 AC_PREFIX_DEFAULT([~/neonserv])
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([foreign subdir-objects])
@@ -29,26 +29,21 @@ AC_ARG_WITH([mysql-lib],
   [MYSQL_LIBS='-lmysqlclient'])
 AC_SUBST([MYSQL_LIBS])
 
-AC_ARG_WITH([winsock],
-  [AS_HELP_STRING([--with-winsock], [use winsock (WIN32 systems)])],
-  [SYSTEM_LIBS='-lws2_32'],
-  [SYSTEM_LIBS='-ldl'])
-AC_SUBST([SYSTEM_LIBS])
+AC_CHECK_LIB([ws2_32], [_head_libws2_32_a], [LIBS="$LIBS -lws2_32"])
+AC_CHECK_LIB([dl], [dlopen], [LIBS="$LIBS -ldl"])
+AC_CHECK_LIB([pthread], [pthread_create], [LIBS="$LIBS -lpthread"])
+AC_CHECK_LIB([ssl], [SSL_read], [LIBS="$LIBS -lssl"])
+AC_CHECK_LIB([crypto], [X509_new], [LIBS="$LIBS -lcrypto"])
 
 do_have_ssl="no";
 AC_CHECK_LIB(ssl, SSL_read, [
   AC_CHECK_LIB(crypto, X509_new, [
     AC_CHECK_HEADERS(openssl/ssl.h openssl/err.h openssl/rand.h, [
-      do_have_ssl="yes";
+      AC_DEFINE([HAVE_SSL], 1, [Define if you are using SSL])
     ])
   ])
 ])
 
-if test x"$do_have_ssl" = xyes; then
-  LIBS="$LIBS -lssl -lcrypto"
-  AC_DEFINE([HAVE_SSL], 1, [Define if you are using SSL])
-fi
-
 do_have_threads="no";
 AC_CHECK_LIB(pthread, pthread_create, [
   AC_CHECK_HEADERS(pthread.h, [
@@ -73,6 +68,13 @@ AC_ARG_ENABLE([memory-debug],
   ],
   [])
 
+AC_ARG_ENABLE([mutex-debug],
+  [AS_HELP_STRING([--enable-mutex-debug], [run mutex debugger])],
+  [
+    AC_DEFINE([ENABLE_MUTEX_DEBUG], 1, [Define if you enable mutexDebug.c])
+  ],
+  [])
+
 AC_ARG_ENABLE([debug],
   [AS_HELP_STRING([--enable-debug], [debug mode (compile using -O0 -Wall -Wshadow -Werror)])],
   [CFLAGS='-g -O0 -Wall -Wshadow -Werror'],
@@ -81,7 +83,7 @@ AC_ARG_ENABLE([debug],
 CFLAGS="$CFLAGS -D_GNU_SOURCE"
 
 # Checks for header files.
-AC_CHECK_HEADERS([arpa/inet.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h unistd.h windows.h winsock2.h])
+AC_CHECK_HEADERS([stdio.h stdlib.h string.h ctype.h windows.h winsock2.h malloc.h features.h sys/types.h sys/socket.h netinet/in.h netinet/tcp.h arpa/inet.h netdb.h sys/wait.h errno.h unistd.h getopt.h stdarg.h sys/time.h time.h signal.h sys/epoll.h sys/event.h ws2tcpip.h mysql.h mysql/errmsg.h errmsg.h])
 
 # Checks for typedefs, structures, and compiler characteristics.