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.

diff --git a/ChangeLog b/ChangeLog
index 872ecd83bdce9fd645a876835fb2c727dfe5631a..ad537118d54394466f6abc9af1a24ebb1a8b1628 100644 (file)
--- 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 dff7790113af7a2ccd83f704de58657ec345b37f..0a14c6a52700aa704227b0ecf09645d57519575c 100755 (executable)
--- 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 f5fcc9686a1137e49a53e70d54c5767606a3a684..8ce6da11492674c1ad9c0ff6fd637e7338959035 100644 (file)
--- 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])])