From 52cfb79f963a3f144b86cb7d06ebc94e8dc546ab Mon Sep 17 00:00:00 2001 From: cltbld Date: Wed, 26 Jan 2005 23:45:19 +0000 Subject: [PATCH] Automated update from host egg git-svn-id: svn://10.0.0.236/trunk@168368 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/configure | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mozilla/configure b/mozilla/configure index 050e6e3ddbb..0f056e08b4b 100755 --- a/mozilla/configure +++ b/mozilla/configure @@ -1003,7 +1003,7 @@ PERL_VERSION=5.004 QT_VERSION=3.2.0 QT_VERSION_NUM=320 LIBART_VERSION=2.3.4 -CAIRO_VERSION=0.1.17 +CAIRO_VERSION=0.3.0 GTK2_VERSION=1.3.7 MAKE_VERSION=3.78 WINDRES_VERSION=2.14.90 @@ -17232,30 +17232,30 @@ fi else 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""... $ac_c" 1>&6 -echo "configure:17237: checking for cairo >= $CAIRO_VERSION" >&5 + echo $ac_n "checking for cairo = $CAIRO_VERSION""... $ac_c" 1>&6 +echo "configure:17237: checking for cairo = $CAIRO_VERSION" >&5 - if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION" ; then + if $PKG_CONFIG --exists "cairo = $CAIRO_VERSION" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6 echo "configure:17244: checking CAIRO_CFLAGS" >&5 - CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION"` + CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo = $CAIRO_VERSION"` echo "$ac_t""$CAIRO_CFLAGS" 1>&6 echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6 echo "configure:17249: checking CAIRO_LIBS" >&5 ## don't use --libs since that can do evil things like add ## -Wl,--export-dynamic - CAIRO_LIBS="`$PKG_CONFIG --libs-only-L \"cairo >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo >= $CAIRO_VERSION\"`" + CAIRO_LIBS="`$PKG_CONFIG --libs-only-L \"cairo = $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo = $CAIRO_VERSION\"`" echo "$ac_t""$CAIRO_LIBS" 1>&6 else CAIRO_CFLAGS="" CAIRO_LIBS="" ## If we have a custom action on failure, don't print errors, but ## do set a variable so people can do so. - CAIRO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo >= $CAIRO_VERSION"` + CAIRO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo = $CAIRO_VERSION"` echo $CAIRO_PKG_ERRORS fi @@ -17270,7 +17270,7 @@ echo "configure:17249: checking CAIRO_LIBS" >&5 if test $succeeded = yes; then : else - { echo "configure: error: Library requirements (cairo >= $CAIRO_VERSION) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; } + { echo "configure: error: Library requirements (cairo = $CAIRO_VERSION) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; } fi MOZ_CAIRO_CFLAGS=$CAIRO_CFLAGS