fix detection of mapnik-config

openstreetmap · Aug 13, 2014 · e6e1cff · e6e1cff
1 parent 253d98a
commit e6e1cff
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,7 @@ before_install:
  - sudo apt-get update -qq
 
 install:
- - sudo apt-get -qq install build-essential apache2-threaded-dev
+ - sudo apt-get -qq install build-essential apache2-threaded-dev autotools-dev automake libtool
  - sudo apt-get install -y gcc-4.8 g++-4.8
 
 before_script:

diff --git a/m4/ax_lib_mapnik.m4 b/m4/ax_lib_mapnik.m4
@@ -70,23 +70,21 @@ AC_DEFUN([AX_LIB_MAPNIK],
             AC_PATH_PROG([MAPNIK_CONFIG], [mapnik-config], [])
         fi
 
-        if test ! -x "$MAPNIK_CONFIG"; then
-            if test "$MAPNIK_CONFIG" != "no"; then
-	            AC_MSG_CHECKING([for mapnik libraries])
+        if test "$MAPNIK_CONFIG" != "no"; then
+            AC_MSG_CHECKING([for mapnik libraries])
 
-        	    MAPNIK_CFLAGS="`$MAPNIK_CONFIG --cflags`"
-        	    MAPNIK_LDFLAGS="`$MAPNIK_CONFIG --libs` `$MAPNIK_CONFIG --ldflags` `$MAPNIK_CONFIG --dep-libs`"
-        	    MAPNIK_VERSION=`$MAPNIK_CONFIG --version`
+            MAPNIK_CFLAGS="`$MAPNIK_CONFIG --cflags`"
+            MAPNIK_LDFLAGS="`$MAPNIK_CONFIG --libs` `$MAPNIK_CONFIG --ldflags` `$MAPNIK_CONFIG --dep-libs`"
+            MAPNIK_VERSION=`$MAPNIK_CONFIG --version`
 
-        	    AC_DEFINE([HAVE_MAPNIK], [1],
-        	        [Define to 1 if mapnik libraries are available])
+            AC_DEFINE([HAVE_MAPNIK], [1],
+                [Define to 1 if mapnik libraries are available])
 
-        	    found_libmapnik="yes"
-	            AC_MSG_RESULT([yes])
-        	else
-	            found_libmapnik="no"
-	            AC_MSG_RESULT([no])
-	        fi
+            found_libmapnik="yes"
+            AC_MSG_RESULT([yes])
+        else
+            found_libmapnik="no"
+            AC_MSG_RESULT([no])
         fi
     fi