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

Automated update from host egg

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@168368 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cltbld 2005-01-26 23:45:19 +00:00
parent 8aa2c6e635
commit 52cfb79f96
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/configure vendored
View File

@ -1003,7 +1003,7 @@ PERL_VERSION=5.004
QT_VERSION=3.2.0 QT_VERSION=3.2.0
QT_VERSION_NUM=320 QT_VERSION_NUM=320
LIBART_VERSION=2.3.4 LIBART_VERSION=2.3.4
CAIRO_VERSION=0.1.17 CAIRO_VERSION=0.3.0
GTK2_VERSION=1.3.7 GTK2_VERSION=1.3.7
MAKE_VERSION=3.78 MAKE_VERSION=3.78
WINDRES_VERSION=2.14.90 WINDRES_VERSION=2.14.90
@ -17232,30 +17232,30 @@ fi
else else
PKG_CONFIG_MIN_VERSION=0.9.0 PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for cairo >= $CAIRO_VERSION""... $ac_c" 1>&6 echo $ac_n "checking for cairo = $CAIRO_VERSION""... $ac_c" 1>&6
echo "configure:17237: checking for cairo >= $CAIRO_VERSION" >&5 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 echo "$ac_t""yes" 1>&6
succeeded=yes succeeded=yes
echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6 echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6
echo "configure:17244: checking CAIRO_CFLAGS" >&5 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_t""$CAIRO_CFLAGS" 1>&6
echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6 echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6
echo "configure:17249: checking CAIRO_LIBS" >&5 echo "configure:17249: checking CAIRO_LIBS" >&5
## don't use --libs since that can do evil things like add ## don't use --libs since that can do evil things like add
## -Wl,--export-dynamic ## -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 echo "$ac_t""$CAIRO_LIBS" 1>&6
else else
CAIRO_CFLAGS="" CAIRO_CFLAGS=""
CAIRO_LIBS="" CAIRO_LIBS=""
## If we have a custom action on failure, don't print errors, but ## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so. ## 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 echo $CAIRO_PKG_ERRORS
fi fi
@ -17270,7 +17270,7 @@ echo "configure:17249: checking CAIRO_LIBS" >&5
if test $succeeded = yes; then if test $succeeded = yes; then
: :
else 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 fi
MOZ_CAIRO_CFLAGS=$CAIRO_CFLAGS MOZ_CAIRO_CFLAGS=$CAIRO_CFLAGS