begin 3.6 development

[solanum.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 582170cbf27e4a12a355f913f77b6bce3279d9b9..8d8d739cefcad97e5fa2da4afe07eaba32fa0217 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ AC_PREREQ(2.57)
 dnl Sneaky way to get an Id tag into the configure script
 AC_COPYRIGHT([$Id: configure.ac 3516 2007-06-10 16:14:03Z jilles $])
 
-AC_INIT([charybdis], [3.5.0-dev])
+AC_INIT([charybdis], [3.6.0-dev])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADER(include/setup.h)
@@ -27,6 +27,7 @@ AC_LANG(C)
 dnl Make sure autoconf doesn't interfere with cflags -jmallett
 CFLAGS="$OLD_CFLAGS"
 
+AC_CONFIG_SUBDIRS(libratbox)
 
 dnl Check for various compilers. -jmallett
 dnl But if $CC turns out to be gcc, sure as hell it's, well, gcc. -joshk
@@ -81,7 +82,7 @@ esac
 
 fi
 
-AC_MSG_CHECKING([uname -s for Solaris, AIX or HPUX])
+AC_MSG_CHECKING([uname -s for Solaris, AIX, HPUX or Darwin])
 OSNAME=`uname -s`
 case "$OSNAME" in
         HP-UX*)
@@ -105,25 +106,16 @@ case "$OSNAME" in
                AC_MSG_RESULT(AIX - Sorry you poor bastard..really we are)
                IRC_CFLAGS="$IRC_CFLAGS -Wl,-brtl -Wl,-G"
        ;;
-       *)
-               AC_MSG_RESULT(no)
-       ;;
-esac
-
-if test "$ac_cv_c_compiler_gnu" = yes; then
-       AC_MSG_CHECKING(if $CC is Apple GCC)
-
-       case `$CC -v 2>&1 | tail -n 1` in
-       *Apple*)
-               AC_MSG_RESULT(yes)
+       Darwin*)
+               AC_MSG_RESULT(Darwin)
                AppleGCC=yes
        ;;
        *)
                AC_MSG_RESULT(no)
-               AppleGCC=no
        ;;
-       esac
+esac
 
+if test "$ac_cv_c_compiler_gnu" = yes; then
        IRC_CFLAGS="$IRC_CFLAGS -O0 -Wall -std=gnu99"
 fi