X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/ff3b058ac51e9caf5cf1fd310b8a401a97a85582..453ea1e4276fc91243352d5fd876703b14c58ddb:/configure.in diff --git a/configure.in b/configure.in index 8b19c85..283eb60 100644 --- a/configure.in +++ b/configure.in @@ -2,8 +2,8 @@ dnl Process this file with autoconf to create a configure script. dnl General initialization. AC_REVISION([$Id$]) -AC_PREREQ(2.60) -AC_INIT([X3],[2.0-rc1],[evilnet-devel@lists.sourceforge.net]) +AC_PREREQ(2.61) +AC_INIT([X3],[1.9],[evilnet-devel@lists.sourceforge.net]) CODENAME=X3 AC_CONFIG_HEADERS(src/config.h) AC_CONFIG_SRCDIR(src/opserv.c) @@ -15,13 +15,17 @@ AM_MAINTAINER_MODE dnl Compiler/runtime feature checks. AC_TYPE_SIGNAL AC_C_CONST +dnl "const" *should* be in the -Werror section, but that breaks Linux. gg gcc. dnl Checks for programs. AC_PROG_AWK AC_PROG_CC AC_PROG_INSTALL + +AC_PATH_PROG(CP, cp) + AC_PROG_RANLIB -AC_PROG_LIBTOOL +dnl AC_PROG_LIBTOOL AC_PROG_LN_S AC_PROG_MAKE_SET @@ -68,23 +72,23 @@ AC_HEADER_TIME AC_STRUCT_TM dnl Would rather not bail on headers, BSD has alot of the functions elsewhere. -Jedi -AC_CHECK_HEADERS(GeoIP.h GeoIPCity.h tgmath.h netdb.h fcntl.h malloc.h netdb.h arpa/inet.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 sys/epoll.h,,) - +AC_CHECK_HEADERS(GeoIP.h GeoIPCity.h arpa/inet.h fcntl.h math.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 sys/epoll.h sys/event.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])], + [AC_DEFINE([HAVE_SOCKADDR_SA_LEN],[1],[Define if struct sockaddr has sa_len field])], [],[#include #include ]) AC_CHECK_MEMBER([struct addrinfo.ai_flags], - [AC_DEFINE([HAVE_STRUCT_ADDRINFO],,[Define if struct addrinfo declared])], + [AC_DEFINE([HAVE_STRUCT_ADDRINFO],[1],[Define if struct addrinfo declared])], [],[#include #include #include ]) dnl We have fallbacks in case these are missing, so just check for them. -AC_CHECK_FUNCS(freeaddrinfo getaddrinfo gai_strerror getnameinfo getpagesize memcpy memset strdup strerror strsignal localtime_r setrlimit getopt getopt_long regcomp regexec regfree sysconf inet_aton epoll_create select gettimeofday times GetProcessTimes,,) +AC_CHECK_FUNCS(freeaddrinfo getaddrinfo gai_strerror getnameinfo getpagesize memcpy memset strdup strerror strsignal localtime_r setrlimit getopt getopt_long regcomp regexec regfree sysconf inet_aton epoll_create kqueue kevent select gettimeofday times GetProcessTimes mprotect,,) + dnl Check for the fallbacks for functions missing above. if test $ac_cv_func_gettimeofday = no; then AC_CHECK_FUNCS(ftime,,AC_MSG_ERROR([ftime or gettimeofday required. X3 build will fail.])) @@ -134,6 +138,7 @@ int getpeername (int $arg2 *, $t *);]], [[$t len; dnl Can only check with -Werror, but the rest of configure doesn't like -Werror OLD_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -W -Wall -Werror" + if test "z$USE_MAINTAINER_MODE" = zyes ; then CFLAGS="$CFLAGS -ansi" fi @@ -242,13 +247,11 @@ AC_ARG_WITH(protocol, [], [withval="p10"]) if test "x$withval" = "xp10" ; then - AC_MSG_RESULT([P10]) + AC_MSG_RESULT(P10) AC_DEFINE(WITH_PROTOCOL_P10, 1, [Define if using the P10 dialect of IRC]) MODULE_OBJS="$MODULE_OBJS proto-p10.\$(OBJEXT)" + PROTO_FILES=proto-p10.c x3_ircd="P10" -elif test -r "${srcdir}/src/proto-${withval}.c" ; then - AC_MSG_RESULT([$withval]) - MODULE_OBJS="$MODULE_OBJS proto-${withval}.\$(OBJEXT)" else AC_MSG_ERROR([Unknown IRC dialect $withval]) fi @@ -256,7 +259,7 @@ fi AC_MSG_CHECKING(how to send mail) AC_ARG_WITH(mail, [ --with-mail=name How to send mail; one of: - sendmail (the default)], + sendmail (the default), smtp], [], [withval="sendmail"]) if test -r "${srcdir}/src/mail-${withval}.c" ; then @@ -285,7 +288,18 @@ if test "x$withval" = xyes ; then IOMUXES="$IOMUXES epoll" fi +AC_ARG_WITH([kevent], +[ --without-kevent Disables the kevent() I/O backend], +[], +[withval="$ac_cv_func_kevent"]) +if test "x$withval" = xyes ; then + AC_DEFINE(WITH_IOSET_KEVENT, 1, [Define if using the kevent I/O backend]) + MODULE_OBJS="$MODULE_OBJS ioset-kevent.\$(OBJEXT)" + IOMUXES="$IOMUXES kevent" +fi + IOMUXES=`echo $IOMUXES | sed 's/^ +//'` +AC_MSG_RESULT($IOMUXES) if test "x$IOMUXES" = "x" ; then AC_MSG_ERROR([No supported I/O multiplexing backend found]) else @@ -365,6 +379,11 @@ AC_ARG_ENABLE(modules, AC_MSG_RESULT(none) ]) +AC_ARG_ENABLE(python, +[ --disable-python don't build the python plugin], + python=$enableval, python=yes) + + MY_SUBDIRS="" RX_INCLUDES="" RX_LIBS="" @@ -376,7 +395,7 @@ fi MY_SUBDIRS="$MY_SUBDIRS src" CFLAGS="$CFLAGS $ANSI_SRC -W -Wall" if test "z$USE_MAINTAINER_MODE" = zyes ; then - CFLAGS="$CFLAGS -Werror -ansi" + 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 @@ -432,8 +451,8 @@ else CPPFLAGS="$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.])]) +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 convenience, 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 convenience, just type 'tools/tre_install.sh' now, to install tre in your home directory.])]) dnl core dumper checking core_version="1.1" @@ -451,8 +470,8 @@ else CPPFLAGS="$CPPFLAGS -I${HOME}/include -L${HOME}/lib" LIBS="$LIBS -Wl,--rpath -Wl,${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_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 convenience, 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 convenience, just type 'tools/core_install.sh' now, to install coredumper in your home directory.])]) dnl openssl checking withval='' @@ -522,6 +541,51 @@ if test "x$withval" != "x"; then fi ] ) + +dnl ********************************************************************* +dnl ** PYTHON *********************************************************** +dnl ********************************************************************* + +if test "$python" = yes; then + AC_PATH_PROG(pythonpath, python2) + if test "_$pythonpath" = _ ; then + AC_PATH_PROG(pythonpath, python) + fi + if test "_$pythonpath" = _ ; then + python=no + else + AC_MSG_CHECKING(Python version) + changequote(<<, >>)dnl + PY_VER=`$pythonpath -c 'import distutils.sysconfig; print distutils.sysconfig.get_config_vars("VERSION")[0];'` + PY_LIB=`$pythonpath -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(standard_lib=1);'` + PY_INC=`$pythonpath -c 'import distutils.sysconfig; print distutils.sysconfig.get_config_vars("INCLUDEPY")[0];'` + $pythonpath -c "import sys; map(int,sys.version[:3].split('.')) >= [2,2] or sys.exit(1)" + changequote([, ])dnl + AC_MSG_RESULT($PY_VER) + if test "$?" != "1"; then + AC_MSG_CHECKING(Python compile flags) + PY_PREFIX=`$pythonpath -c 'import sys; print sys.prefix'` + PY_EXEC_PREFIX=`$pythonpath -c 'import sys; print sys.exec_prefix'` + if test -f $PY_INC/Python.h; then + AC_DEFINE(WITH_PYTHON, 1, [Define if using python]) + PY_LIBS="-L$PY_LIB/config -lpython$PY_VER -lpthread -lutil" + PY_CFLAGS="-I$PY_INC" + AC_MSG_RESULT(ok) + CFLAGS="$CFLAGS $PY_CFLAGS" + LIBS="$LIBS $PY_LIBS" + else + python=no + AC_MSG_RESULT([Can't find Python.h]) + fi + else + echo "Python too old. Only 2.2 or above is supported." + python=no + fi + fi +fi + +AM_CONDITIONAL(DO_PYTHON, test "x$python" = "xyes") + AC_MSG_RESULT($LIBS) AC_DEFINE_UNQUOTED(CODENAME, "${CODENAME}", [Code name for this release]) @@ -530,6 +594,9 @@ AC_SUBST(MY_SUBDIRS) AC_SUBST(RX_INCLUDES) AC_SUBST(RX_LIBS) AC_SUBST(TRACK) +AC_SUBST(PY_CFLAGS) +AC_SUBST(PY_LIBS) + AC_CONFIG_FILES(Makefile rx/Makefile src/Makefile) AC_OUTPUT @@ -562,6 +629,7 @@ X3 is now configured as follows: Regexp Library TRE $tre_version Coredumper Library Coredumper $core_version $ldap_message + python: $python Install to: $prefix