servo: Merge remote branch 'origin/master'
authorJosh Matthews <josh@joshmatthews.net>
Thu, 28 Feb 2013 18:16:01 -0800
changeset 380007 934ecb19448f10b358188d83a873c43ad3a3d4de
parent 380006 8c2bb502d79efb05c886a7fe9493657edd5baf9c
child 380008 5ab3765a3e122276cca98eac80039a53311f4195
push id7198
push userjlorenzo@mozilla.com
push dateTue, 18 Apr 2017 12:07:49 +0000
treeherdermozilla-beta@d57aa49c3948 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
servo: Merge remote branch 'origin/master' Source-Repo: https://github.com/servo/servo Source-Revision: 314850d6f493bb4cd5e99e0f5243bb22c7bf0f86
servo/configure
--- a/servo/configure
+++ b/servo/configure
@@ -386,17 +386,24 @@ step_msg "running submodule autoconf scr
 
 # Pixman and cairo require some care to autoconf correctly for our in-tree build.
 # The normal autogen.sh files mostly just run autoreconfig but we need more fine control
 
 if [ $CFG_OSTYPE = "apple-darwin" ]
 then
     # pkg-config is installed in a different place on mac (via homebrew? not sure)
     # and the way to set this seems to be calling aclocal by hand (instead of via autoreconf)
-    OSX_PKG_CONFIG_M4_MACROS="-I/usr/share/aclocal -I/usr/local/share/aclocal"
+    if [ -d "/usr/local/share/aclocal" ]
+    then
+        OSX_PKG_CONFIG_M4_MACROS="-I/usr/local/share/aclocal"
+    fi
+    if [ -d "/usr/share/aclocal" ]
+    then
+        OSX_PKG_CONFIG_M4_MACROS="-I/usr/share/aclocal"
+    fi
     LIBTOOLIZE=glibtoolize
 else
     OSX_PKG_CONFIG_M4_MACROS=""
     LIBTOOLIZE=libtoolize
 fi
 
 PIXMAN_ACLOCALCMD="aclocal ${OSX_PKG_CONFIG_M4_MACROS}"
 CAIRO_ACLOCALCMD="aclocal ${OSX_PKG_CONFIG_M4_MACROS} -Ibuild"