X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/5b1166fd070aa5309698541178ea12a3adcce16e..3da28d8ef9eca73e00684e56a06b1d5c15c9bf67:/configure.in diff --git a/configure.in b/configure.in index 3579039..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) @@ -21,7 +21,10 @@ dnl Checks for programs. AC_PROG_AWK AC_PROG_CC AC_PROG_INSTALL -AC_PROG_LIBTOOL + +AC_PROG_RANLIB +dnl AC_PROG_LIBTOOL + AC_PROG_LN_S AC_PROG_MAKE_SET AC_PROG_GCC_TRADITIONAL @@ -57,6 +60,7 @@ dnl Checks for libraries. AC_CHECK_LIB(socket, socket) AC_CHECK_LIB(nsl, gethostbyname) AC_CHECK_LIB(m, main) +AC_CHECK_LIB(GeoIP, GeoIP_open) dnl Checks for header files. AC_HEADER_STDC @@ -66,7 +70,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 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 arpa/inet.h sys/mman.h sys/stat.h dirent.h,,) +AC_CHECK_HEADERS(GeoIP.h GeoIPCity.h 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 arpa/inet.h sys/mman.h sys/stat.h dirent.h,,) dnl portability stuff, hurray! -Jedi AC_CHECK_MEMBER([struct sockaddr.sa_len], @@ -78,6 +82,7 @@ AC_CHECK_MEMBER([struct addrinfo.ai_flags], [],[#include #include #include ]) + 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.])) @@ -228,7 +233,7 @@ fi AC_MSG_CHECKING(which protocol to use) AC_ARG_WITH(protocol, [ --with-protocol=name Choose IRC dialect to support; one of: - p10 (the default), bahamut], + p10 (the default)], [], [withval="p10"]) if test "x$withval" = "xp10" ; then @@ -237,11 +242,6 @@ if test "x$withval" = "xp10" ; then MODULE_OBJS="$MODULE_OBJS proto-p10.\$(OBJEXT)" PROTO_FILES=proto-p10.c x3_ircd="P10" -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)" - x3_ircd="Bahamut" else AC_MSG_ERROR([Unknown IRC dialect $withval]) fi @@ -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" @@ -328,37 +333,80 @@ if test "z$USE_MAINTAINER_MODE" = zyes ; then CFLAGS="$CFLAGS -Werror" 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! -tre_version="0.7.4" -AC_MSG_RESULT(extracting TRE regex library) -cur_dir=`pwd` -cd tools +dnl AC_MSG_RESULT(extracting TRE regex library) +dnl cur_dir=`pwd` +dnl cd tools dnl remove old tre directory to force a recompile... -rm -rf tre-$tre_version -if test "x$ac_cv_path_GUNZIP" = "x" ; then - tar xfz tre.tar.gz +dnl rm -rf tre-$tre_version +dnl if test "x$ac_cv_path_GUNZIP" = "x" ; then +dnl tar xfz tre.tar.gz +dnl else +dnl cp tre.tar.gz tre.tar.gz.bak +dnl gunzip -f tre.tar.gz +dnl cp tre.tar.gz.bak tre.tar.gz +dnl tar xf tre.tar +dnl fi +dnl AC_MSG_RESULT(configuring TRE regex library) +dnl cd tre-$tre_version +dnl tre_prefix=$prefix +dnl if test $tre_prefix = "NONE"; then +dnl tre_prefix="$HOME" +dnl fi +dnl ./configure --disable-agrep --disable-shared --disable-system-abi --disable-wchar --disable-multibyte --prefix=$tre_prefix || exit 1 +dnl +dnl AC_MSG_RESULT(compiling TRE regex library) +dnl $ac_cv_prog_MAKER || exit 1 +dnl AC_MSG_RESULT(installing TRE regex library) +dnl $ac_cv_prog_MAKER install || exit 1 +dnl TREINCDIR="$tre_prefix/include" +dnl AC_SUBST(TREINCDIR) +dnl if test "x$ac_cv_path_PKGCONFIG" = "x" ; then +dnl TRELIBS="-L$tre_prefix/lib -ltre" +dnl else +dnl TRELIBS=`$ac_cv_path_PKGCONFIG --libs tre.pc` +dnl fi +dnl AC_SUBST(TRELIBS) +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.], ) +if test "x$withval" != "x"; then + AC_MSG_RESULT(Using include dir $withval to find libtre) + CPPFLAGS="-I$withval/include -L$withval/lib" + LIBS="$LIBS -L$withval/lib" else - cp tre.tar.gz tre.tar.gz.bak - gunzip -f tre.tar.gz - cp tre.tar.gz.bak tre.tar.gz - tar xf tre.tar + AC_MSG_RESULT([Looking for tre in system and home dirs (${HOME})...]) + CPPFLAGS="-I${HOME}/include -L${HOME}/lib" + LIBS="$LIBS -L${HOME}/lib" fi -AC_MSG_RESULT(configuring TRE regex library) -cd tre-$tre_version -./configure --disable-agrep --disable-shared --disable-system-abi --disable-wchar --disable-multibyte --prefix=$prefix || exit 1 -AC_MSG_RESULT(compiling TRE regex library) -$ac_cv_prog_MAKER || exit 1 -AC_MSG_RESULT(installing TRE regex library) -$ac_cv_prog_MAKER install || exit 1 -TREINCDIR="$prefix/include" -AC_SUBST(TREINCDIR) -if test "x$ac_cv_path_PKGCONFIG" = "x" ; then - TRELIBS="-L$prefix/lib -ltre" +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 - TRELIBS=`$ac_cv_path_PKGCONFIG --libs tre.pc` + 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_SUBST(TRELIBS) -cd $cur_dir +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) @@ -391,11 +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 Now you can proceed with compiling X3