Build system cleanups

[clinton/bobotpp.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index d67fa85..b76c68b 100644 (file)
--- 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.0], [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)
@@ -20,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
@@ -35,6 +36,9 @@ AC_ARG_ENABLE(scripting,
   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],
@@ -95,4 +99,4 @@ else
 fi
 
 dnl Generates the makefiles
-AC_OUTPUT(source/Makefile scripts/Makefile Makefile)
+AC_OUTPUT(documentation/Makefile source/Makefile scripts/Makefile Makefile)