Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix build

Browse source
This commit is contained in:
Brian Anderson 2013-01-15 12:50:25 -08:00
parent f13e6ac388
commit dc4c1c10f3
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
configure vendored
View file

@ -383,14 +383,15 @@ step_msg "running submodule autoconf scripts"
if [ $CFG_OSTYPE = "apple-darwin" ] if [ $CFG_OSTYPE = "apple-darwin" ]
then then
OSX_PKG_CONFIG_M4_MACROS="-I/usr/local/share/aclocal"
LIBTOOLIZE=glibtoolize LIBTOOLIZE=glibtoolize
else else
OSX_PKG_CONFIG_M4_MACROS=""
LIBTOOLIZE=libtoolize LIBTOOLIZE=libtoolize
fi fi
OSX_PKG_CONFIG_M4_MACROS="/usr/local/share/aclocal" PIXMAN_ACLOCALCMD="aclocal ${OSX_PKG_CONFIG_M4_MACROS}"
PIXMAN_ACLOCALCMD="aclocal -I${OSX_PKG_CONFIG_M4_MACROS} --install" CAIRO_ACLOCALCMD="aclocal ${OSX_PKG_CONFIG_M4_MACROS} -Ibuild"
CAIRO_ACLOCALCMD="aclocal -I${OSX_PKG_CONFIG_M4_MACROS} -Ibuild --install"
AUTOCMD="${LIBTOOLIZE} && autoconf && autoheader && automake --add-missing --copy --no-force" AUTOCMD="${LIBTOOLIZE} && autoconf && autoheader && automake --add-missing --copy --no-force"
CAIRO_BOILERPLATE="touch boilerplate/Makefile.am.features && touch src/Makefile.am.features" CAIRO_BOILERPLATE="touch boilerplate/Makefile.am.features && touch src/Makefile.am.features"
PIXMAN_AUTOCMD="${PIXMAN_ACLOCALCMD} && ${AUTOCMD}" PIXMAN_AUTOCMD="${PIXMAN_ACLOCALCMD} && ${AUTOCMD}"
@ -479,7 +480,7 @@ do
fi fi
# libpng isn't available by default on OS X so don't make it required for cairo # libpng isn't available by default on OS X so don't make it required for cairo
# png is in turn required for the svg backend # png is in turn required for the svg backend
if [ $i = "cairo" -a ${CFG_OSTYPE} == "apple-darwin" ]; then if [ $i = "cairo" -a ${CFG_OSTYPE} = "apple-darwin" ]; then
CONFIGURE_ARGS="--enable-png=no --enable-svg=no --enable-ft=no --enable-xlib=no" CONFIGURE_ARGS="--enable-png=no --enable-svg=no --enable-ft=no --enable-xlib=no"
fi fi