X-Git-Url: http://git.hcoop.net/clinton/bobotpp.git/blobdiff_plain/439869bf80bc560dbecfd16ce058da0932e26030..3804f43913ab073eee40f09d3d46398c52cd8ba8:/configure.ac

diff --git a/configure.ac b/configure.ac
index 47585d6..2e17c6f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,10 @@
 dnl Process this file with autoconf to produce a configure script.
+
 AC_PRERQ(2.50)
-dnl AC_INIT(source/Makefile.in)
-AC_INIT([Bobot++], [2.1CVS], [clinton@unknownlamer.org])
-AM_INIT_AUTOMAKE([Bobot++], [2.1.0CVS])
+AC_INIT([Bobot++], m4_esyscmd([build-aux/git-version-gen --prefix 'release-' .tarball-version]), [clinton@unknownlamer.org], [bobotpp])
+AC_LANG([C++])
+AC_CONFIG_AUX_DIR(build-aux)
+AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)
 
 dnl Options
@@ -10,7 +12,7 @@ AC_ARG_ENABLE(crypt,
 [AC_HELP_STRING(--disable-crypt, Do not use the crypt function)],
 [
   if test $enableval = "no"; then
-    AC_DEFINE(NOCRYPT,1)
+    AC_DEFINE(NOCRYPT,1, [No crypt support])
   fi
 ])
 
@@ -19,36 +21,34 @@ AC_ARG_ENABLE(scripting,
 [
   if test $enableval = "no"; then
     AC_SUBST(GUILE_LDFLAGS,"")
+    AC_SUBST(GUILE_CFLAGS,"")
   else 
     GUILE_PROGS
     GUILE_FLAGS
-    AC_DEFINE(USESCRIPTS,1)
-    AC_DEFINE(MULTITHREAD,1)
+    GUILE_SITE_DIR
+    AC_DEFINE(USESCRIPTS,1,[Do we have Guile script support?])
+    ACX_PTHREAD([AC_DEFINE(MULTITHREAD,1,[Is the bot Multithreaded?])])
   fi
 ],
 [
+  enable_scripting=yes
   GUILE_PROGS
   GUILE_FLAGS
+  GUILE_SITE_DIR
   AC_DEFINE(USESCRIPTS,1)
-  AC_DEFINE(MULTITHREAD,1)
+  ACX_PTHREAD([AC_DEFINE(MULTITHREAD,1,[Is the bot Multithreaded?])])
 ])
+AM_CONDITIONAL([SCRIPTING], [test x$enable_scripting = xyes])
 
-dnl I don't think this works at all!
-dnl AC_ARG_ENABLE(telnetserver,
-dnl [  --enable-telnetserver   Use the Telnet server],
-dnl [
-dnl   if test $enableval = "yes"; then
-dnl     TSERVER_DEFINES="-DTSERVER"
-dnl     TSERVER_SOURCES=""
-dnl     TSERVER_INCLUDES=""
-dnl   fi
-dnl   AC_SUBST(TSERVER_DEFINES)
-dnl   AC_SUBST(TSERVER_SOURCES)
-dnl   AC_SUBST(TSERVER_INCLUDES)
-dnl ])
+AC_SUBST(CXXFLAGS, "$PTHREAD_CFLAGS $GUILE_CFLAGS $CXXFLAGS")
+AC_SUBST(LDFLAGS, "$GUILE_LDFLAGS $LDFLAGS")
+AC_SUBST(LIBS, "$PTHREAD_LIBS $LIBS")
 
 dnl Checks for programs.
 AC_PROG_CXX
+dnl GNULib needs gcc
+AC_PROG_CC
+gl_EARLY
 
 dnl Checks for STL compliance
 AC_CPP_STL
@@ -73,17 +73,16 @@ dnl Checks for library functions.
 AC_TYPE_SIGNAL
 AC_CHECK_FUNCS(select socket strtoul)
 
+dnl GNULib
+gl_INIT
 
-dnl PREFIX
+dnl PREFIX (I know, I know. Not very nice but...)
 if test "x$prefix" == "xNONE"
 then
-  AC_DEFINE_UNQUOTED(PREFIX, "$ac_default_prefix")
+  AC_DEFINE_UNQUOTED(PREFIX, "$ac_default_prefix", [Install prefix])
 else
-  AC_DEFINE_UNQUOTED(PREFIX, "$prefix")
+  AC_DEFINE_UNQUOTED(PREFIX, "$prefix", [Install Prefix])
 fi
 
 dnl Generates the makefiles
-dnl AC_OUTPUT(source/bobot-scheme.scm)
-AC_OUTPUT(source/Makefile)
-AC_OUTPUT(scripts/Makefile)
-AC_OUTPUT(Makefile)
+AC_OUTPUT(documentation/Makefile source/Makefile scripts/Makefile Makefile lib/Makefile)