X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/35305a49c0973c0e29e4a607c2b507a2d8face43..3a4fdc794dae5546a7fda367d301443695483803:/configure.in diff --git a/configure.in b/configure.in index cb508f8..e7b2f0e 100644 --- a/configure.in +++ b/configure.in @@ -22,7 +22,6 @@ AC_PROG_AWK AC_PROG_CC AC_PROG_INSTALL -dnl -- squish errors in autogen.sh -rubin AC_PROG_RANLIB dnl AC_PROG_LIBTOOL @@ -61,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 @@ -70,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], @@ -82,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.])) @@ -232,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 @@ -241,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 @@ -377,9 +373,11 @@ AC_ARG_WITH(tre, [ --with-tre=PATH Base path to where libtre is installed, s 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 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_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.])])