--- deliantra/server/configure.ac 2006/08/30 16:30:36 1.15 +++ deliantra/server/configure.ac 2006/12/23 16:29:02 1.31 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([crossfire], [1.9.1], [crossfire-devel@listserv.real-time.com]) +AC_INIT([crossfire], [2.0+], [crossfire@schmorp.de]) AC_CONFIG_AUX_DIR(utils) AC_CONFIG_SRCDIR([server/main.C]) AM_INIT_AUTOMAKE @@ -13,8 +13,8 @@ dnl we want a config.h file instead of -D options. dnl Checks for programs. -AC_PROG_CXX AC_LANG(C++) +AC_PROG_CXX AC_PROG_LIBTOOL case "$target" in @@ -29,42 +29,30 @@ ;; esac - AC_PROG_CPP AM_PROG_LEX AC_PROG_AWK -AC_ARG_ENABLE(dmalloc, [ --enable-dmalloc Use the dmalloc library if available, may prevent plugins from working], - use_dmalloc=yes, use_dmalloc=no) - dnl AC_ARG_WITH(python, [ --with-python=dir Directory to look for python headers/library (default=standard system location) ], PYTHON_HOME="$withval") - dnl check for some other programs AC_PATH_PROG(LATEX, latex) AC_PATH_PROG(GZIP, gzip) -AC_PATH_PROG(GUNZIP, gunzip) +AC_PATH_PROG(BZIP, bzip2) AC_PATH_PROG(TAR, tar) -AC_PATH_PROG(PERL, perl) AC_PATH_PROG(BASENAME, basename) -if test -n "$GZIP" -a -z "$GUNZIP" ; then - echo "Found gzip, but not gunzip - setting GUNZIP to gzip -c"; - GUNZIP="$GZIP -c" -fi; +AC_PATH_PROG(PERL, perl5.8) +AC_PATH_PROG(PERL, perl5) +AC_PATH_PROG(PERL, perl) -if test -z "$COMPRESS" ; then - AC_PATH_PROG(COMPRESS, compress) - AC_PATH_PROG(UNCOMPRESS, uncompress) +AC_PATH_PROG(GPERF, gperf) +if test -z "$GPERF"; then + AC_MSG_ERROR([we need gperf, the GNU perfect hash generator]) fi -AC_PATH_PROG(BZIP, bzip2) -AC_PATH_PROG(BUNZIP, bunzip2) - -if test -n "$BZIP" -a -z "$BUNZIP" ; then - echo "Found bzip2, but not bunzip2 - setting BUNZIP to bzip2 -c"; - BUNZIP="$BZIP -c" -fi; +GUNZIP="$GZIP -c" +BUNZIP="$BZIP -c" if test -z "$COMPRESS" -a -z "$GZIP" -a -z "$BZIP" ; then echo "Unable to find either compress, bzip2, or gzip - hope you don't plan on compressing"; @@ -88,84 +76,28 @@ AC_CHECK_LIB(crypt, main) AC_CHECK_LIB(des, des_crypt) -dnl Gros - Changed this to support some external programs that do not like dmalloc (like Python). -dnl If you really need to make some memory debugging, uncomment the dmalloc line and comment out the dmalloclp one. - -if eval "test x$use_dmalloc = xyes"; then - AC_CHECK_LIB(dmalloc, main) -else - AC_CHECK_LIB(dmalloclp, main) -fi - dnl Checks for header files. -AC_HEADER_DIRENT -AC_HEADER_STDC -AC_CHECK_HEADERS(fcntl.h limits.h malloc.h strings.h sys/file.h sys/ioctl.h sys/time.h time.h unistd.h stddef.h stdlib.h sys/ttycom.h sys/termios.h crypt.h arpa/inet.h des.h) - +AC_CHECK_HEADERS(crypt.h des.h) dnl Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST AC_C_INLINE -AC_TYPE_PID_T -AC_TYPE_SIZE_T -AC_HEADER_TIME -AC_STRUCT_TM -AC_TYPE_UID_T AC_CHECK_SIZEOF(long) AC_CHECK_SIZEOF(long long) dnl Checks for library functions. AC_PROG_GCC_TRADITIONAL -AC_FUNC_MEMCMP -AC_FUNC_SETPGRP AC_TYPE_SIGNAL -AC_FUNC_STRFTIME -AC_FUNC_VPRINTF -AC_CHECK_FUNCS(gettimeofday mkdir mktime rmdir select socket strcspn strerror strspn strstr strtol strcasecmp strncasecmp snprintf setsid srandom getdtablesize srand48 srand sysconf scandir) - -dnl alphasort can not be added to AC_CHECK_FUNCS because -AC_MSG_CHECKING(checking if alphasort is defined) - AC_TRY_COMPILE([#include ], [alphasort;], - ac_cv_func_alphasort=yes, ac_cv_func_alphasort=no) - if test "$ac_cv_func_alphasort" = yes; then - AC_DEFINE(HAVE_ALPHASORT, 1, [Define if you have the alphasort() function declaration.]) - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - fi - +AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -AC_MSG_CHECKING(how many args gettimeofday uses) -AC_CACHE_VAL(ac_cv_gettimeofday_args, - [AC_TRY_COMPILE([#include - #include ], - [struct timeval tv; struct timezone tzp; - gettimeofday(&tv, &tzp);], - [ac_gettimeofday_args=2], - [AC_TRY_COMPILE([#include - #include ], - [struct timeval tv; - gettimeofday(&tv, NULL);], - [ac_gettimeofday_args=2], - [AC_TRY_COMPILE([#include - #include ], - [struct timeval tv; gettimeofday(&tv);], - [ac_gettimeofday_args=1], - [ac_gettimeofday_args=0])])]) - ac_cv_gettimeofday_args=$ac_gettimeofday_args]) - -ac_gettimeofday_args=$ac_cv_gettimeofday_args -if test $ac_gettimeofday_args = 1 ; then - AC_DEFINE(HAVE_GETTIMEOFDAY,[],[Define if gettimeofday is available]) - AC_MSG_RESULT(one argument) -elif test $ac_gettimeofday_args = 2 ; then - AC_DEFINE(HAVE_GETTIMEOFDAY,[],[Define if gettimeofday is available]) - AC_DEFINE(GETTIMEOFDAY_TWO_ARGS,[],[Define if gettimeofday takes two arguments]) - AC_MSG_RESULT(two arguments) +AC_MSG_CHECKING(glib >= 2.10) +if $PKG_CONFIG glib-2.0 --atleast-version 2.10; then + CXXFLAGS="$CXXFLAGS `$PKG_CONFIG glib-2.0 --cflags`" + LIBS="$LIBS `$PKG_CONFIG glib-2.0 --libs`" + AC_MSG_RESULT(ok) else - AC_MSG_RESULT(unknown) + AC_MSG_ERROR(no) fi AC_SUBST(x_includes) @@ -173,8 +105,6 @@ AC_SUBST(no_x) AM_CONDITIONAL(HAVE_X,test "x$no_x" = "x") AC_SUBST(X11LIBS) -AC_SUBST(PERL) -AC_SUBST(BASENAME) AC_SUBST(pkgstatedir,$localstatedir/$PACKAGE) AC_SUBST(pkgconfdir,$sysconfdir/$PACKAGE) @@ -186,15 +116,24 @@ AC_DEFINE_UNQUOTED(BZIP,"${BZIP}",[Path to the bzip binary]) AC_DEFINE_UNQUOTED(BUNZIP,"${BUNZIP}",[Path to the bunzip binary]) -AC_PATH_PROG(PERL, perl5) -AC_PATH_PROG(PERL, perl) +for module in Coro Event IO::AIO Storable Time::HiRes YAML::Syck; do + AC_MSG_CHECKING(for $module perl module) + if $PERL -M$module -e0 >/dev/null 2>&1; then + version=`$PERL -M$module -e "print \\$$module::VERSION"` + AC_MSG_RESULT([ok, version $version]) + else + AC_MSG_ERROR([no, cannot load module $module]) + fi +done AC_MSG_CHECKING(for $PERL suitability) -if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>/dev/null; then - - save_CFLAGS="$CFLAGS" +if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>&1; then + save_CXXFLAGS="$CXXFLAGS" save_LIBS="$LIBS" - CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts` `$PERL -MEvent::MakeMaker -e 'print +{&Event::MakeMaker::event_args}->{INC}'`" + xPERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts`" + xPERLFLAGS="$xPERLFLAGS `$PERL -MEvent::MakeMaker -e 'print +{&Event::MakeMaker::event_args}->{INC}'`" + xPERLFLAGS="$xPERLFLAGS `$PERL -MCoro::MakeMaker -e 'print +{&Coro::MakeMaker::coro_args}->{INC}'`" + CXXFLAGS="$CXXFLAGS $xPERLFLAGS" LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`" AC_TRY_LINK([ #include @@ -210,7 +149,7 @@ if test x$perl_link = xyes; then AC_MSG_RESULT(ok) AC_DEFINE(ENABLE_PERL, 1, Define if you can embed a perl interpreter) - PERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts` `$PERL -MEvent::MakeMaker -e 'print +{&Event::MakeMaker::event_args}->{INC}'`" + PERLFLAGS="$xPERLFLAGS" PERLLIB="`$PERL -MExtUtils::Embed -e ldopts`" PERLPRIVLIBEXP="`$PERL -MConfig -e 'print $Config{privlibexp}'`" CPPFLAGS="$CPPFLAGS $PERLFLAGS" @@ -218,44 +157,18 @@ AC_MSG_ERROR([no, unable to link]) fi else - AC_MSG_ERROR([no working perl found, or perl not version >= 5.8]) + AC_MSG_ERROR([no working perl found, or perl not version >= 5.8)]) fi AC_SUBST(PERLLIB) AC_SUBST(PERLFLAGS) AC_SUBST(PERLPRIVLIBEXP) AC_SUBST(PERL) -############################################# -# Plugin configuration -AC_CHECK_LIB(dl, dlopen,[ cf_have_libdl=yes ]) -AM_CONDITIONAL(HAVE_LIBDL,test "x$cf_have_libdl" = "xyes") - -if test "x$cf_have_libdl" = "xyes" ; then - ############### - # Python plugin -dnl CF_CHECK_PYTHON( -dnl [PLUGIN_PYTHON="cfpython.la"], -dnl [AC_MSG_NOTICE([No Python found. Python plugin will not be built.])] -dnl ) - dnl *** Put other plugins configuration code here *** - : -else - AC_MSG_NOTICE([No dl library found. Plugins will not be supported.]) -fi -AM_CONDITIONAL(PYTHON_PLUGIN,test "x$PLUGIN_PYTHON" != "x") -AC_SUBST(PLUGIN_PYTHON) - AC_OUTPUT([Makefile - doc/Makefile doc/Developers/Makefile doc/spell-docs/Makefile - doc/spoiler/Makefile doc/spoiler-html/Makefile - doc/playbook/Makefile doc/playbook-html/Makefile - doc/scripts/Makefile - lib/Makefile random_maps/Makefile socket/Makefile server/Makefile - include/Makefile utils/Makefile lib/checkarch.pl - lib/collect.pl utils/add_throw.perl utils/crossloop.tmpl utils/crossloop.pl.tmpl - utils/metaserver.pl utils/crossloop.web utils/scores.pl utils/player_dl.pl - common/Makefile plugins/Makefile plugins/cfpython/Makefile - plugins/cfpython/include/Makefile - plugins/common/Makefile plugins/common/include/Makefile - devel/Makefile - ]) + include/Makefile lib/Makefile pod/Makefile random_maps/Makefile socket/Makefile + server/Makefile src/Makefile utils/Makefile ext/Makefile + lib/checkarch.pl lib/collect.pl utils/add_throw.perl + utils/crossloop.tmpl utils/crossloop.pl.tmpl utils/metaserver.pl + utils/crossloop.web utils/scores.pl utils/player_dl.pl common/Makefile +]) +