X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=configure.ac;h=ad949f64cf9beac6629c7abd5a17d1f27d63c88f;hb=0def65a9df6d9a295c064cba58af229b326f39fe;hp=745ed802335334ebe35f791ea341bd957d07450f;hpb=f90d21daf31f8d69e24406678be696afa8cae962;p=NeonServV5.git

diff --git a/configure.ac b/configure.ac
index 745ed80..ad949f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,9 +3,12 @@
 AC_PREREQ([2.67])
 AC_INIT([NeonServ], [5.3], [bugs@pk910.de], [neonserv], [http://neonserv.krypton-bouncer.de])
 AC_PREFIX_DEFAULT([~/neonserv])
+AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([foreign subdir-objects])
 AC_CONFIG_HEADERS([config.h])
 
+LT_INIT([disable-static])
+
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_AWK
@@ -27,9 +30,9 @@ AC_SUBST([MYSQL_LIBS])
 
 AC_ARG_WITH([winsock],
   [AS_HELP_STRING([--with-winsock], [use winsock (WIN32 systems)])],
-  [WINSOCK_LIBS='-lws2_32'],
-  [WINSOCK_LIBS=''])
-AC_SUBST([WINSOCK_LIBS])
+  [SYSTEM_LIBS='-lws2_32'],
+  [SYSTEM_LIBS='-ldl'])
+AC_SUBST([SYSTEM_LIBS])
 
 do_have_ssl="no";
 AC_CHECK_LIB(ssl, SSL_read, [
@@ -45,13 +48,30 @@ if test x"$do_have_ssl" = xyes; then
   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, [
-    LIBS="$LIBS -lpthread"
-    AC_DEFINE([HAVE_THREADS], 1, [Define if you have Threads])
+    do_have_threads="yes"
   ])
 ])
 
+AC_ARG_ENABLE([threads],
+  [AS_HELP_STRING([--enable-threads], [use threads if possible])],
+  [
+  if test x"$do_have_threads" = xyes; then
+    LIBS="$LIBS -lpthread"
+    AC_DEFINE([HAVE_THREADS], 1, [Define if you have Threads])
+  fi
+  ],
+  [])
+
+AC_ARG_ENABLE([memory-debug],
+  [AS_HELP_STRING([--enable-memory-debug], [run memory debugger])],
+  [
+    AC_DEFINE([ENABLE_MEMORY_DEBUG], 1, [Define if you enable memoryDebug.c])
+  ],
+  [])
+
 AC_ARG_ENABLE([debug],
   [AS_HELP_STRING([--enable-debug], [debug mode (compile using -O0 -Wall -Wshadow -Werror)])],
   [CFLAGS='-g -O0 -Wall -Wshadow -Werror'],
@@ -68,5 +88,5 @@ AC_CHECK_HEADERS([arpa/inet.h netdb.h netinet/in.h stdlib.h string.h sys/socket.
 AC_FUNC_MALLOC
 AC_CHECK_FUNCS([gethostbyname memset select socket strchr strdup strstr])
 
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES(Makefile)
 AC_OUTPUT
\ No newline at end of file