Only build SQLite when there's no system-provided library.

diff --git a/configure.ac b/configure.ac
index 549239875c9eb382178e7c8c642ecca3f1d12dd1..1b326836659f9f9dbbdc4b6ad5700e84adbcccc1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -64,10 +64,48 @@ AC_CHECK_LIB(socket, getsockname)
 AC_CHECK_LIB(ws2_32, getsockname)
 AC_CHECK_LIB(shlwapi, PathRemoveFileSpecA)
 
+AC_MSG_CHECKING([for OpenSSL])
+AC_LANG_PUSH(C)
 AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]], [])],
-       [],
-       [AC_MSG_ERROR([You need the OpenSSL headers and libraries in order to build this application]) ])
+       AC_LANG_PROGRAM([[#include <openssl/ssl.h>]], []),
+       [
+       AC_MSG_RESULT([yes])
+       ],
+       [
+       AC_MSG_RESULT([no])
+       AC_MSG_ERROR([You need the OpenSSL headers and libraries in order to build this application])
+       ]
+       )
+AC_LANG_POP(C)
+
+AC_CHECK_LIB(sqlite, sqlite3_open)
+
+AC_MSG_CHECKING([for SQLite3])
+AC_LANG_PUSH(C)
+AC_COMPILE_IFELSE(
+       AC_LANG_PROGRAM([[#include <sqlite3.h>]], []),
+       [
+       AC_MSG_RESULT([yes])
+       bundled_sqlite3=no
+       ],
+       [
+       AC_MSG_ERROR([no])
+       bundled_sqlite3=yes
+       ]
+       )
+AC_LANG_POP(C)
+
+AM_CONDITIONAL([USE_BUNDLED_SQLITE3], [test "$bundled_sqlite3" = yes])
+
+if test "$bundled_sqlite3" = yes; then
+       SQLITE3_LDFLAGS=${top_builddir}/third-party/sqlite/libsqlite3.la
+       SQLITE3_CPPFLAGS=-I${top_srcdir}/third-party/sqlite
+else
+       SQLITE3_LDFLAGS=
+       SQLITE3_CPPFLAGS=
+fi
+AC_SUBST([SQLITE3_LDFLAGS])
+AC_SUBST([SQLITE3_CPPFLAGS])
 
 AC_OUTPUT([
 Makefile

diff --git a/third-party/Makefile.am b/third-party/Makefile.am
new file mode 100644 (file)
index 0000000..58a7323
--- /dev/null
+++ b/third-party/Makefile.am
@@ -0,0 +1,11 @@
+## Process this file with automake to produce Makefile.in
+
+if USE_BUNDLED_SQLITE3
+BUNDLED_SQLITE3=sqlite
+endif
+
+SUBDIRS = \
+       ltdl \
+       $(BUNDLED_SQLITE3) \
+       cJSON \
+       mmatch