From 3b22106dc0ad74b8760c2aa09b174115f369b100 Mon Sep 17 00:00:00 2001 From: cltbld Date: Sat, 30 Jun 2007 07:51:02 +0000 Subject: [PATCH] Automated update from host egg.build.mozilla.org --- configure | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/configure b/configure index e92c3f33437..9d213d68e1d 100755 --- a/configure +++ b/configure @@ -19055,6 +19055,7 @@ EOF # Define macros for cairo-features.h if test "$MOZ_X11"; then XLIB_SURFACE_FEATURE="#define CAIRO_HAS_XLIB_SURFACE 1" + XLIB_XRENDER_SURFACE_FEATURE="#define CAIRO_HAS_XLIB_XRENDER_SURFACE 1" PS_SURFACE_FEATURE="#define CAIRO_HAS_PS_SURFACE 1" PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1" FT_FONT_FEATURE="#define CAIRO_HAS_FT_FONT 1" @@ -19087,7 +19088,7 @@ EOF # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:19091: checking for $ac_word" >&5 +echo "configure:19092: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -19131,19 +19132,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for fontconfig freetype2""... $ac_c" 1>&6 -echo "configure:19135: checking for fontconfig freetype2" >&5 +echo "configure:19136: checking for fontconfig freetype2" >&5 if $PKG_CONFIG --exists "fontconfig freetype2" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking CAIRO_FT_CFLAGS""... $ac_c" 1>&6 -echo "configure:19142: checking CAIRO_FT_CFLAGS" >&5 +echo "configure:19143: checking CAIRO_FT_CFLAGS" >&5 CAIRO_FT_CFLAGS=`$PKG_CONFIG --cflags "fontconfig freetype2"` echo "$ac_t""$CAIRO_FT_CFLAGS" 1>&6 echo $ac_n "checking CAIRO_FT_LIBS""... $ac_c" 1>&6 -echo "configure:19147: checking CAIRO_FT_LIBS" >&5 +echo "configure:19148: checking CAIRO_FT_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic CAIRO_FT_LIBS="`$PKG_CONFIG --libs \"fontconfig freetype2\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$CAIRO_FT_LIBS" 1>&6 @@ -19203,6 +19204,7 @@ echo "configure:19147: checking CAIRO_FT_LIBS" >&5 + if test "$_WIN32_MSVC"; then MOZ_CAIRO_LIBS='$(DEPTH)/gfx/cairo/cairo/src/mozcairo.lib $(DEPTH)/gfx/cairo/libpixman/src/mozlibpixman.lib' @@ -19233,7 +19235,7 @@ echo "configure:19147: checking CAIRO_FT_LIBS" >&5 # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:19237: checking for $ac_word" >&5 +echo "configure:19239: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -19277,19 +19279,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for cairo >= $CAIRO_VERSION freetype2 fontconfig""... $ac_c" 1>&6 -echo "configure:19281: checking for cairo >= $CAIRO_VERSION freetype2 fontconfig" >&5 +echo "configure:19283: checking for cairo >= $CAIRO_VERSION freetype2 fontconfig" >&5 if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION freetype2 fontconfig" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6 -echo "configure:19288: checking CAIRO_CFLAGS" >&5 +echo "configure:19290: checking CAIRO_CFLAGS" >&5 CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION freetype2 fontconfig"` echo "$ac_t""$CAIRO_CFLAGS" 1>&6 echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6 -echo "configure:19293: checking CAIRO_LIBS" >&5 +echo "configure:19295: checking CAIRO_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic CAIRO_LIBS="`$PKG_CONFIG --libs \"cairo >= $CAIRO_VERSION freetype2 fontconfig\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$CAIRO_LIBS" 1>&6 @@ -19638,14 +19640,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext < int main() { int x = 1; x++; ; return 0; } EOF -if { (eval echo configure:19649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19651: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -19952,7 +19954,7 @@ if test "$MOZ_X11"; then _SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $XCFLAGS" cat > conftest.$ac_ext < @@ -19969,7 +19971,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:19973: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19975: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -20579,6 +20581,7 @@ s%@PS_SURFACE_FEATURE@%$PS_SURFACE_FEATURE%g s%@PDF_SURFACE_FEATURE@%$PDF_SURFACE_FEATURE%g s%@SVG_SURFACE_FEATURE@%$SVG_SURFACE_FEATURE%g s%@XLIB_SURFACE_FEATURE@%$XLIB_SURFACE_FEATURE%g +s%@XLIB_XRENDER_SURFACE_FEATURE@%$XLIB_XRENDER_SURFACE_FEATURE%g s%@QUARTZ_SURFACE_FEATURE@%$QUARTZ_SURFACE_FEATURE%g s%@NQUARTZ_SURFACE_FEATURE@%$NQUARTZ_SURFACE_FEATURE%g s%@XCB_SURFACE_FEATURE@%$XCB_SURFACE_FEATURE%g