From 253d98a2726941471a4c7d22bd9d6135baa3ff1c Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Wed, 13 Aug 2014 08:55:53 -0700 Subject: [PATCH] also link dependent libs / drop ancient support for pre 2.0 --- m4/ax_lib_mapnik.m4 | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/m4/ax_lib_mapnik.m4 b/m4/ax_lib_mapnik.m4 index dcd2ccb..1fede84 100644 --- a/m4/ax_lib_mapnik.m4 +++ b/m4/ax_lib_mapnik.m4 @@ -71,22 +71,11 @@ AC_DEFUN([AX_LIB_MAPNIK], fi 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 AC_MSG_CHECKING([for mapnik libraries]) 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` AC_DEFINE([HAVE_MAPNIK], [1],