[asterisk-commits] twilson: branch twilson/sqlite_astdb r323321 - in /team/twilson/sqlite_astdb:...

[SVN commits to the Asterisk project]

Author: twilson
Date: Mon Jun 13 22:28:19 2011
New Revision: 323321

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=323321
Log:
Add autoconf stuff and fix main/Makefile

Modified:
    team/twilson/sqlite_astdb/configure
    team/twilson/sqlite_astdb/configure.ac
    team/twilson/sqlite_astdb/main/Makefile

Modified: team/twilson/sqlite_astdb/configure.ac
URL: http://svnview.digium.com/svn/asterisk/team/twilson/sqlite_astdb/configure.ac?view=diff&rev=323321&r1=323320&r2=323321
==============================================================================
--- team/twilson/sqlite_astdb/configure.ac (original)
+++ team/twilson/sqlite_astdb/configure.ac Mon Jun 13 22:28:19 2011
@@ -1970,6 +1970,12 @@
 
 AST_EXT_LIB_CHECK([SQLITE3], [sqlite3], [sqlite3_open], [sqlite3.h], [${PTHREAD_LIBS}], [${PTHREAD_CFLAGS}])
 
+if test "${PBX_SQLITE3}" != 1; then
+	AC_MSG_NOTICE(*** Asterisk now uses SQLite3 for the internal Asterisk database.)
+	AC_MSG_NOTICE(*** Please install the SQLite3 development package.)
+	exit 1
+fi
+
 AST_EXT_LIB_CHECK([CRYPTO], [crypto], [AES_encrypt], [openssl/aes.h])
 
 if test "$PBX_CRYPTO" = "1";

Modified: team/twilson/sqlite_astdb/main/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/twilson/sqlite_astdb/main/Makefile?view=diff&rev=323321&r1=323320&r2=323321
==============================================================================
--- team/twilson/sqlite_astdb/main/Makefile (original)
+++ team/twilson/sqlite_astdb/main/Makefile Mon Jun 13 22:28:19 2011
@@ -33,6 +33,7 @@
 AST_LIBS += $(OPENSSL_LIB)
 AST_LIBS += $(BKTR_LIB)
 AST_LIBS += $(LIBXML2_LIB) 
+AST_LIBS += $(SQLITE3_LIB)
 
 ifneq ($(findstring $(OSARCH), linux-gnu uclinux linux-uclibc linux-gnueabi kfreebsd-gnu),)
   ifneq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),)
@@ -169,7 +170,6 @@
 cygload: asterisk.dll
 else
 MAIN_TGT:=asterisk
-ASTLDFLAGS+=-lsqlite3
 endif
 
 ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)