Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bustage from cairo landing - only config cairo if necessary

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@169784 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
tor%cs.brown.edu
2005-02-24 20:35:12 +00:00
parent 1148cd7972
commit e4f02b352a
1 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
mozilla/configure.in
View File

@@ -6426,30 +6426,32 @@ if test "$MOZ_LDAP_XPCOM"; then
ac_configure_args="$_SUBDIR_CONFIG_ARGS"
fi
if test -z "$MOZ_SYSTEM_CAIRO"; then
# these subdirs may not yet have been created in the build tree.
# don't use the "-p" switch to mkdir, since not all platforms have it
#
if test ! -d "gfx/cairo"; then
mkdir "gfx/cairo"
fi
if test ! -d "gfx/cairo/libpixman"; then
mkdir "gfx/cairo/libpixman"
fi
if test ! -d "gfx/cairo/cairo"; then
mkdir "gfx/cairo/cairo"
fi
if test "$MOZ_SVG_RENDERER_CAIRO" -o "$MOZ_ENABLE_CAIRO" ; then
if test -z "$MOZ_SYSTEM_CAIRO"; then
# these subdirs may not yet have been created in the build tree.
# don't use the "-p" switch to mkdir, since not all platforms have it
#
if test ! -d "gfx/cairo"; then
mkdir "gfx/cairo"
fi
if test ! -d "gfx/cairo/libpixman"; then
mkdir "gfx/cairo/libpixman"
fi
if test ! -d "gfx/cairo/cairo"; then
mkdir "gfx/cairo/cairo"
fi
ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist --includedir=$MOZ_BUILD_ROOT/dist/include/cairo"
AC_OUTPUT_SUBDIRS(gfx/cairo/libpixman)
ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist --includedir=$MOZ_BUILD_ROOT/dist/include/cairo"
AC_OUTPUT_SUBDIRS(gfx/cairo/libpixman)
export PKG_CONFIG_PATH=$MOZ_BUILD_ROOT/gfx/cairo/libpixman
ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist --disable-ps --disable-pdf --disable-png --disable-glitz --disable-xcb"
export PKG_CONFIG_PATH=$MOZ_BUILD_ROOT/gfx/cairo/libpixman
ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist --disable-ps --disable-pdf --disable-png --disable-glitz --disable-xcb"
if test -n "$MACOSX"; then
ac_configure_args="$ac_configure_args --disable-freetype --disable-xlib"
if test -n "$MACOSX"; then
ac_configure_args="$ac_configure_args --disable-freetype --disable-xlib"
fi
AC_OUTPUT_SUBDIRS(gfx/cairo/cairo)
ac_configure_args="$_SUBDIR_CONFIG_ARGS"
fi
AC_OUTPUT_SUBDIRS(gfx/cairo/cairo)
ac_configure_args="$_SUBDIR_CONFIG_ARGS"
fi