dnl General initialization.
AC_REVISION([$Id$])
-AC_PREREQ(2.57)
-AC_INIT(srvx, 1.3, srvx-bugs@lists.sourceforge.net)
-CODENAME=surge
+AC_PREREQ(2.59)
+AC_INIT([X3],[1.5],[evilnet-devel@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
dnl Checks for programs.
AC_PROG_AWK
AC_PROG_CC
-AC_PROG_RANLIB
AC_PROG_INSTALL
+AC_PROG_LIBTOOL
AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_PROG_GCC_TRADITIONAL
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,,)
-
-dnl Cygwin does not have d_type in struct dirent. We use stat() as a fallback.
-AC_CHECK_MEMBER([struct dirent.d_type],
- [AC_DEFINE(HAVE_DIRENT_D_TYPE, 1, [Define if struct dirent exists and includes the d_type element.])],,[#include <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 portability stuff, hurray! -Jedi
+AC_CHECK_MEMBER([struct sockaddr.sa_len],
+ [AC_DEFINE([HAVE_SOCKADDR_SA_LEN],,[Define if struct sockaddr has sa_len field])],
+ [],[#include <sys/types.h>
+#include <sys/socket.h>])
+AC_CHECK_MEMBER([struct addrinfo.ai_flags],
+ [AC_DEFINE([HAVE_STRUCT_ADDRINFO],,[Define if struct addrinfo declared])],
+ [],[#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>])
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(freeaddrinfo getaddrinfo getnameinfo getpagesize memcpy memset strdup strerror strsignal localtime_r setrlimit 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
AC_DEFINE(HAVE_SIN_LEN, 1, [Define if struct sockaddr_in contains a sin_len field])
fi
+dnl Check for socklen_t. In traditional BSD this is an int, but some
+dnl OSes use a different type. Test until we find something that will
+dnl work properly. Test borrowed from a patch submitted for Python.
+AC_CHECK_TYPE([socklen_t], ,[
+ AC_MSG_CHECKING([for socklen_t equivalent])
+ AC_CACHE_VAL([curl_cv_socklen_t_equiv],
+ [
+dnl Systems have either "struct sockaddr*" or "void*" as second
+dnl arg to getpeername.
+ curl_cv_socklen_t_equiv=
+ for arg2 in "struct sockaddr" void ; do
+ for t in int size_t unsigned long "unsigned long" ; do
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
+#include <sys/socket.h>
+int getpeername (int $arg2 *, $t *);]], [[$t len;
+ getpeername(0, 0, &len);]])],[curl_cv_socklen_t_equiv="$t"
+ break],[])
+ done
+ done
+ ])
+ AC_MSG_RESULT($curl_cv_socklen_t_equiv)
+ AC_DEFINE_UNQUOTED(socklen_t, $curl_cv_socklen_t_equiv,
+ [type to use in place of socklen_t if not defined])],
+ [#include <sys/types.h>
+#include<sys/socket.h>])
+
dnl Can only check with -Werror, but the rest of configure doesn't like -Werror
OLD_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -W -Wall -Werror"
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, srvx],
+ system (the default), boehm-gc, dmalloc, mpatrol, x3, slab],
[],
[withval="system"])
if test "x$withval" = "xsystem" ; 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" = "xsrvx" ; then
- AC_MSG_RESULT(srvx)
- AC_DEFINE(WITH_MALLOC_SRVX, 1, [Define if using the srvx internal debug allocator])
- MODULE_OBJS="$MODULE_OBJS alloc-srvx.\$(OBJEXT)"
+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
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.o"
+ MODULE_OBJS="$MODULE_OBJS proto-p10.\$(OBJEXT)"
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.o"
+ MODULE_OBJS="$MODULE_OBJS proto-bahamut.\$(OBJEXT)"
else
AC_MSG_ERROR([Unknown IRC dialect $withval])
fi
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.o"
+ EXTRA_MODULE_OBJS="$EXTRA_MODULE_OBJS mod-$module.\$(OBJEXT)"
module_list="$module_list $module"
echo "WITH_MODULE($module)" >> $MODULE_DEFINES
+ if test "x$module" = "xtrack" ; then
+ TRACK="-D HAVE_TRACK"
+ fi
done
IFS="$OIFS"
MODULE_OBJS="$MODULE_OBJS $EXTRA_MODULE_OBJS"
AC_SUBST(MY_SUBDIRS)
AC_SUBST(RX_INCLUDES)
AC_SUBST(RX_LIBS)
+AC_SUBST(TRACK)
AC_CONFIG_FILES(Makefile rx/Makefile src/Makefile)
AC_OUTPUT