begin 3.6 development

[solanum.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 57e43993400309ed5899de90f92307b74e3c1a2f..8d8d739cefcad97e5fa2da4afe07eaba32fa0217 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -10,8 +10,9 @@ 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)
 
 AC_PREFIX_DEFAULT($HOME/ircd)
@@ -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
 
@@ -571,37 +563,20 @@ AC_HELP_STRING([--with-shared-sqlite],[Use shared sqlite]),
 [shared_sqlite=$withval],[shared_sqlite=no])
 
 if test "$shared_sqlite" = yes; then
-
-saveCPPFLAGS="$CPPFLAGS"
-saveLIBS="$LIBS"
-
-dnl XXX: *BSD uses /usr/local for shared sqlite libs and includes
-OSNAME=`uname -s`
-case $OSNAME in
-       *BSD)
-               CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-               LIBS="$LIBS -L/usr/local/lib"
-       ;;
-esac
-
-AC_CHECK_HEADER(sqlite3.h, [
-       AC_CHECK_LIB(sqlite3, sqlite3_open, [
-               SQLITE_LD="$CPPFLAGS $LIBS -lsqlite3"
+       PKG_CHECK_MODULES(SQLITE, [sqlite3],
+       [
+               shared_sqlite=yes
        ], shared_sqlite=no)
-], shared_sqlite=no)
-
 fi
 
 if test "$shared_sqlite" = no; then
        SQLITE_SRC="sqlite3.c"
 fi
 
-AC_SUBST(SQLITE_LD)
+AC_SUBST(SQLITE_LD, "$SQLITE_LIBS")
+AC_SUBST(SQLITE_INCLUDES, "$SQLITE_CFLAGS")
 AC_SUBST(SQLITE_SRC)
 
-CPPFLAGS="$saveCPPFLAGS"
-LIBS="$saveLIBS"
-
 dnl IO Loop Selection
 dnl =================