Build system cleanups

[clinton/bobotpp.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 3c96d2a..b76c68b 100644 (file)
--- 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.2CVS], [clinton@unknownlamer.org], [bobotpp])
+AC_INIT([Bobot++], [2.2.3], [clinton@unknownlamer.org], [bobotpp])
+AC_LANG([C++])
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)
 
@@ -19,6 +20,7 @@ AC_ARG_ENABLE(scripting,
 [
   if test $enableval = "no"; then
     AC_SUBST(GUILE_LDFLAGS,"")
+    AC_SUBST(GUILE_CFLAGS,"")
   else 
     GUILE_PROGS
     GUILE_FLAGS
@@ -29,10 +31,14 @@ AC_ARG_ENABLE(scripting,
 [
   GUILE_PROGS
   GUILE_FLAGS
+  GUILE_SITE_DIR
   AC_DEFINE(USESCRIPTS,1)
   AC_DEFINE(MULTITHREAD,1)
 ])
 
+AC_SUBST(CXXFLAGS, "$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],
@@ -60,6 +66,16 @@ 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)
@@ -83,6 +99,4 @@ else
 fi
 
 dnl Generates the makefiles
-AC_OUTPUT(source/Makefile)
-AC_OUTPUT(scripts/Makefile)
-AC_OUTPUT(Makefile)
+AC_OUTPUT(documentation/Makefile source/Makefile scripts/Makefile Makefile)