support for sqlite3 and ogr
This commit is contained in:
Andreas Volz
parent
f3a835d2f2
commit
c64269e1e3
6 changed files with 174 additions and 9 deletions
157
config/ax_lib_sqlite3.m4
Normal file
157
config/ax_lib_sqlite3.m4
Normal file
|
|
@ -0,0 +1,157 @@
|
|||
# ===========================================================================
|
||||
# http://autoconf-archive.cryp.to/ax_lib_sqlite3.html
|
||||
# ===========================================================================
|
||||
#
|
||||
# SYNOPSIS
|
||||
#
|
||||
# AX_LIB_SQLITE3([MINIMUM-VERSION])
|
||||
#
|
||||
# DESCRIPTION
|
||||
#
|
||||
# Test for the SQLite 3 library of a particular version (or newer)
|
||||
#
|
||||
# This macro takes only one optional argument, required version of SQLite
|
||||
# 3 library. If required version is not passed, 3.0.0 is used in the test
|
||||
# of existance of SQLite 3.
|
||||
#
|
||||
# If no intallation prefix to the installed SQLite library is given the
|
||||
# macro searches under /usr, /usr/local, and /opt.
|
||||
#
|
||||
# This macro calls:
|
||||
#
|
||||
# AC_SUBST(SQLITE3_CFLAGS)
|
||||
# AC_SUBST(SQLITE3_LDFLAGS)
|
||||
# AC_SUBST(SQLITE3_VERSION)
|
||||
#
|
||||
# And sets:
|
||||
#
|
||||
# HAVE_SQLITE3
|
||||
#
|
||||
# LAST MODIFICATION
|
||||
#
|
||||
# 2008-04-12
|
||||
#
|
||||
# COPYLEFT
|
||||
#
|
||||
# Copyright (c) 2008 Mateusz Loskot <mateusz@loskot.net>
|
||||
#
|
||||
# Copying and distribution of this file, with or without modification, are
|
||||
# permitted in any medium without royalty provided the copyright notice
|
||||
# and this notice are preserved.
|
||||
|
||||
AC_DEFUN([AX_LIB_SQLITE3],
|
||||
[
|
||||
AC_ARG_WITH([sqlite3],
|
||||
AC_HELP_STRING(
|
||||
[--with-sqlite3=@<:@ARG@:>@],
|
||||
[use SQLite 3 library @<:@default=yes@:>@, optionally specify the prefix for sqlite3 library]
|
||||
),
|
||||
[
|
||||
if test "$withval" = "no"; then
|
||||
WANT_SQLITE3="no"
|
||||
elif test "$withval" = "yes"; then
|
||||
WANT_SQLITE3="yes"
|
||||
ac_sqlite3_path=""
|
||||
else
|
||||
WANT_SQLITE3="yes"
|
||||
ac_sqlite3_path="$withval"
|
||||
fi
|
||||
],
|
||||
[WANT_SQLITE3="yes"]
|
||||
)
|
||||
|
||||
SQLITE3_CFLAGS=""
|
||||
SQLITE3_LDFLAGS=""
|
||||
SQLITE3_VERSION=""
|
||||
|
||||
if test "x$WANT_SQLITE3" = "xyes"; then
|
||||
|
||||
ac_sqlite3_header="sqlite3.h"
|
||||
|
||||
sqlite3_version_req=ifelse([$1], [], [3.0.0], [$1])
|
||||
sqlite3_version_req_shorten=`expr $sqlite3_version_req : '\([[0-9]]*\.[[0-9]]*\)'`
|
||||
sqlite3_version_req_major=`expr $sqlite3_version_req : '\([[0-9]]*\)'`
|
||||
sqlite3_version_req_minor=`expr $sqlite3_version_req : '[[0-9]]*\.\([[0-9]]*\)'`
|
||||
sqlite3_version_req_micro=`expr $sqlite3_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
|
||||
if test "x$sqlite3_version_req_micro" = "x" ; then
|
||||
sqlite3_version_req_micro="0"
|
||||
fi
|
||||
|
||||
sqlite3_version_req_number=`expr $sqlite3_version_req_major \* 1000000 \
|
||||
\+ $sqlite3_version_req_minor \* 1000 \
|
||||
\+ $sqlite3_version_req_micro`
|
||||
|
||||
AC_MSG_CHECKING([for SQLite3 library >= $sqlite3_version_req])
|
||||
|
||||
if test "$ac_sqlite3_path" != ""; then
|
||||
ac_sqlite3_ldflags="-L$ac_sqlite3_path/lib"
|
||||
ac_sqlite3_cppflags="-I$ac_sqlite3_path/include"
|
||||
else
|
||||
for ac_sqlite3_path_tmp in /usr /usr/local /opt ; do
|
||||
if test -f "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header" \
|
||||
&& test -r "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header"; then
|
||||
ac_sqlite3_path=$ac_sqlite3_path_tmp
|
||||
ac_sqlite3_cppflags="-I$ac_sqlite3_path_tmp/include"
|
||||
ac_sqlite3_ldflags="-L$ac_sqlite3_path_tmp/lib"
|
||||
break;
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
ac_sqlite3_ldflags="$ac_sqlite3_ldflags -lsqlite3"
|
||||
|
||||
saved_CPPFLAGS="$CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS $ac_sqlite3_cppflags"
|
||||
|
||||
AC_LANG_PUSH(C++)
|
||||
AC_COMPILE_IFELSE(
|
||||
[
|
||||
AC_LANG_PROGRAM([[@%:@include <sqlite3.h>]],
|
||||
[[
|
||||
#if (SQLITE_VERSION_NUMBER >= $sqlite3_version_req_number)
|
||||
// Everything is okay
|
||||
#else
|
||||
# error SQLite version is too old
|
||||
#endif
|
||||
]]
|
||||
)
|
||||
],
|
||||
[
|
||||
AC_MSG_RESULT([yes])
|
||||
success="yes"
|
||||
],
|
||||
[
|
||||
AC_MSG_RESULT([not found])
|
||||
succees="no"
|
||||
]
|
||||
)
|
||||
AC_LANG_POP([C++])
|
||||
|
||||
CPPFLAGS="$saved_CPPFLAGS"
|
||||
|
||||
if test "$success" = "yes"; then
|
||||
|
||||
SQLITE3_CFLAGS="$ac_sqlite3_cppflags"
|
||||
SQLITE3_LDFLAGS="$ac_sqlite3_ldflags"
|
||||
|
||||
ac_sqlite3_header_path="$ac_sqlite3_path/include/$ac_sqlite3_header"
|
||||
|
||||
dnl Retrieve SQLite release version
|
||||
if test "x$ac_sqlite3_header_path" != "x"; then
|
||||
ac_sqlite3_version=`cat $ac_sqlite3_header_path \
|
||||
| grep '#define.*SQLITE_VERSION.*\"' | sed -e 's/.* "//' \
|
||||
| sed -e 's/"//'`
|
||||
if test $ac_sqlite3_version != ""; then
|
||||
SQLITE3_VERSION=$ac_sqlite3_version
|
||||
else
|
||||
AC_MSG_WARN([Can not find SQLITE_VERSION macro in sqlite3.h header to retrieve SQLite version!])
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_SUBST(SQLITE3_CFLAGS)
|
||||
AC_SUBST(SQLITE3_LDFLAGS)
|
||||
AC_SUBST(SQLITE3_VERSION)
|
||||
AC_DEFINE([HAVE_SQLITE3], [], [Have the SQLITE3 library])
|
||||
fi
|
||||
fi
|
||||
])
|
||||
|
|
@ -130,6 +130,12 @@ if test "x$link_ltdl" = "xno"; then
|
|||
exit
|
||||
fi
|
||||
|
||||
## test for optional sqlite3 support
|
||||
AX_LIB_SQLITE3
|
||||
if test "x$success" = "xyes"; then
|
||||
AM_CONDITIONAL(HAVE_SQLITE3, 1)
|
||||
fi
|
||||
|
||||
PKG_CHECK_MODULES(PNG, libpng)
|
||||
AC_SUBST(PNG_CFLAGS)
|
||||
AC_SUBST(PNG_LIBS)
|
||||
|
|
@ -203,6 +209,8 @@ plugins/input/postgis/Makefile
|
|||
plugins/input/raster/Makefile
|
||||
plugins/input/shape/Makefile
|
||||
plugins/input/osm/Makefile
|
||||
plugins/input/ogr/Makefile
|
||||
plugins/input/sqlite/Makefile
|
||||
src/Makefile
|
||||
mapnik.pc
|
||||
mapnik-uninstalled.pc
|
||||
|
|
|
|||
|
|
@ -46,7 +46,6 @@ libmapnik_HEADERS = \
|
|||
filter_factory.hpp \
|
||||
filter_featureset.hpp \
|
||||
filter_parser.hpp \
|
||||
filter_parser_ast.hpp \
|
||||
filter_visitor.hpp \
|
||||
font_engine_freetype.hpp \
|
||||
font_set.hpp \
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
|
||||
SUBDIRS = \
|
||||
postgis\
|
||||
ogr \
|
||||
ogr \
|
||||
gdal \
|
||||
raster \
|
||||
shape \
|
||||
osm
|
||||
osm \
|
||||
sqlite
|
||||
|
||||
## File created by the gnome-build tools
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
if HAVE_OGR
|
||||
if HAVE_GDAL
|
||||
|
||||
pkglib_LTLIBRARIES = \
|
||||
ogr.la
|
||||
|
|
@ -8,10 +8,10 @@ ogr_la_SOURCES = \
|
|||
ogr_featureset.cpp
|
||||
|
||||
ogr_la_LIBADD = \
|
||||
${OGR_LDFLAGS}
|
||||
${GDAL_LDFLAGS}
|
||||
|
||||
ogr_la_CXXFLAGS = \
|
||||
${OGR_CFLAGS} \
|
||||
${GDAL_CFLAGS} \
|
||||
-I../../../include
|
||||
|
||||
ogr_la_LDFLAGS = \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
if HAVE_SQLITE
|
||||
if HAVE_SQLITE3
|
||||
|
||||
pkglib_LTLIBRARIES = \
|
||||
sqlite.la
|
||||
|
|
@ -8,10 +8,10 @@ sqlite_la_SOURCES = \
|
|||
sqlite_featureset.cpp
|
||||
|
||||
sqlite_la_LIBADD = \
|
||||
${SQLITE_LDFLAGS}
|
||||
${SQLITE3_LDFLAGS}
|
||||
|
||||
sqlite_la_CXXFLAGS = \
|
||||
${SQLITE_CFLAGS} \
|
||||
${SQLITE3_CFLAGS} \
|
||||
-I../../../include
|
||||
|
||||
sqlite_la_LDFLAGS = \
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue