move sqlite3 detection of libs and include flags to pkg-config to accomodate newer...

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2223 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/configure.ac b/configure.ac
index 2e8e1f4c6397b2770241d8d3a73e295a954b8bf9..bb8b8c0610ccbeee2927e41a527c367abb1d5843 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -431,6 +431,7 @@ fi
 
 if test "$needsqlite"
 then
+
         AC_ARG_WITH(sqlite,
             [  --with-sqlite=<path>     root directory path of SQLite installation],
             [SQLITE_lib_check="$withval/lib/sqlite $with_sqlite/lib"
@@ -492,61 +493,9 @@ fi
 
 if test "$needsqlite3"
 then
-        AC_ARG_WITH(sqlite3,
-            [  --with-sqlite3=<path>     root directory path of SQLite3 installation],
-            [SQLITE3_lib_check="$withval/lib/sqlite3 $with_sqlite3/lib"
-             SQLITE3_inc_check="$withval/include/sqlite3"],
-            [SQLITE3_lib_check="/usr/local/sqlite3/lib/sqlite3 /usr/local/lib/sqlite3 /usr/lib/sqlite3 /usr/local/sqlite3/lib /usr/local/lib /opt/sqlite3/lib /usr/lib"
-             SQLITE3_inc_check="/usr/local/sqlite3/include/sqlite3 /usr/local/include/sqlite3/ /usr/local/include /opt/sqlite3/include/sqlite3 /opt/sqlite3/include /usr/include/ /usr/include/sqlite3"])
-        AC_ARG_WITH(sqlite3-lib,
-            [  --with-sqlite3-lib=<path> directory path of SQLite3 library installation],
-            [SQLITE3_lib_check="$withval/lib/sqlite3 $withval/sqlite3 $withval"])
-        AC_ARG_WITH(sqlite3-includes,
-            [  --with-sqlite3-includes=<path> directory path of SQLite3 header installation],
-            [SQLITE3_inc_check="$withval/include/sqlite3 $withval/sqlite3 $withval"])
-        AC_MSG_CHECKING([for SQLite3 library directory])
-        SQLITE3_libdir=
-        for m in $SQLITE3_lib_check; do
-                if test -d "$m" && \
-                   (test -f "$m/libsqlite3.so" || test -f "$m/libsqlite3.a")
-                then
-                        SQLITE3_libdir=$m
-                        break
-                fi
-        done
-                if test -z "$SQLITE3_libdir"; then
-                AC_MSG_ERROR([Didn't find the sqlite3 library dir in '$SQLITE3_lib_check'])
-        fi
-        case "$SQLITE3_libdir" in
-           /usr/lib ) SQLITE3_lib="" ;;
-          /* ) SQLITE3_lib="-L$SQLITE3_libdir -Wl,-rpath,$SQLITE3_libdir"
-               LDFLAGS="$SQLITE3_lib $LDFLAGS"
-               ;;
-          * )  AC_MSG_ERROR([The SQLite3 library directory ($SQLITE3_libdir) must be an absolute path.]) ;;
-        esac
-
-        AC_SUBST(SQLITE3_lib)
-        AC_MSG_RESULT([$SQLITE3_libdir])
-        AC_MSG_CHECKING([for SQLite3 include directory])
-        SQLITE3_incdir=
-        for m in $SQLITE3_inc_check; do
-                if test -d "$m" && test -f "$m/sqlite3.h"
-                then
-                        SQLITE3_incdir=$m
-                        break
-                fi
-        done
-                if test -z "$SQLITE3_incdir"; then
-                AC_MSG_ERROR([Didn't find the SQLite3 include dir in '$SQLITE3_inc_check'])
-        fi
-        case "$SQLITE3_incdir" in
-          /* ) ;;
-          * )  AC_MSG_ERROR([The SQLite3 include directory ($SQLITE3_incdir) must be an absolute path.]) ;;
-        esac
-        AC_SUBST(SQLITE3_incdir)
-        AC_MSG_RESULT([$SQLITE3_incdir])
-
-#       LIBS="$LIBS -lsqlite3"
+       PKG_CHECK_MODULES(SQLITE3, sqlite3, HAVE_SQLITE=yes, AC_MSG_ERROR([+Could not find sqlite3]))
+        AC_SUBST(SQLITE3_LIBS)
+        AC_SUBST(SQLITE3_CFLAGS)
 fi
 
 if test "$needunixodbc"

diff --git a/modules/gsqlite3backend/Makefile.am b/modules/gsqlite3backend/Makefile.am
index e8aae330fe88fd90aeba33fe39bb1fe4ca907cd4..30090f486db55b219245e09df846f37f0d62cc87 100644 (file)
--- a/modules/gsqlite3backend/Makefile.am
+++ b/modules/gsqlite3backend/Makefile.am
@@ -3,7 +3,7 @@ lib_LTLIBRARIES = libgsqlite3backend.la
 
 EXTRA_DIST=OBJECTFILES OBJECTLIBS
 
-INCLUDES=-I@SQLITE3_incdir@
+INCLUDES=-I@SQLITE3_CFLAGS@
 
 libgsqlite3backend_la_SOURCES=gsqlite3backend.cc gsqlite3backend.hh \
                 ssqlite3.hh ssqlite3.cc

diff --git a/modules/gsqlite3backend/ssqlite3.cc b/modules/gsqlite3backend/ssqlite3.cc
index 2f32ef1c87e0878f49c39075e4feaa5aa142b9ae..a6425e2ac84806ea3fb674513114c4690d31bf00 100644 (file)
--- a/modules/gsqlite3backend/ssqlite3.cc
+++ b/modules/gsqlite3backend/ssqlite3.cc
@@ -118,7 +118,7 @@ bool SSQLite3::getRow( row_t & row )
   }
   
   if(rc == SQLITE_CANTOPEN) {
-    string error ="CANTOPEN error in sqlite3, often caused by unwritable sqlite3 directory: "+string(sqlite3_errmsg(m_pDB));
+    string error ="CANTOPEN error in sqlite3, often caused by unwritable sqlite3 db *directory*: "+string(sqlite3_errmsg(m_pDB));
     sqlite3_finalize(m_pStmt);
     throw sPerrorException(error);
   }