X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/21f6caee9936b429da5fcd482b4907315fcb109a..3da28d8ef9eca73e00684e56a06b1d5c15c9bf67:/configure.in

diff --git a/configure.in b/configure.in
index e7b2f0e..888118c 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to create a configure script.
 
 dnl General initialization.
 AC_REVISION([$Id$])
-AC_PREREQ(2.59)
+AC_PREREQ(2.60)
 AC_INIT([X3],[1.5],[evilnet-devel@lists.sourceforge.net])
 CODENAME=X3
 AC_CONFIG_HEADERS(src/config.h)
@@ -304,6 +304,11 @@ AC_ARG_ENABLE(modules,
     echo "WITH_MODULE($module)" >> $MODULE_DEFINES
     if test "x$module" = "xtrack" ; then
       TRACK="-D HAVE_TRACK"
+      AC_DEFINE(HAVE_TRACK, 1, [Define this if you are using mod-track])
+    fi
+    if test "x$module" = "xhelpserv" ; then
+      TRACK="-D HAVE_HELPSERV"
+      AC_DEFINE(HAVE_HELPSERV, 1, [Define this if you are using mod-helpserv])
     fi
   done
   IFS="$OIFS"
@@ -330,7 +335,6 @@ fi
 
 dnl I am not comfortable running make install from ./configure. This has to be done correctly or not at all.  -Rubin
 dnl REMEMBER TO CHANGE WITH A NEW TRE RELEASE!
-dnl tre_version="0.7.4"
 dnl AC_MSG_RESULT(extracting TRE regex library)
 dnl cur_dir=`pwd`
 dnl cd tools
@@ -368,8 +372,11 @@ dnl
 dnl cd $cur_dir
 
 dnl libTRE (regex library) checking
+tre_version="0.7.5"
 withval=''
-AC_ARG_WITH(tre, [  --with-tre=PATH    Base path to where libtre is installed, such that PATH/lib/libtre.so and PATH/include/tre/regex.h exist.], )
+AC_ARG_WITH(tre,
+[  --with-tre=PATH         Base path to where libtre is installed, such that 
+                          PATH/lib/libtre.so and PATH/include/tre/regex.h exist.], )
 if test "x$withval" != "x"; then
     AC_MSG_RESULT(Using include dir $withval to find libtre)
     CPPFLAGS="-I$withval/include -L$withval/lib"
@@ -382,6 +389,25 @@ fi
 AC_CHECK_HEADER(tre/regex.h, , [AC_MSG_ERROR([tre/regex.h, the TRE regex headers, were not found. Install tre or use --with-tre=PATH to tell me how to find it, where PATH/include/tre/regex.h exists.  For conveniance, just type 'tools/tre_install.sh' now, to install tre in your home directory.])],)
 AC_CHECK_LIB(tre, regexec, , [AC_MSG_ERROR([TRE regex library not found. Install tre, or use --with-tre=PATH to tell me how to find it, where PATH/lib/libtre.so exists. For conveniance, just type 'tools/tre_install.sh' now, to install tre in your home directory.])])
 
+dnl core dumper checking
+core_version="0.2"
+withval=''
+AC_ARG_WITH(coredumper,
+[  --with-coredumper=PATH  Base path to where core dumper is installed, such
+                          that PATH/lib/libcoredumper.so and 
+                          PATH/include/google/coredumper.h exist.], )
+if test "x$withval" != "x"; then
+    AC_MSG_RESULT(Using include dir $withval to find coredumper)
+    CPPFLAGS="-I$withval/include -L$withval/lib"
+    LIBS="$LIBS -L$withval/lib"
+else
+    AC_MSG_RESULT([Looking for coredumper in system and home dirs (${HOME})...])
+    CPPFLAGS="-I${HOME}/include -L${HOME}/lib"
+    LIBS="$LIBS -L${HOME}/lib"
+fi
+AC_CHECK_HEADER(google/coredumper.h, , [AC_MSG_RESULT([google/coredumper.h, the coredumper headers, were not found. Install coredumper or use --with-coredumper=PATH to tell me how to find it, where PATH/include/google/coredumper.h exists.  For conveniance, just type 'tools/core_install.sh' now, to install coredumper in your home directory.])],)
+AC_CHECK_LIB(coredumper, WriteCoreDump, , [AC_MSG_RESULT([Coredumper library not found. Install coredumper, or use --with-coredumper=PATH to tell me how to find it, where PATH/lib/libcoredumper.so exists. For conveniance, just type 'tools/core_install.sh' now, to install coredumper in your home directory.])])
+
 AC_DEFINE_UNQUOTED(CODENAME, "${CODENAME}", [Code name for this release])
 AC_SUBST(MODULE_OBJS)
 AC_SUBST(MY_SUBDIRS)
@@ -413,13 +439,14 @@ X3 is now configured as follows:
 
 * X3 options
 
-  Debug:             $x3_debug
-  Extra Modules:    $module_list
-  Malloc:            $x3_malloc
-  Protocol:          $x3_ircd
-  Regexp Library     TRE $tre_version
+  Debug:              $x3_debug
+  Extra Modules:     $module_list
+  Malloc:             $x3_malloc
+  Protocol:           $x3_ircd
+  Regexp Library      TRE $tre_version
+  Coredumper Library  Coredumper $core_version
 
-  Install to:        $prefix
+  Install to:         $prefix
 
 Now you can proceed with compiling X3