X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/1870e06ad39a03478eb1c6bb6365983ca965da71..f26219863a4d2351a59dc52347e1c209d5a10e8e:/configure.ac

diff --git a/configure.ac b/configure.ac
index b58de4ba..8d8d739c 100644
--- 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
 
@@ -564,6 +556,27 @@ AC_CHECK_HEADER(zlib.h, [
 
 fi
 
+dnl Check for shared sqlite
+dnl ======================
+AC_ARG_WITH(shared-sqlite,
+AC_HELP_STRING([--with-shared-sqlite],[Use shared sqlite]),
+[shared_sqlite=$withval],[shared_sqlite=no])
+
+if test "$shared_sqlite" = yes; then
+	PKG_CHECK_MODULES(SQLITE, [sqlite3],
+	[
+		shared_sqlite=yes
+	], shared_sqlite=no)
+fi
+
+if test "$shared_sqlite" = no; then
+	SQLITE_SRC="sqlite3.c"
+fi
+
+AC_SUBST(SQLITE_LD, "$SQLITE_LIBS")
+AC_SUBST(SQLITE_INCLUDES, "$SQLITE_CFLAGS")
+AC_SUBST(SQLITE_SRC)
+
 dnl IO Loop Selection
 dnl =================