[mapserver-commits] r12477 - trunk/mapserver/mapcache
svn at osgeo.org
svn at osgeo.org
Fri Aug 26 07:30:02 EDT 2011
Author: tbonfort
Date: 2011-08-26 04:30:01 -0700 (Fri, 26 Aug 2011)
New Revision: 12477
Modified:
trunk/mapserver/mapcache/configure.in
Log:
Modified: trunk/mapserver/mapcache/configure.in
===================================================================
--- trunk/mapserver/mapcache/configure.in 2011-08-26 11:29:58 UTC (rev 12476)
+++ trunk/mapserver/mapcache/configure.in 2011-08-26 11:30:01 UTC (rev 12477)
@@ -675,16 +675,13 @@
if test -n "$SQLITE_LIBDIR" ; then
OLDLDFLAGS="$LDFLAGS" ; LDFLAGS="$LDFLAGS -L$SQLITE_LIBDIR -lsqlite3"
AC_CHECK_LIB(sqlite3, sqlite3_open_v2, SQLITE_LIB="-L$SQLITE_LIBDIR -lsqlite3",,)
- if test -n "$SQLITE_LIB" ; then
- AC_MSG_RESULT([using libsqlite3 from system libs.])
- else
+ if test -z "$SQLITE_LIB" ; then
AC_CHECK_LIB(sqlite3, sqlite3_open,
AC_MSG_ERROR([SQLITE library found but is too old. Need at least 3.5.0]),
AC_MSG_ERROR([SQLITE (libsqlite3) library cannot be found. install or reconfigure with --with-sqlite=DIR]),
)
fi
LDFLAGS="$OLDLDFLAGS"
- AC_MSG_RESULT([using libsqlite from $SQLITE_LIB])
else
AC_MSG_ERROR([cannot find sqlite lib in $SQLITE_DIR])
fi
@@ -696,6 +693,7 @@
AC_MSG_ERROR([cannot find sqlite3.h])
fi
SQLITE_ENABLED="-DUSE_SQLITE"
+ AC_MSG_RESULT([using sqlite from $SQLITE_DIR])
elif test x"$with_sqlite" = "xyes"; then
dnl check for sqlite in system locations
More information about the mapserver-commits
mailing list