X-Git-Url: https://git.hcoop.net/clinton/bobotpp.git/blobdiff_plain/4edefeb6d696ccc7291ab9ae8bf5996907510d7b..07e08986f67a48c8d676ee434f8f02fe01ce1269:/configure.ac

diff --git a/configure.ac b/configure.ac
index add45f6..5d42ad0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,8 @@
 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.1.4CVS], [clinton@unknownlamer.org], [bobotpp])
+AC_INIT([Bobot++], [2.3.0], [clinton@unknownlamer.org], [bobotpp])
+AC_LANG([C++])
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)
 
@@ -19,33 +20,28 @@ AC_ARG_ENABLE(scripting,
 [
   if test $enableval = "no"; then
     AC_SUBST(GUILE_LDFLAGS,"")
+    AC_SUBST(GUILE_CFLAGS,"")
   else 
     GUILE_PROGS
     GUILE_FLAGS
+    GUILE_SITE_DIR
     AC_DEFINE(USESCRIPTS,1,[Do we have Guile script support?])
-    AC_DEFINE(MULTITHREAD,1,[Is the bot Multithreaded?])
+    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 Removed this from the source tree
-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
@@ -83,4 +79,4 @@ else
 fi
 
 dnl Generates the makefiles
-AC_OUTPUT(source/Makefile scripts/Makefile Makefile)
+AC_OUTPUT(documentation/Makefile source/Makefile scripts/Makefile Makefile)