Automated update from host egg.build.mozilla.org

This commit is contained in:
cltbld 2007-09-19 23:21:03 +00:00
Родитель a5388fcc21
Коммит baefe4b050
1 изменённых файлов: 7 добавлений и 7 удалений

14
configure поставляемый
Просмотреть файл

@ -13719,29 +13719,29 @@ 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 pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION""... $ac_c" 1>&6 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" >&5 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 echo "$ac_t""yes" 1>&6
succeeded=yes succeeded=yes
echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6 echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6
echo "configure:13731: checking MOZ_PANGO_CFLAGS" >&5 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_t""$MOZ_PANGO_CFLAGS" 1>&6
echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6 echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6
echo "configure:13736: checking MOZ_PANGO_LIBS" >&5 echo "configure:13736: checking MOZ_PANGO_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic ## 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 echo "$ac_t""$MOZ_PANGO_LIBS" 1>&6
else else
MOZ_PANGO_CFLAGS="" MOZ_PANGO_CFLAGS=""
MOZ_PANGO_LIBS="" MOZ_PANGO_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.
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 echo $MOZ_PANGO_PKG_ERRORS
fi fi
@ -13757,7 +13757,7 @@ echo "configure:13736: checking MOZ_PANGO_LIBS" >&5
: :
else else
if test "$COMPILE_ENVIRONMENT"; then 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
fi fi