Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bustage fix - flip cairo logic.

Browse Source
This commit is contained in:
tor%cs.brown.edu 2005-02-24 20:53:19 +00:00
parent f569e8bbec
commit 397f2c6e63
3 changed files with 33 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.in
View File

@ -472,13 +472,13 @@ endif
# Map mozilla targets to standard automake target # Map mozilla targets to standard automake target
clobber realclean clobber_all:: clobber realclean clobber_all::
ifndef MOZ_SYSTEM_CAIRO ifdef MOZ_TREE_CAIRO
$(MAKE) -C gfx/cairo/libpixman clean $(MAKE) -C gfx/cairo/libpixman clean
$(MAKE) -C gfx/cairo/cairo clean $(MAKE) -C gfx/cairo/cairo clean
endif endif
clean distclean:: clean distclean::
ifndef MOZ_SYSTEM_CAIRO ifdef MOZ_TREE_CAIRO
$(MAKE) -C gfx/cairo/libpixman $@ $(MAKE) -C gfx/cairo/libpixman $@
$(MAKE) -C gfx/cairo/cairo $@ $(MAKE) -C gfx/cairo/cairo $@
endif endif
@ -533,7 +533,7 @@ ifdef MOZ_LDAP_XPCOM
endif endif
cairo: cairo:
ifndef MOZ_SYSTEM_CAIRO ifdef MOZ_TREE_CAIRO
$(MAKE) -C gfx/cairo/libpixman install $(MAKE) -C gfx/cairo/libpixman install
$(MAKE) -C gfx/cairo/cairo install $(MAKE) -C gfx/cairo/cairo install
ifneq ($(OS_ARCH),Darwin) ifneq ($(OS_ARCH),Darwin)

2
config/autoconf.mk.in
View File

@ -170,7 +170,7 @@ NECKO_COOKIES = @NECKO_COOKIES@
MOZ_NATIVE_ZLIB = @SYSTEM_ZLIB@ MOZ_NATIVE_ZLIB = @SYSTEM_ZLIB@
MOZ_NATIVE_JPEG = @SYSTEM_JPEG@ MOZ_NATIVE_JPEG = @SYSTEM_JPEG@
MOZ_NATIVE_PNG = @SYSTEM_PNG@ MOZ_NATIVE_PNG = @SYSTEM_PNG@
MOZ_SYSTEM_CAIRO = @MOZ_SYSTEM_CAIRO@ MOZ_TREE_CAIRO = @MOZ_TREE_CAIRO@
MOZ_UPDATE_XTERM = @MOZ_UPDATE_XTERM@ MOZ_UPDATE_XTERM = @MOZ_UPDATE_XTERM@
MOZ_MATHML = @MOZ_MATHML@ MOZ_MATHML = @MOZ_MATHML@

60
configure.in
View File

@ -5658,19 +5658,20 @@ if test -z "$MACOSX"; then
fi; fi;
if test "$MOZ_SVG_RENDERER_CAIRO" -o "$MOZ_ENABLE_CAIRO" ; then if test "$MOZ_SVG_RENDERER_CAIRO" -o "$MOZ_ENABLE_CAIRO" ; then
MOZ_TREE_CAIRO=1
MOZ_ARG_ENABLE_BOOL(system-cairo, MOZ_ARG_ENABLE_BOOL(system-cairo,
[ --enable-system-cairo Use system cairo (located with pkgconfig)], [ --enable-system-cairo Use system cairo (located with pkgconfig)],
MOZ_SYSTEM_CAIRO=1, MOZ_TREE_CAIRO=,
MOZ_SYSTEM_CAIRO= ) MOZ_TREE_CAIRO=1 )
if test "$MOZ_SYSTEM_CAIRO"; then if test -z "$MOZ_TREE_CAIRO"; then
PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION) PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION)
MOZ_CAIRO_CFLAGS=$CAIRO_CFLAGS MOZ_CAIRO_CFLAGS=$CAIRO_CFLAGS
MOZ_CAIRO_LIBS=$CAIRO_LIBS MOZ_CAIRO_LIBS=$CAIRO_LIBS
fi fi
fi fi
AC_SUBST(MOZ_SYSTEM_CAIRO) AC_SUBST(MOZ_TREE_CAIRO)
AC_SUBST(MOZ_CAIRO_CFLAGS) AC_SUBST(MOZ_CAIRO_CFLAGS)
AC_SUBST(MOZ_CAIRO_LIBS) AC_SUBST(MOZ_CAIRO_LIBS)
@ -6426,32 +6427,29 @@ if test "$MOZ_LDAP_XPCOM"; then
ac_configure_args="$_SUBDIR_CONFIG_ARGS" ac_configure_args="$_SUBDIR_CONFIG_ARGS"
fi fi
if test "$MOZ_SVG_RENDERER_CAIRO" -o "$MOZ_ENABLE_CAIRO" ; then if test "$MOZ_TREE_CAIRO"; then
if test -z "$MOZ_SYSTEM_CAIRO"; then # these subdirs may not yet have been created in the build tree.
# 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
# don't use the "-p" switch to mkdir, since not all platforms have it #
# if test ! -d "gfx/cairo"; then
if test ! -d "gfx/cairo"; then mkdir "gfx/cairo"
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)
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"
fi
AC_OUTPUT_SUBDIRS(gfx/cairo/cairo)
ac_configure_args="$_SUBDIR_CONFIG_ARGS"
fi 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)
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"
fi
AC_OUTPUT_SUBDIRS(gfx/cairo/cairo)
ac_configure_args="$_SUBDIR_CONFIG_ARGS"
fi fi