From baefe4b0504ef2c84c0d024ab7c27bda5a38dd28 Mon Sep 17 00:00:00 2001 From: cltbld Date: Wed, 19 Sep 2007 23:21:03 +0000 Subject: [PATCH] Automated update from host egg.build.mozilla.org --- configure | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 14d773030d8..73feb2f2135 100755 --- a/configure +++ b/configure @@ -13719,29 +13719,29 @@ 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 pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION""... $ac_c" 1>&6 -echo "configure:13724: checking for pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION" >&5 + echo $ac_n "checking for pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION""... $ac_c" 1>&6 +echo "configure:13724: checking for pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION" >&5 - if $PKG_CONFIG --exists "pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION" ; then + if $PKG_CONFIG --exists "pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6 echo "configure:13731: checking MOZ_PANGO_CFLAGS" >&5 - MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION"` + MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION"` echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6 echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6 echo "configure:13736: checking MOZ_PANGO_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic - MOZ_PANGO_LIBS="`$PKG_CONFIG --libs \"pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION\" |sed s/-Wl,--export-dynamic//g`" + MOZ_PANGO_LIBS="`$PKG_CONFIG --libs \"pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$MOZ_PANGO_LIBS" 1>&6 else MOZ_PANGO_CFLAGS="" MOZ_PANGO_LIBS="" ## If we have a custom action on failure, don't print errors, but ## do set a variable so people can do so. - MOZ_PANGO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION"` + MOZ_PANGO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION"` echo $MOZ_PANGO_PKG_ERRORS fi @@ -13757,7 +13757,7 @@ echo "configure:13736: checking MOZ_PANGO_LIBS" >&5 : else if test "$COMPILE_ENVIRONMENT"; then - { echo "configure: error: Library requirements (pango >= $PANGO_VERSION pangocairo >= $PANGO_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 (pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION pangoft2 >= $PANGO_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