--- deliantra/server/configure.ac	2006/09/01 13:58:06	1.17
+++ deliantra/server/configure.ac	2006/12/11 19:21:12	1.25
@@ -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-devel@listserv.real-time.com])
 AC_CONFIG_AUX_DIR(utils)
 AC_CONFIG_SRCDIR([server/main.C])
 AM_INIT_AUTOMAKE
@@ -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";
@@ -168,13 +156,22 @@
   AC_MSG_RESULT(unknown)
 fi
 
+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+
+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_ERROR(no)
+fi
+
 AC_SUBST(x_includes)
 AC_SUBST(x_libraries)
 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,13 +183,10 @@
 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)
-
 AC_MSG_CHECKING(for $PERL suitability)
 if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>/dev/null; then
 
-  save_CFLAGS="$CFLAGS"
+  save_CXXFLAGS="$CXXFLAGS"
   save_LIBS="$LIBS"
   CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts` `$PERL -MEvent::MakeMaker -e 'print +{&Event::MakeMaker::event_args}->{INC}'`"
   LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`"
@@ -225,37 +219,10 @@
 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 src/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
+	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
+])