VladPolskiy/openstreetmap-mod_tile-python-implementation
1
0
Fork 0
mirror of https://github.com/openstreetmap/mod_tile.git synced 2025-07-21 23:38:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix detection of mapnik-config

Browse Source
This commit is contained in:
Dane Springmeyer
2014-08-13 12:01:31 -07:00
parent 253d98a272
commit e6e1cfffc4
2 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -10,7 +10,7 @@ before_install:
- sudo apt-get update -qq - sudo apt-get update -qq
install: 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 - sudo apt-get install -y gcc-4.8 g++-4.8
before_script: before_script:

26
m4/ax_lib_mapnik.m4
View File

@ -70,23 +70,21 @@ AC_DEFUN([AX_LIB_MAPNIK],
AC_PATH_PROG([MAPNIK_CONFIG], [mapnik-config], []) AC_PATH_PROG([MAPNIK_CONFIG], [mapnik-config], [])
fi fi
if test ! -x "$MAPNIK_CONFIG"; then 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_CONFIG --ldflags` `$MAPNIK_CONFIG --dep-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],
[Define to 1 if mapnik libraries are available]) [Define to 1 if mapnik libraries are available])
found_libmapnik="yes" found_libmapnik="yes"
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
else else
found_libmapnik="no" found_libmapnik="no"
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi
fi fi
fi fi