configure: use --with-shared-sqlite instead of --enable-shared-sqlite

[solanum.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9ab0cbf98cbd4a222c48aa1b945634f2782c1d9c..c6152a7b69180ab753313a3a26be3e821b7cc044 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.4.0-dev])
+AC_INIT([charybdis], [3.5.0-dev])
 
 AC_CONFIG_HEADER(include/setup.h)
 
@@ -226,7 +226,7 @@ if test "$LEX" = ":"; then
 fi
 
 AC_ARG_ENABLE([fhs-paths],
-       [AS_HELP_STRING([--enable-fhs-paths], [User more FHS-like pathnames (for packagers).])],
+       [AS_HELP_STRING([--enable-fhs-paths], [Use more FHS-like pathnames (for packagers).])],
        [],
        [dnl detect if the user appears to want --enable-fhs-paths
        AS_IF([test "$libexecdir" = '${exec_prefix}/libexec' && \
@@ -253,7 +253,7 @@ AC_SUBST([pkglibdir])
 AC_SUBST([rundir])
 AC_SUBST([pkgrundir])
 AC_SUBST([pkglocalstatedir])
-AC_DEFINE_DIR([PKGLOCALSTATEDIR], [pkglocalstatedir], [[Directory in which to store state, such as band database]])
+AC_DEFINE_DIR([PKGLOCALSTATEDIR], [pkglocalstatedir], [[Directory in which to store state, such as ban database]])
 AC_SUBST([pkglibexecdir])
 AC_DEFINE_DIR([PKGLIBEXECDIR], [pkglibexecdir], [Directory where binaries the IRCd itself spawns live])
 
@@ -564,6 +564,25 @@ AC_CHECK_HEADER(zlib.h, [
 
 fi
 
+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
+
+AC_CHECK_HEADER(sqlite3.h, [
+    AC_CHECK_LIB(sqlite3, sqlite3_open,
+    [
+        AC_SUBST(SQLITE_LD, -lsqlite3)
+    ], shared_sqlite=no)
+], shared_sqlite=no)
+
+fi
+
+if test "$shared_sqlite" = no; then
+    AC_SUBST(SQLITE_SRC, sqlite3.c)
+fi
+
 dnl IO Loop Selection
 dnl =================
 
@@ -609,22 +628,15 @@ AC_ARG_ENABLE(epoll, AC_HELP_STRING([--enable-epoll],[Force sys_epoll usage (Lin
 ],)
 
 dnl **********************************************************************
-dnl Check for --with-confdir
+dnl Check for --with-confdir [deprecated, use --sysconfdir instead]
 dnl **********************************************************************
 
-AC_MSG_CHECKING([whether to modify confdir])
-AC_ARG_WITH(confdir, 
-AC_HELP_STRING([--with-confdir=DIR],
-              [Directory to install config files.]),
-              [ confdir=`echo $withval | sed 's/\/$//'`
-                AC_MSG_RESULT(yes)
-                AC_DEFINE_DIR(ETC_DIR, confdir, [Prefix where config files are installed.])
-                AC_SUBST_DIR([confdir]) ],
-              [ confdir='${sysconfdir}'
-                AC_MSG_RESULT(no)
-                AC_DEFINE_DIR(ETC_DIR, confdir, [Prefix where config files are installed.])
-                AC_SUBST_DIR([confdir])]
-)
+AC_ARG_WITH([confdir],
+       [AC_HELP_STRING([--with-confdir=DIR],
+              [Directory to install config files [deprecated, use --sysconfdir instead].])],
+       [ sysconfdir=`echo $withval | sed 's/\/$//'` ],
+       [ confdir='${sysconfdir}' ])
+AC_DEFINE_DIR([ETC_DIR], [sysconfdir], [Prefix where config files are installed.])
 
 dnl **********************************************************************
 dnl Check for --with-logdir
@@ -1247,11 +1259,11 @@ AC_CONFIG_FILES(                        \
        src/Makefile                    \
        modules/Makefile                \
        tools/Makefile                  \
-       tools/genssl.sh                 \
+       tools/genssl                    \
        doc/Makefile                    \
        help/Makefile                   \
 )
-AC_CONFIG_COMMANDS([tools/genssl.sh_chmod], [chmod 755 tools/genssl.sh])
+AC_CONFIG_COMMANDS([tools/genssl_chmod], [chmod 755 tools/genssl])
 
 AC_OUTPUT