From: Ruben Kerkhof Date: Wed, 24 Dec 2014 18:20:56 +0000 (+0100) Subject: Always check for libsqlite3 X-Git-Tag: rec-3.7.0-rc1~81^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c6095229ff5bf041a4f291e1ef92b6bdb4adbcb;p=thirdparty%2Fpdns.git Always check for libsqlite3 It can still be overridden by setting SQLITE3_LIBS and SQLITE3_CFLAGS --- diff --git a/configure.ac b/configure.ac index 5a4ddd19f4..253e5bcd5a 100644 --- a/configure.ac +++ b/configure.ac @@ -94,12 +94,8 @@ AC_ARG_WITH([sqlite3], ) AC_MSG_RESULT([$with_sqlite3]) -SQLITE3PC=sqlite3 AS_IF([test "x$with_sqlite3" != "xno"], [ needsqlite3=yes - AS_IF([test "x$with_sqlite3" != "xyes"], [ - SQLITE3PC=$with_sqlite3 - ]) ]) dnl Checks for typedefs, structures, and compiler characteristics. @@ -285,7 +281,7 @@ AM_CONDITIONAL([LMDB],[test "x$needlmdb" = "xyes"]) AM_CONDITIONAL([SQLITE3], [test "x$needsqlite3" = "xyes"]) AS_IF([test "x$needsqlite3" = "xyes"], [ - PKG_CHECK_MODULES([SQLITE3], $SQLITE3PC, + PKG_CHECK_MODULES([SQLITE3], [sqlite3], [AC_DEFINE([HAVE_SQLITE3], [1], [Define to 1 if you have sqlite3])], [AC_MSG_ERROR([Could not find libsqlite3])] )