X-Git-Url: https://git.hcoop.net/clinton/bobotpp.git/blobdiff_plain/94939e54a0f52bbbdec5f5baf3d247e692521138..9f3a011c142a632fbcf8597ab85219c50c7ef410:/configure.ac

diff --git a/configure.ac b/configure.ac
index b76c68b..5d42ad0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PRERQ(2.50)
-AC_INIT([Bobot++], [2.2.3], [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)
@@ -24,34 +24,24 @@ AC_ARG_ENABLE(scripting,
   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])
 
-AC_SUBST(CXXFLAGS, "$GUILE_CFLAGS $CXXFLAGS")
+AC_SUBST(CXXFLAGS, "$PTHREAD_CFLAGS $GUILE_CFLAGS $CXXFLAGS")
 AC_SUBST(LDFLAGS, "$GUILE_LDFLAGS $LDFLAGS")
-
-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(LIBS, "$PTHREAD_LIBS $LIBS")
 
 dnl Checks for programs.
 AC_PROG_CXX
@@ -66,16 +56,6 @@ AC_CHECK_LIB(crypt, crypt, [LDFLAGS="-lcrypt $LDFLAGS]")
 AC_CHECK_LIB(socket, socket, [LDFLAGS="-lsocket $LDFLAGS]")
 AC_CHECK_LIB(nsl, connect, [LDFLAGS="-lnsl $LDFLAGS]")
 
-dnl CC++ is special (no function to check_lib on
-dnl AC_CHECK_PROG(CCGNU_FOUND, [ccgnu2-config],
-dnl			     [yes], [no])
-dnl if test x$CCGNU_FOUND = "xyes";
-dnl then 
-dnl   LDFLAGS="$(ccgnu2-config --libs) $LDFLAGS"
-dnl else
-dnl   AC_MSG_ERROR([Please install CommonC++2 1.0 or greater])
-dnl fi
-
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h)