A improvment of the sqlite detection. Now

it searches in $prefix/[bin|lib|include] and
if you specifiy -with-sqlite=path in path/[bin|lib|include]
which is need on freebsd and macosx. Where are the library of
external programms in e.g. /usr/local/...

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1574 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/autoconf/aclocal.m4 b/bacula/autoconf/aclocal.m4
index 32a4bca5de32277998aeabe66831b4bca96cfea3..928b33e2d8bf03b76ae76ccecc235427cd7ea810 100644 (file)
--- a/bacula/autoconf/aclocal.m4
+++ b/bacula/autoconf/aclocal.m4
@@ -503,6 +503,10 @@ AC_ARG_WITH(sqlite,
            SQLITE_INCDIR=/usr/include
            SQLITE_LIBDIR=/usr/lib
            SQLITE_BINDIR=/usr/bin      
+        elif test -f $prefix/include/sqlite.h; then
+           SQLITE_INCDIR=$prefix/include
+           SQLITE_LIBDIR=$prefix/lib
+           SQLITE_BINDIR=$prefix/bin      
         else
            AC_MSG_RESULT(no)
            AC_MSG_ERROR(Unable to find sqlite.h in standard locations)
@@ -512,6 +516,10 @@ AC_ARG_WITH(sqlite,
            SQLITE_INCDIR=$withval
            SQLITE_LIBDIR=$withval
            SQLITE_BINDIR=$withval
+        elif test -f $withval/include/sqlite.h; then
+           SQLITE_INCDIR=$withval/include
+           SQLITE_LIBDIR=$withval/lib
+           SQLITE_BINDIR=$withval/bin
         else
            AC_MSG_RESULT(no)
            AC_MSG_ERROR(Invalid SQLite directory $withval - unable to find sqlite.h under $withval)

diff --git a/bacula/configure b/bacula/configure
index b7ffa2b2006e6726473471b4bc9595c6efa4a464..14daca8e5fa741621e079f5d46a6d518f270d6d8 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -7649,6 +7649,10 @@ if test "${with_sqlite+set}" = set; then
            SQLITE_INCDIR=/usr/include
            SQLITE_LIBDIR=/usr/lib
            SQLITE_BINDIR=/usr/bin
+        elif test -f $prefix/include/sqlite.h; then
+           SQLITE_INCDIR=$prefix/include
+           SQLITE_LIBDIR=$prefix/lib
+           SQLITE_BINDIR=$prefix/bin
         else
            echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
@@ -7661,6 +7665,10 @@ echo "$as_me: error: Unable to find sqlite.h in standard locations" >&2;}
            SQLITE_INCDIR=$withval
            SQLITE_LIBDIR=$withval
            SQLITE_BINDIR=$withval
+        elif test -f $withval/include/sqlite.h; then
+           SQLITE_INCDIR=$withval/include
+           SQLITE_LIBDIR=$withval/lib
+           SQLITE_BINDIR=$withval/bin
         else
            echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6