summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rwxr-xr-xconfigure4
-rw-r--r--configure.ac3
3 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 872ecd83..ad537118 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-28 David Smith <dsmith@redhat.com>
+
+ PR 5685. From Eugeniy Meshcheryakov <eugen@debian.org>
+ * configure.ac: If "--enable-sqlite" is specified, define
+ HAVE_LIBSQLITE3.
+ * configure: Regenerated.
+
2008-01-26 Frank Ch. Eigler <fche@elastic.org>
PR 5673.
diff --git a/configure b/configure
index dff77901..0a14c6a5 100755
--- a/configure
+++ b/configure
@@ -6029,6 +6029,10 @@ echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_open" >&6; }
if test $ac_cv_lib_sqlite3_sqlite3_open = yes; then
sqlite3_LIBS=-lsqlite3
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBSQLITE3 1
+_ACEOF
+
else
if test "x$enable_sqlite" != xcheck; then
{ { echo "$as_me:$LINENO: error: --enable-sqlite was given, but test for sqlite failed
diff --git a/configure.ac b/configure.ac
index f5fcc968..8ce6da11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,7 +85,8 @@ AC_ARG_ENABLE([sqlite],
sqlite3_LIBS=
AS_IF([test "x$enable_sqlite" != xno],
[AC_CHECK_LIB([sqlite3], [sqlite3_open],
- [AC_SUBST([sqlite3_LIBS], [-lsqlite3])],
+ [AC_SUBST([sqlite3_LIBS], [-lsqlite3])
+ AC_DEFINE([HAVE_LIBSQLITE3])],
[if test "x$enable_sqlite" != xcheck; then
AC_MSG_FAILURE([--enable-sqlite was given, but test for sqlite failed])
fi])])