From 806f4efc342a3dcf383264f678fbb75cd5046afa Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Fri, 11 Apr 2014 14:37:14 -0400 Subject: [PATCH 1/2] check for autotools --- setup-libraries.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/setup-libraries.sh b/setup-libraries.sh index adca11e09..090ac4d78 100755 --- a/setup-libraries.sh +++ b/setup-libraries.sh @@ -1,8 +1,13 @@ #!/bin/sh set -e -u +if [ ! `which aclocal` ] || [ ! `which automake` ] || [ ! `which autoconf` ] || [ ! `which glibtool` ]; then + echo 'autotools commands not found: run "brew install autoconf automake libtool" before continuing' + exit 1 +fi + if [ ! -d 'mapnik-packaging' ]; then - git clone --depth=0 https://github.com/mapnik/mapnik-packaging.git + git clone --depth=1 https://github.com/mapnik/mapnik-packaging.git fi cd mapnik-packaging/osx/ From 36c3123de783a6cf18cbd3c1add07b72bebc9ca7 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Fri, 11 Apr 2014 14:40:38 -0400 Subject: [PATCH 2/2] fix boost setup --- setup-libraries.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/setup-libraries.sh b/setup-libraries.sh index 090ac4d78..d3293165f 100755 --- a/setup-libraries.sh +++ b/setup-libraries.sh @@ -41,9 +41,12 @@ source MacOSX.sh if [ ! -f out/build-cpp11-libcpp-x86_64/lib/libuv.a ] ; then ./scripts/build_libuv.sh ; fi if [ ! -f out/build-cpp11-libcpp-x86_64/lib/libssl.a ] ; then ./scripts/build_openssl.sh ; fi if [ ! -f out/build-cpp11-libcpp-x86_64/lib/libcurl.a ] ; then ./scripts/build_curl.sh ; fi + if [ ! -d out/build-cpp11-libcpp-x86_64/include/boost ] ; then ./scripts/build_boost.sh `pwd`/../../src/ `pwd`/../../linux/ ; fi echo ' ...done' ./scripts/make_universal.sh cd ../../ -./configure --pkg-config-root=`pwd`/mapnik-packaging/osx/out/build-cpp11-libcpp-universal/lib/pkgconfig +./configure \ +--pkg-config-root=`pwd`/mapnik-packaging/osx/out/build-cpp11-libcpp-universal/lib/pkgconfig \ +--boost=`pwd`/mapnik-packaging/osx/out/build-cpp11-libcpp-universal/ \ No newline at end of file