make sure pkg-config includes all system folders

2 files changed, 6 insertions, 4 deletions

diff --git a/configure b/configure
index 88f9dcf90a..3c9a421bf6 100755
--- a/configure
+++ b/configure
@@ -38,12 +38,14 @@ def pkg_config(pkg, pkgconfig_root):
   env = os.environ.copy()
   if pkgconfig_root:
     env["PKG_CONFIG_PATH"] = pkgconfig_root
+  env["PKG_CONFIG_ALLOW_SYSTEM_CFLAGS"] = "1"
+  env["PKG_CONFIG_ALLOW_SYSTEM_LIBS"] = "1"
   cmd = subprocess.Popen(['pkg-config', '--static', '--libs', pkg], stdout=subprocess.PIPE, env=env)
   libs, ret = cmd.communicate()
   if (ret): return None
 
-  cmd = subprocess.Popen(['pkg-config', '--cflags', pkg], stdout=subprocess.PIPE, env=env)
-  cflags, red = cmd.communicate()
+  cmd = subprocess.Popen(['pkg-config', '--static', '--cflags', pkg], stdout=subprocess.PIPE, env=env)
+  cflags, ret = cmd.communicate()
   if (ret): return None
 
   return (libs, cflags)
diff --git a/setup-libraries.sh b/setup-libraries.sh
index d044072687..44ad91fc66 100755
--- a/setup-libraries.sh
+++ b/setup-libraries.sh
@@ -61,7 +61,7 @@ rm -rf out/packages
 cd ../../
 ./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/
+--boost=`pwd`/mapnik-packaging/osx/out/build-cpp11-libcpp-universal
 
 elif [ ${UNAME} = 'Linux' ]; then
 
@@ -78,6 +78,6 @@ rm -rf out/packages
 cd ../../
 ./configure \
 --pkg-config-root=`pwd`/mapnik-packaging/osx/out/build-cpp11-libstdcpp-gcc-x86_64/lib/pkgconfig \
---boost=`pwd`/mapnik-packaging/osx/out/build-cpp11-libstdcpp-gcc-x86_64/
+--boost=`pwd`/mapnik-packaging/osx/out/build-cpp11-libstdcpp-gcc-x86_64
 
 fi