mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-01-19 09:30:44 +00:00
Automated update from host egg
This commit is contained in:
cltbld
parent
046365ea18
commit
ddcd017822
124
configure
vendored
124
configure
vendored
@ -12248,7 +12248,6 @@ MOZ_SINGLE_PROFILE=
|
||||
MOZ_STATIC_MAIL_BUILD=
|
||||
MOZ_STORAGE=1
|
||||
MOZ_SVG=1
|
||||
MOZ_SVG_FOREIGNOBJECT=$MOZ_ENABLE_CAIRO_GFX
|
||||
MOZ_TIMELINE=
|
||||
MOZ_UI_LOCALE=en-US
|
||||
MOZ_UNIVERSALCHARDET=1
|
||||
@ -12920,7 +12919,7 @@ fi
|
||||
# Extract the first word of "gtk-config", so it can be a program name with args.
|
||||
set dummy gtk-config; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:12924: checking for $ac_word" >&5
|
||||
echo "configure:12923: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -12955,7 +12954,7 @@ fi
|
||||
|
||||
min_gtk_version=$GTK_VERSION
|
||||
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
|
||||
echo "configure:12959: checking for GTK - version >= $min_gtk_version" >&5
|
||||
echo "configure:12958: checking for GTK - version >= $min_gtk_version" >&5
|
||||
no_gtk=""
|
||||
if test "$GTK_CONFIG" = "no" ; then
|
||||
no_gtk=yes
|
||||
@ -12978,7 +12977,7 @@ echo "configure:12959: checking for GTK - version >= $min_gtk_version" >&5
|
||||
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12982 "configure"
|
||||
#line 12981 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
@ -13056,7 +13055,7 @@ main ()
|
||||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:13060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:13059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
@ -13091,7 +13090,7 @@ fi
|
||||
CFLAGS="$CFLAGS $GTK_CFLAGS"
|
||||
LIBS="$LIBS $GTK_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 13095 "configure"
|
||||
#line 13094 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
@ -13101,7 +13100,7 @@ int main() {
|
||||
return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:13105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:13104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
echo "*** The test program compiled, but did not run. This usually means"
|
||||
echo "*** that the run-time linker is not finding GTK or finding the wrong"
|
||||
@ -13152,7 +13151,7 @@ then
|
||||
# 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:13156: checking for $ac_word" >&5
|
||||
echo "configure:13155: 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
|
||||
@ -13196,19 +13195,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 gtk+-2.0 >= 1.3.7 gdk-x11-2.0 glib-2.0 gobject-2.0""... $ac_c" 1>&6
|
||||
echo "configure:13200: checking for gtk+-2.0 >= 1.3.7 gdk-x11-2.0 glib-2.0 gobject-2.0" >&5
|
||||
echo "configure:13199: checking for gtk+-2.0 >= 1.3.7 gdk-x11-2.0 glib-2.0 gobject-2.0" >&5
|
||||
|
||||
if $PKG_CONFIG --exists "gtk+-2.0 >= 1.3.7 gdk-x11-2.0 glib-2.0 gobject-2.0" ; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
succeeded=yes
|
||||
|
||||
echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6
|
||||
echo "configure:13207: checking MOZ_GTK2_CFLAGS" >&5
|
||||
echo "configure:13206: checking MOZ_GTK2_CFLAGS" >&5
|
||||
MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7 gdk-x11-2.0 glib-2.0 gobject-2.0"`
|
||||
echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6
|
||||
|
||||
echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6
|
||||
echo "configure:13212: checking MOZ_GTK2_LIBS" >&5
|
||||
echo "configure:13211: checking MOZ_GTK2_LIBS" >&5
|
||||
## Remove evil flags like -Wl,--export-dynamic
|
||||
MOZ_GTK2_LIBS="`$PKG_CONFIG --libs \"gtk+-2.0 >= 1.3.7 gdk-x11-2.0 glib-2.0 gobject-2.0\" |sed s/-Wl,--export-dynamic//g`"
|
||||
echo "$ac_t""$MOZ_GTK2_LIBS" 1>&6
|
||||
@ -13272,7 +13271,7 @@ do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:13276: checking for $ac_word" >&5
|
||||
echo "configure:13275: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_HOST_MOC'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -13324,7 +13323,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
|
||||
cross_compiling=$ac_cv_prog_cxx_cross
|
||||
|
||||
echo $ac_n "checking for main in -lqt""... $ac_c" 1>&6
|
||||
echo "configure:13328: checking for main in -lqt" >&5
|
||||
echo "configure:13327: checking for main in -lqt" >&5
|
||||
ac_lib_var=`echo qt'_'main | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -13332,14 +13331,14 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lqt $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 13336 "configure"
|
||||
#line 13335 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
main()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:13343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:13342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -13358,7 +13357,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for main in -lqt-mt""... $ac_c" 1>&6
|
||||
echo "configure:13362: checking for main in -lqt-mt" >&5
|
||||
echo "configure:13361: checking for main in -lqt-mt" >&5
|
||||
ac_lib_var=`echo qt-mt'_'main | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -13366,14 +13365,14 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lqt-mt $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 13370 "configure"
|
||||
#line 13369 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
main()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:13377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:13376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -13409,9 +13408,9 @@ fi
|
||||
LIBS="$LIBS $QT_LIBS"
|
||||
|
||||
echo $ac_n "checking Qt - version >= $QT_VERSION""... $ac_c" 1>&6
|
||||
echo "configure:13413: checking Qt - version >= $QT_VERSION" >&5
|
||||
echo "configure:13412: checking Qt - version >= $QT_VERSION" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 13415 "configure"
|
||||
#line 13414 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <qglobal.h>
|
||||
int main() {
|
||||
@ -13422,7 +13421,7 @@ int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:13426: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:13425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
result="yes"
|
||||
else
|
||||
@ -13690,7 +13689,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:13694: checking for $ac_word" >&5
|
||||
echo "configure:13693: 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
|
||||
@ -13734,19 +13733,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 xft""... $ac_c" 1>&6
|
||||
echo "configure:13738: checking for xft" >&5
|
||||
echo "configure:13737: checking for xft" >&5
|
||||
|
||||
if $PKG_CONFIG --exists "xft" ; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
succeeded=yes
|
||||
|
||||
echo $ac_n "checking MOZ_XFT_CFLAGS""... $ac_c" 1>&6
|
||||
echo "configure:13745: checking MOZ_XFT_CFLAGS" >&5
|
||||
echo "configure:13744: checking MOZ_XFT_CFLAGS" >&5
|
||||
MOZ_XFT_CFLAGS=`$PKG_CONFIG --cflags "xft"`
|
||||
echo "$ac_t""$MOZ_XFT_CFLAGS" 1>&6
|
||||
|
||||
echo $ac_n "checking MOZ_XFT_LIBS""... $ac_c" 1>&6
|
||||
echo "configure:13750: checking MOZ_XFT_LIBS" >&5
|
||||
echo "configure:13749: checking MOZ_XFT_LIBS" >&5
|
||||
## Remove evil flags like -Wl,--export-dynamic
|
||||
MOZ_XFT_LIBS="`$PKG_CONFIG --libs \"xft\" |sed s/-Wl,--export-dynamic//g`"
|
||||
echo "$ac_t""$MOZ_XFT_LIBS" 1>&6
|
||||
@ -13779,7 +13778,7 @@ echo "configure:13750: checking MOZ_XFT_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:13783: checking for $ac_word" >&5
|
||||
echo "configure:13782: 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
|
||||
@ -13823,19 +13822,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 pango >= 1.1.0""... $ac_c" 1>&6
|
||||
echo "configure:13827: checking for pango >= 1.1.0" >&5
|
||||
echo "configure:13826: checking for pango >= 1.1.0" >&5
|
||||
|
||||
if $PKG_CONFIG --exists "pango >= 1.1.0" ; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
succeeded=yes
|
||||
|
||||
echo $ac_n "checking _PANGOCHK_CFLAGS""... $ac_c" 1>&6
|
||||
echo "configure:13834: checking _PANGOCHK_CFLAGS" >&5
|
||||
echo "configure:13833: checking _PANGOCHK_CFLAGS" >&5
|
||||
_PANGOCHK_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.1.0"`
|
||||
echo "$ac_t""$_PANGOCHK_CFLAGS" 1>&6
|
||||
|
||||
echo $ac_n "checking _PANGOCHK_LIBS""... $ac_c" 1>&6
|
||||
echo "configure:13839: checking _PANGOCHK_LIBS" >&5
|
||||
echo "configure:13838: checking _PANGOCHK_LIBS" >&5
|
||||
## Remove evil flags like -Wl,--export-dynamic
|
||||
_PANGOCHK_LIBS="`$PKG_CONFIG --libs \"pango >= 1.1.0\" |sed s/-Wl,--export-dynamic//g`"
|
||||
echo "$ac_t""$_PANGOCHK_LIBS" 1>&6
|
||||
@ -13893,7 +13892,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:13897: checking for $ac_word" >&5
|
||||
echo "configure:13896: 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
|
||||
@ -13937,19 +13936,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 pango >= 1.6.0 pangoft2 >= 1.6.0""... $ac_c" 1>&6
|
||||
echo "configure:13941: checking for pango >= 1.6.0 pangoft2 >= 1.6.0" >&5
|
||||
echo "configure:13940: checking for pango >= 1.6.0 pangoft2 >= 1.6.0" >&5
|
||||
|
||||
if $PKG_CONFIG --exists "pango >= 1.6.0 pangoft2 >= 1.6.0" ; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
succeeded=yes
|
||||
|
||||
echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6
|
||||
echo "configure:13948: checking MOZ_PANGO_CFLAGS" >&5
|
||||
echo "configure:13947: checking MOZ_PANGO_CFLAGS" >&5
|
||||
MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.6.0 pangoft2 >= 1.6.0"`
|
||||
echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6
|
||||
|
||||
echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6
|
||||
echo "configure:13953: checking MOZ_PANGO_LIBS" >&5
|
||||
echo "configure:13952: checking MOZ_PANGO_LIBS" >&5
|
||||
## Remove evil flags like -Wl,--export-dynamic
|
||||
MOZ_PANGO_LIBS="`$PKG_CONFIG --libs \"pango >= 1.6.0 pangoft2 >= 1.6.0\" |sed s/-Wl,--export-dynamic//g`"
|
||||
echo "$ac_t""$MOZ_PANGO_LIBS" 1>&6
|
||||
@ -14005,7 +14004,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:14009: checking for $ac_word" >&5
|
||||
echo "configure:14008: 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
|
||||
@ -14049,19 +14048,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 pango >= 1.6.0 pangoft2 >= 1.6.0 pangoxft >= 1.6.0""... $ac_c" 1>&6
|
||||
echo "configure:14053: checking for pango >= 1.6.0 pangoft2 >= 1.6.0 pangoxft >= 1.6.0" >&5
|
||||
echo "configure:14052: checking for pango >= 1.6.0 pangoft2 >= 1.6.0 pangoxft >= 1.6.0" >&5
|
||||
|
||||
if $PKG_CONFIG --exists "pango >= 1.6.0 pangoft2 >= 1.6.0 pangoxft >= 1.6.0" ; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
succeeded=yes
|
||||
|
||||
echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6
|
||||
echo "configure:14060: checking MOZ_PANGO_CFLAGS" >&5
|
||||
echo "configure:14059: checking MOZ_PANGO_CFLAGS" >&5
|
||||
MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.6.0 pangoft2 >= 1.6.0 pangoxft >= 1.6.0"`
|
||||
echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6
|
||||
|
||||
echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6
|
||||
echo "configure:14065: checking MOZ_PANGO_LIBS" >&5
|
||||
echo "configure:14064: checking MOZ_PANGO_LIBS" >&5
|
||||
## Remove evil flags like -Wl,--export-dynamic
|
||||
MOZ_PANGO_LIBS="`$PKG_CONFIG --libs \"pango >= 1.6.0 pangoft2 >= 1.6.0 pangoxft >= 1.6.0\" |sed s/-Wl,--export-dynamic//g`"
|
||||
echo "$ac_t""$MOZ_PANGO_LIBS" 1>&6
|
||||
@ -14095,7 +14094,7 @@ echo "configure:14065: checking MOZ_PANGO_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:14099: checking for $ac_word" >&5
|
||||
echo "configure:14098: 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
|
||||
@ -14139,19 +14138,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 pango >= 1.6.0 pangoft2 >= 1.6.0""... $ac_c" 1>&6
|
||||
echo "configure:14143: checking for pango >= 1.6.0 pangoft2 >= 1.6.0" >&5
|
||||
echo "configure:14142: checking for pango >= 1.6.0 pangoft2 >= 1.6.0" >&5
|
||||
|
||||
if $PKG_CONFIG --exists "pango >= 1.6.0 pangoft2 >= 1.6.0" ; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
succeeded=yes
|
||||
|
||||
echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6
|
||||
echo "configure:14150: checking MOZ_PANGO_CFLAGS" >&5
|
||||
echo "configure:14149: checking MOZ_PANGO_CFLAGS" >&5
|
||||
MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.6.0 pangoft2 >= 1.6.0"`
|
||||
echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6
|
||||
|
||||
echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6
|
||||
echo "configure:14155: checking MOZ_PANGO_LIBS" >&5
|
||||
echo "configure:14154: checking MOZ_PANGO_LIBS" >&5
|
||||
## Remove evil flags like -Wl,--export-dynamic
|
||||
MOZ_PANGO_LIBS="`$PKG_CONFIG --libs \"pango >= 1.6.0 pangoft2 >= 1.6.0\" |sed s/-Wl,--export-dynamic//g`"
|
||||
echo "$ac_t""$MOZ_PANGO_LIBS" 1>&6
|
||||
@ -14219,7 +14218,7 @@ then
|
||||
_SAVE_LDFLAGS="$LDFLAGS"
|
||||
LDFLAGS="$XLDFLAGS $LDFLAGS"
|
||||
echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6
|
||||
echo "configure:14223: checking for XpGetPrinterList in -lXp" >&5
|
||||
echo "configure:14222: checking for XpGetPrinterList in -lXp" >&5
|
||||
ac_lib_var=`echo Xp'_'XpGetPrinterList | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -14227,7 +14226,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lXp $XEXT_LIBS $XLIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 14231 "configure"
|
||||
#line 14230 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
@ -14238,7 +14237,7 @@ int main() {
|
||||
XpGetPrinterList()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:14242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:14241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -14310,7 +14309,7 @@ fi
|
||||
# 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:14314: checking for $ac_word" >&5
|
||||
echo "configure:14313: 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
|
||||
@ -14354,19 +14353,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 gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION""... $ac_c" 1>&6
|
||||
echo "configure:14358: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5
|
||||
echo "configure:14357: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5
|
||||
|
||||
if $PKG_CONFIG --exists "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" ; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
succeeded=yes
|
||||
|
||||
echo $ac_n "checking MOZ_GNOMEVFS_CFLAGS""... $ac_c" 1>&6
|
||||
echo "configure:14365: checking MOZ_GNOMEVFS_CFLAGS" >&5
|
||||
echo "configure:14364: checking MOZ_GNOMEVFS_CFLAGS" >&5
|
||||
MOZ_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION"`
|
||||
echo "$ac_t""$MOZ_GNOMEVFS_CFLAGS" 1>&6
|
||||
|
||||
echo $ac_n "checking MOZ_GNOMEVFS_LIBS""... $ac_c" 1>&6
|
||||
echo "configure:14370: checking MOZ_GNOMEVFS_LIBS" >&5
|
||||
echo "configure:14369: checking MOZ_GNOMEVFS_LIBS" >&5
|
||||
## Remove evil flags like -Wl,--export-dynamic
|
||||
MOZ_GNOMEVFS_LIBS="`$PKG_CONFIG --libs \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\" |sed s/-Wl,--export-dynamic//g`"
|
||||
echo "$ac_t""$MOZ_GNOMEVFS_LIBS" 1>&6
|
||||
@ -14414,7 +14413,7 @@ echo "configure:14370: checking MOZ_GNOMEVFS_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:14418: checking for $ac_word" >&5
|
||||
echo "configure:14417: 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
|
||||
@ -14458,19 +14457,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 gconf-2.0 >= $GCONF_VERSION""... $ac_c" 1>&6
|
||||
echo "configure:14462: checking for gconf-2.0 >= $GCONF_VERSION" >&5
|
||||
echo "configure:14461: checking for gconf-2.0 >= $GCONF_VERSION" >&5
|
||||
|
||||
if $PKG_CONFIG --exists "gconf-2.0 >= $GCONF_VERSION" ; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
succeeded=yes
|
||||
|
||||
echo $ac_n "checking MOZ_GCONF_CFLAGS""... $ac_c" 1>&6
|
||||
echo "configure:14469: checking MOZ_GCONF_CFLAGS" >&5
|
||||
echo "configure:14468: checking MOZ_GCONF_CFLAGS" >&5
|
||||
MOZ_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= $GCONF_VERSION"`
|
||||
echo "$ac_t""$MOZ_GCONF_CFLAGS" 1>&6
|
||||
|
||||
echo $ac_n "checking MOZ_GCONF_LIBS""... $ac_c" 1>&6
|
||||
echo "configure:14474: checking MOZ_GCONF_LIBS" >&5
|
||||
echo "configure:14473: checking MOZ_GCONF_LIBS" >&5
|
||||
## Remove evil flags like -Wl,--export-dynamic
|
||||
MOZ_GCONF_LIBS="`$PKG_CONFIG --libs \"gconf-2.0 >= $GCONF_VERSION\" |sed s/-Wl,--export-dynamic//g`"
|
||||
echo "$ac_t""$MOZ_GCONF_LIBS" 1>&6
|
||||
@ -14514,7 +14513,7 @@ echo "configure:14474: checking MOZ_GCONF_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:14518: checking for $ac_word" >&5
|
||||
echo "configure:14517: 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
|
||||
@ -14558,19 +14557,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 libgnome-2.0 >= $LIBGNOME_VERSION""... $ac_c" 1>&6
|
||||
echo "configure:14562: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5
|
||||
echo "configure:14561: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5
|
||||
|
||||
if $PKG_CONFIG --exists "libgnome-2.0 >= $LIBGNOME_VERSION" ; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
succeeded=yes
|
||||
|
||||
echo $ac_n "checking MOZ_LIBGNOME_CFLAGS""... $ac_c" 1>&6
|
||||
echo "configure:14569: checking MOZ_LIBGNOME_CFLAGS" >&5
|
||||
echo "configure:14568: checking MOZ_LIBGNOME_CFLAGS" >&5
|
||||
MOZ_LIBGNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnome-2.0 >= $LIBGNOME_VERSION"`
|
||||
echo "$ac_t""$MOZ_LIBGNOME_CFLAGS" 1>&6
|
||||
|
||||
echo $ac_n "checking MOZ_LIBGNOME_LIBS""... $ac_c" 1>&6
|
||||
echo "configure:14574: checking MOZ_LIBGNOME_LIBS" >&5
|
||||
echo "configure:14573: checking MOZ_LIBGNOME_LIBS" >&5
|
||||
## Remove evil flags like -Wl,--export-dynamic
|
||||
MOZ_LIBGNOME_LIBS="`$PKG_CONFIG --libs \"libgnome-2.0 >= $LIBGNOME_VERSION\" |sed s/-Wl,--export-dynamic//g`"
|
||||
echo "$ac_t""$MOZ_LIBGNOME_LIBS" 1>&6
|
||||
@ -14645,7 +14644,7 @@ fi
|
||||
# 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:14649: checking for $ac_word" >&5
|
||||
echo "configure:14648: 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
|
||||
@ -14689,19 +14688,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 libgnomeui-2.0 >= $GNOMEUI_VERSION""... $ac_c" 1>&6
|
||||
echo "configure:14693: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5
|
||||
echo "configure:14692: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5
|
||||
|
||||
if $PKG_CONFIG --exists "libgnomeui-2.0 >= $GNOMEUI_VERSION" ; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
succeeded=yes
|
||||
|
||||
echo $ac_n "checking MOZ_GNOMEUI_CFLAGS""... $ac_c" 1>&6
|
||||
echo "configure:14700: checking MOZ_GNOMEUI_CFLAGS" >&5
|
||||
echo "configure:14699: checking MOZ_GNOMEUI_CFLAGS" >&5
|
||||
MOZ_GNOMEUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 >= $GNOMEUI_VERSION"`
|
||||
echo "$ac_t""$MOZ_GNOMEUI_CFLAGS" 1>&6
|
||||
|
||||
echo $ac_n "checking MOZ_GNOMEUI_LIBS""... $ac_c" 1>&6
|
||||
echo "configure:14705: checking MOZ_GNOMEUI_LIBS" >&5
|
||||
echo "configure:14704: checking MOZ_GNOMEUI_LIBS" >&5
|
||||
## Remove evil flags like -Wl,--export-dynamic
|
||||
MOZ_GNOMEUI_LIBS="`$PKG_CONFIG --libs \"libgnomeui-2.0 >= $GNOMEUI_VERSION\" |sed s/-Wl,--export-dynamic//g`"
|
||||
echo "$ac_t""$MOZ_GNOMEUI_LIBS" 1>&6
|
||||
@ -15245,7 +15244,7 @@ if test -n "${MOZ_JAVAXPCOM}"; then
|
||||
# Extract the first word of "javac", so it can be a program name with args.
|
||||
set dummy javac; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:15249: checking for $ac_word" >&5
|
||||
echo "configure:15248: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_JAVAC'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -15281,7 +15280,7 @@ fi
|
||||
# Extract the first word of "jar", so it can be a program name with args.
|
||||
set dummy jar; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:15285: checking for $ac_word" >&5
|
||||
echo "configure:15284: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_JAR'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -15552,6 +15551,7 @@ EOF
|
||||
|
||||
fi
|
||||
|
||||
MOZ_SVG_FOREIGNOBJECT=$MOZ_ENABLE_CAIRO_GFX
|
||||
# Check whether --enable-svg-foreignobject or --disable-svg-foreignobject was given.
|
||||
if test "${enable_svg_foreignobject+set}" = set; then
|
||||
enableval="$enable_svg_foreignobject"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user