VladPolskiy/openstreetmap-mod_tile-python-implementation
1
0
Fork 0
mirror of https://github.com/openstreetmap/mod_tile.git synced 2025-07-25 15:04:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

also link dependent libs / drop ancient support for pre 2.0

Browse Source
This commit is contained in:
Dane Springmeyer
2014-08-13 08:55:53 -07:00
parent fdaae04ec0
commit 253d98a272
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
m4/ax_lib_mapnik.m4
View File

@ -71,22 +71,11 @@ AC_DEFUN([AX_LIB_MAPNIK],
fi fi
if test ! -x "$MAPNIK_CONFIG"; then if test ! -x "$MAPNIK_CONFIG"; then
# mapnik version < 2.0 did not have mapnik-config, so need to manually figure out the configuration
AC_CHECK_HEADER(mapnik/version.hpp,[],[AC_MSG_ERROR([Did not find mapnik])])
AC_CHECK_LIB([mapnik],[main],[MAPNIK_LDFLAGS="-lmapnik" found_libmapnik="yes"])
AC_CHECK_LIB([mapnik2],[main],[MAPNIK_LDFLAGS="-lmapnik2" found_libmapnik="yes"])
if test "$found_libmapnik" = "yes"; then
AC_MSG_CHECKING([for mapnik libraries])
AC_MSG_RESULT([yes])
else
AC_MSG_ERROR([Did not find usable mapnik library])
fi
else
if test "$MAPNIK_CONFIG" != "no"; then if test "$MAPNIK_CONFIG" != "no"; then
AC_MSG_CHECKING([for mapnik libraries]) AC_MSG_CHECKING([for mapnik libraries])
MAPNIK_CFLAGS="`$MAPNIK_CONFIG --cflags`" MAPNIK_CFLAGS="`$MAPNIK_CONFIG --cflags`"
MAPNIK_LDFLAGS="`$MAPNIK_CONFIG --libs`" MAPNIK_LDFLAGS="`$MAPNIK_CONFIG --libs` `$MAPNIK_CONFIG --ldflags` `$MAPNIK_CONFIG --dep-libs`"
MAPNIK_VERSION=`$MAPNIK_CONFIG --version` MAPNIK_VERSION=`$MAPNIK_CONFIG --version`
AC_DEFINE([HAVE_MAPNIK], [1], AC_DEFINE([HAVE_MAPNIK], [1],