X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/697f4c9aec6869d5a2877a4ba45f79a8921d9615..d9abe20116e2fcf1c38479623abaf6836cdf4c99:/configure.in

diff --git a/configure.in b/configure.in
index 9b2374c..44a0d71 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to create a configure script.
 dnl General initialization.
 AC_REVISION([$Id$])
 AC_PREREQ(2.59)
-AC_INIT([X3],[1.4],[x2serv-general@lists.sourceforge.net])
+AC_INIT([X3],[1.5],[evilnet-devel@lists.sourceforge.net])
 CODENAME=X3
 AC_CONFIG_HEADERS(src/config.h)
 AC_CONFIG_SRCDIR(src/opserv.c)
@@ -20,8 +20,8 @@ AC_C_INLINE
 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
@@ -69,21 +69,26 @@ AC_STRUCT_TM
 dnl Would rather not bail on headers, BSD has alot of the functions elsewhere. -Jedi
 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],
-        [AC_DEFINE(HAVE_DIRENT_D_TYPE, 1, [Define if struct dirent exists and includes the d_type element.])],,[#include <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.  X3 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 getpagesize 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.  X3 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
@@ -205,7 +210,7 @@ elif test "x$withval" = "xboehm-gc" ; then
   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])
+  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)
@@ -224,12 +229,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.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
@@ -285,9 +290,12 @@ 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.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"
@@ -316,5 +324,6 @@ AC_SUBST(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