sync, i know patch 20 isnt there.. its already been applied at some stage minus one...

[irc/evilnet/x3.git] / configure.in

diff --git a/configure.in b/configure.in
index efff56ad344f5668f8a8d3718df8f4e88251e613..76144b355bc6110f2e5a338fbe2ab28d26d02ba1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,8 +3,8 @@ dnl Process this file with autoconf to create a configure script.
 dnl General initialization.
 AC_REVISION([$Id$])
 AC_PREREQ(2.57)
-AC_INIT(srvx, 1.3, srvx-bugs@lists.sourceforge.net)
-CODENAME=surge
+AC_INIT(X3, 1.4, x2serv-general@lists.sourceforge.net)
+CODENAME=X3
 AC_CONFIG_HEADERS(src/config.h)
 AC_CONFIG_SRCDIR(src/opserv.c)
 dnl AM_CANONICAL_TARGET must be before AM_INIT_AUTOMAKE() or autoconf whines
@@ -67,7 +67,7 @@ AC_HEADER_TIME
 AC_STRUCT_TM
 
 dnl Would rather not bail on headers, BSD has alot of the functions elsewhere. -Jedi
-AC_CHECK_HEADERS(fcntl.h malloc.h netdb.h netinet/in.h sys/resource.h sys/timeb.h sys/times.h sys/param.h sys/socket.h sys/time.h sys/types.h sys/wait.h unistd.h getopt.h memory.h regex.h arpa/inet.h sys/mman.h sys/stat.h dirent.h,,)
+AC_CHECK_HEADERS(fcntl.h tgmath.h malloc.h netdb.h netinet/in.h sys/resource.h sys/timeb.h sys/times.h sys/param.h sys/socket.h sys/time.h sys/types.h sys/wait.h unistd.h getopt.h memory.h regex.h arpa/inet.h sys/mman.h sys/stat.h dirent.h,,)
 
 dnl Cygwin does not have d_type in struct dirent.  We use stat() as a fallback.
 AC_CHECK_MEMBER([struct dirent.d_type],
@@ -76,14 +76,14 @@ AC_CHECK_MEMBER([struct dirent.d_type],
 dnl portability stuff, hurray! -Jedi
 AC_CHECK_FUNCS(gettimeofday)
 if test $ac_cv_func_gettimeofday = no; then
-  AC_CHECK_FUNCS(ftime,,AC_MSG_ERROR([ftime or gettimeofday required.  srvx build will fail.]))
+  AC_CHECK_FUNCS(ftime,,AC_MSG_ERROR([ftime or gettimeofday required.  X3 build will fail.]))
 fi
 
 dnl We have fallbacks in case these are missing, so just check for them.
-AC_CHECK_FUNCS(bcopy memcpy memset strdup strerror strsignal localtime_r setrlimit inet_ntoa getopt getopt_long regcomp regexec regfree sysconf,,)
-
+AC_CHECK_FUNCS(bcopy getpagesize memcpy memset strdup strerror strsignal localtime_r setrlimit inet_ntoa getopt getopt_long regcomp regexec regfree sysconf,,)
+ 
 dnl Check for absolutely required library functions.
-AC_CHECK_FUNCS(select socket strcspn strspn strtod strtoul,,AC_MSG_ERROR([a required function was not found.  srvx build will fail.]))
+AC_CHECK_FUNCS(select socket strcspn strspn strtod strtoul,,AC_MSG_ERROR([a required function was not found.  X3 build will fail.]))
 
 dnl Check for functions (and how to get them).
 AC_FUNC_ALLOCA
@@ -153,7 +153,7 @@ dnl Optional features.
 AC_MSG_CHECKING(which malloc to use)
 AC_ARG_WITH(malloc,
 [  --with-malloc=type      Enables use of a special malloc library; one of:
-                          system (the default), boehm-gc, dmalloc, mpatrol],
+                          system (the default), boehm-gc, dmalloc, mpatrol, x3, slab],
 [],
 [withval="system"])
 if test "x$withval" = "xsystem" ; then
@@ -177,6 +177,14 @@ elif test "x$withval" = "xboehm-gc" ; then
   AC_CHECK_LIB(dl, dlopen, , AC_MSG_ERROR([libdl library is missing.  boehm-gc build will fail.]))
   AC_CHECK_LIB(gc, GC_gcollect, , AC_MSG_ERROR([Boehm GC library is missing.  boehm-gc build will fail.]))
   AC_DEFINE(WITH_MALLOC_BOEHM_GC, 1, [Define if using the Boehm GC to garbage collect and check memory leaks])
+elif test "x$withval" = "xx3" ; then
+  AC_MSG_RESULT(x3)
+  AC_DEFINE(WITH_MALLOC_X3, 1, [Define if using the x3 internal debug allocator])
+  MODULE_OBJS="$MODULE_OBJS alloc-x3.\$(OBJEXT)"
+elif test "x$withval" = "xslab" ; then
+  AC_MSG_RESULT(slab)
+  AC_DEFINE(WITH_MALLOC_SLAB, 1, [Define if using the slab internal debug allocator])
+  MODULE_OBJS="$MODULE_OBJS alloc-slab.\$(OBJEXT)"
 else
   AC_MSG_ERROR([Unknown malloc type $withval])
 fi
@@ -190,12 +198,12 @@ AC_ARG_WITH(protocol,
 if test "x$withval" = "xp10" ; then
   AC_MSG_RESULT(P10)
   AC_DEFINE(WITH_PROTOCOL_P10, 1, [Define if using the P10 dialect of IRC])
-  MODULE_OBJS="$MODULE_OBJS proto-p10.\$(OBJEXT)"
+  MODULE_OBJS="$MODULE_OBJS proto-p10.o"
   PROTO_FILES=proto-p10.c
 elif test "x$withval" = "xbahamut" ; then
   AC_MSG_RESULT(Bahamut)
   AC_DEFINE(WITH_PROTOCOL_BAHAMUT, 1, [Define if using the Bahamut dialect of IRC])
-  MODULE_OBJS="$MODULE_OBJS proto-bahamut.\$(OBJEXT)"
+  MODULE_OBJS="$MODULE_OBJS proto-bahamut.o"
 else
   AC_MSG_ERROR([Unknown IRC dialect $withval])
 fi
@@ -251,7 +259,7 @@ AC_ARG_ENABLE(modules,
   dnl Must use a separate file because autoconf can't stand newlines in an AC_SUBSTed variable.
   for module in $enableval ; do
     module=`echo $module | sed -e s/^mod-// -e s/\.c\$//`
-    EXTRA_MODULE_OBJS="$EXTRA_MODULE_OBJS mod-$module.\$(OBJEXT)"
+    EXTRA_MODULE_OBJS="$EXTRA_MODULE_OBJS mod-$module.o"
     module_list="$module_list $module"
     echo "WITH_MODULE($module)" >> $MODULE_DEFINES
   done