summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2012-12-11 18:43:42 +0100
committerDan Winship <danw@gnome.org>2012-12-11 18:57:23 +0100
commitade7a484f33f223defad9acb50396058767781e1 (patch)
tree1531f7988fc351f143c1ace48f46e7e205622c17 /configure.ac
parentdb084cb64d226afc8489386c7e3f45e6f584e43c (diff)
downloadlibsoup-ade7a484f33f223defad9acb50396058767781e1.tar.gz
Add SoupCookieJarDB to replace SoupCookieJarSqlite
Move SoupCookieJarSqlite (and its sqlite3 dependency) into libsoup from libsoup-gnome, but rename it to SoupCookieJarDB so libsoup-gnome can keep using the old name. SoupCookieJarSqlite is now just a wrapper around SoupCookieJarDB.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac14
1 files changed, 4 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac
index 3f5097c2..fe5403b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,6 +97,10 @@ PKG_CHECK_MODULES(XML, libxml-2.0)
AC_SUBST(XML_CFLAGS)
AC_SUBST(XML_LIBS)
+PKG_CHECK_MODULES(SQLITE, sqlite3)
+AC_SUBST(SQLITE_CFLAGS)
+AC_SUBST(SQLITE_LIBS)
+
dnl ***********************
dnl *** Check for Win32 ***
dnl ***********************
@@ -142,18 +146,8 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnome != no)
if test $with_gnome != no; then
AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled])
-
- PKG_CHECK_MODULES(SQLITE, sqlite3, :, [AC_MSG_ERROR(dnl
-[Could not find sqlite3 devel files:
-
-$SQLITE_PKG_ERRORS
-
-Pass "--without-gnome" to configure if you want to build libsoup
-without GNOME support.])])
fi
AC_SUBST(HAVE_GNOME)
-AC_SUBST(SQLITE_CFLAGS)
-AC_SUBST(SQLITE_LIBS)
dnl ***************