mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-11 12:25:53 +00:00
Automated update
This commit is contained in:
cltbld%netscape.com
parent
486b65c594
commit
1e0994623a
145
configure
vendored
145
configure
vendored
@ -11023,6 +11023,20 @@ fi
|
||||
|
||||
|
||||
|
||||
if test "$MOZ_THUNDERBIRD"; then
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define MOZ_THUNDERBIRD 1
|
||||
EOF
|
||||
|
||||
MOZ_XUL_APP=1
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define MOZ_XUL_APP 1
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
# Check whether --enable-freetype2 or --disable-freetype2 was given.
|
||||
if test "${enable_freetype2+set}" = set; then
|
||||
@ -11082,7 +11096,7 @@ fi
|
||||
# Extract the first word of "freetype-config", so it can be a program name with args.
|
||||
set dummy freetype-config; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:11086: checking for $ac_word" >&5
|
||||
echo "configure:11100: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_FT2_CONFIG'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -11118,7 +11132,7 @@ fi
|
||||
|
||||
min_ft_version=6.1.0
|
||||
echo $ac_n "checking for FreeType - version >= $min_ft_version""... $ac_c" 1>&6
|
||||
echo "configure:11122: checking for FreeType - version >= $min_ft_version" >&5
|
||||
echo "configure:11136: checking for FreeType - version >= $min_ft_version" >&5
|
||||
no_ft=""
|
||||
if test "$FT2_CONFIG" = "no" ; then
|
||||
no_ft=yes
|
||||
@ -11166,7 +11180,7 @@ else
|
||||
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11170 "configure"
|
||||
#line 11184 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <ft2build.h>
|
||||
@ -11192,7 +11206,7 @@ main()
|
||||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:11196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:11210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
@ -11264,7 +11278,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:11268: checking for $ac_word" >&5
|
||||
echo "configure:11282: 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
|
||||
@ -11308,19 +11322,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:11312: checking for xft" >&5
|
||||
echo "configure:11326: 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:11319: checking MOZ_XFT_CFLAGS" >&5
|
||||
echo "configure:11333: 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:11324: checking MOZ_XFT_LIBS" >&5
|
||||
echo "configure:11338: checking MOZ_XFT_LIBS" >&5
|
||||
MOZ_XFT_LIBS=`$PKG_CONFIG --libs "xft"`
|
||||
echo "$ac_t""$MOZ_XFT_LIBS" 1>&6
|
||||
else
|
||||
@ -11354,7 +11368,7 @@ echo "configure:11324: 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:11358: checking for $ac_word" >&5
|
||||
echo "configure:11372: 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
|
||||
@ -11398,19 +11412,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:11402: checking for pango >= 1.1.0" >&5
|
||||
echo "configure:11416: 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:11409: checking _PANGOCHK_CFLAGS" >&5
|
||||
echo "configure:11423: 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:11414: checking _PANGOCHK_LIBS" >&5
|
||||
echo "configure:11428: checking _PANGOCHK_LIBS" >&5
|
||||
_PANGOCHK_LIBS=`$PKG_CONFIG --libs "pango >= 1.1.0"`
|
||||
echo "$ac_t""$_PANGOCHK_LIBS" 1>&6
|
||||
else
|
||||
@ -11474,7 +11488,7 @@ then
|
||||
_SAVE_LDFLAGS="$LDFLAGS"
|
||||
LDFLAGS="$XLDFLAGS $LDFLAGS"
|
||||
echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6
|
||||
echo "configure:11478: checking for XpGetPrinterList in -lXp" >&5
|
||||
echo "configure:11492: 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
|
||||
@ -11482,7 +11496,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lXp $XEXT_LIBS $XLIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11486 "configure"
|
||||
#line 11500 "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
|
||||
@ -11493,7 +11507,7 @@ int main() {
|
||||
XpGetPrinterList()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:11511: \"$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
|
||||
@ -12165,18 +12179,18 @@ fi
|
||||
|
||||
if test -n "$MOZ_OPTIMIZE"; then
|
||||
echo $ac_n "checking for valid optimization flags""... $ac_c" 1>&6
|
||||
echo "configure:12169: checking for valid optimization flags" >&5
|
||||
echo "configure:12183: checking for valid optimization flags" >&5
|
||||
_SAVE_CFLAGS=$CFLAGS
|
||||
CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12173 "configure"
|
||||
#line 12187 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
int main() {
|
||||
printf("Hello World\n");
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:12180: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:12194: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
_results=yes
|
||||
else
|
||||
@ -12394,7 +12408,7 @@ fi
|
||||
|
||||
if test -n "$_ENABLE_EFENCE"; then
|
||||
echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6
|
||||
echo "configure:12398: checking for malloc in -lefence" >&5
|
||||
echo "configure:12412: checking for malloc in -lefence" >&5
|
||||
ac_lib_var=`echo efence'_'malloc | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -12402,7 +12416,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lefence $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12406 "configure"
|
||||
#line 12420 "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
|
||||
@ -12413,7 +12427,7 @@ int main() {
|
||||
malloc()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:12417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:12431: \"$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
|
||||
@ -12513,12 +12527,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
|
||||
for ac_func in __builtin_vec_new __builtin_vec_delete __builtin_new __builtin_delete __pure_virtual
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:12517: checking for $ac_func" >&5
|
||||
echo "configure:12531: checking for $ac_func" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12522 "configure"
|
||||
#line 12536 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
@ -12544,7 +12558,7 @@ $ac_func();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:12548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:12562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_$ac_func=yes"
|
||||
else
|
||||
@ -12765,7 +12779,7 @@ fi
|
||||
|
||||
if test -z "$SKIP_LIBRARY_CHECKS"; then
|
||||
echo $ac_n "checking for cplus_demangle in -liberty""... $ac_c" 1>&6
|
||||
echo "configure:12769: checking for cplus_demangle in -liberty" >&5
|
||||
echo "configure:12783: checking for cplus_demangle in -liberty" >&5
|
||||
ac_lib_var=`echo iberty'_'cplus_demangle | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -12773,7 +12787,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-liberty "-liberty" $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12777 "configure"
|
||||
#line 12791 "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
|
||||
@ -12784,7 +12798,7 @@ int main() {
|
||||
cplus_demangle()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:12788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:12802: \"$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
|
||||
@ -12937,7 +12951,7 @@ if test -z "$SKIP_COMPILER_CHECKS"; then
|
||||
# Compiler Options
|
||||
|
||||
echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6
|
||||
echo "configure:12941: checking for gcc -pipe support" >&5
|
||||
echo "configure:12955: checking for gcc -pipe support" >&5
|
||||
if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then
|
||||
echo '#include <stdio.h>' > dummy-hello.c
|
||||
echo 'int main() { printf("Hello World\n"); exit(0); }' >> dummy-hello.c
|
||||
@ -12952,14 +12966,14 @@ if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then
|
||||
_SAVE_CFLAGS=$CFLAGS
|
||||
CFLAGS="$CFLAGS -pipe"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12956 "configure"
|
||||
#line 12970 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
int main() {
|
||||
printf("Hello World\n");
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:12963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:12977: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
_res_gcc_pipe="yes"
|
||||
else
|
||||
@ -13008,12 +13022,12 @@ if test "$_PEDANTIC"; then
|
||||
_SAVE_CXXFLAGS=$CXXFLAGS
|
||||
CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic"
|
||||
echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6
|
||||
echo "configure:13012: checking whether C++ compiler has -pedantic long long bug" >&5
|
||||
echo "configure:13026: checking whether C++ compiler has -pedantic long long bug" >&5
|
||||
if test "$cross_compiling" = yes; then
|
||||
result="maybe"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 13017 "configure"
|
||||
#line 13031 "configure"
|
||||
#include "confdefs.h"
|
||||
#ifdef __cplusplus
|
||||
extern "C" void exit(int);
|
||||
@ -13022,7 +13036,7 @@ extern "C" void exit(int);
|
||||
if (sizeof(long long) != 8) { return 1; }
|
||||
return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:13026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:13040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
result="no"
|
||||
else
|
||||
@ -13054,12 +13068,12 @@ fi
|
||||
_SAVE_CXXFLAGS=$CXXFLAGS
|
||||
CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS}"
|
||||
echo $ac_n "checking for correct overload resolution with const and templates""... $ac_c" 1>&6
|
||||
echo "configure:13058: checking for correct overload resolution with const and templates" >&5
|
||||
echo "configure:13072: checking for correct overload resolution with const and templates" >&5
|
||||
if eval "test \"`echo '$''{'ac_nscap_nonconst_opeq_bug'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 13063 "configure"
|
||||
#line 13077 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
template <class T>
|
||||
@ -13089,7 +13103,7 @@ int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:13093: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:13107: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_nscap_nonconst_opeq_bug="no"
|
||||
else
|
||||
@ -13129,16 +13143,16 @@ if test "$_IGNORE_LONG_LONG_WARNINGS"; then
|
||||
_SAVE_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS ${_COMPILER_PREFIX}-Wno-long-long"
|
||||
echo $ac_n "checking whether compiler supports -Wno-long-long""... $ac_c" 1>&6
|
||||
echo "configure:13133: checking whether compiler supports -Wno-long-long" >&5
|
||||
echo "configure:13147: checking whether compiler supports -Wno-long-long" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 13135 "configure"
|
||||
#line 13149 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
return(0);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:13142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:13156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
_WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"
|
||||
_WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"
|
||||
@ -13363,7 +13377,7 @@ case "$target" in
|
||||
# Extract the first word of "makeC++SharedLib_r", so it can be a program name with args.
|
||||
set dummy makeC++SharedLib_r; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:13367: checking for $ac_word" >&5
|
||||
echo "configure:13381: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_AIX_SHLIB_BIN'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -13465,7 +13479,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:13469: checking for $ac_word" >&5
|
||||
echo "configure:13483: 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
|
||||
@ -13509,19 +13523,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 libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6
|
||||
echo "configure:13513: checking for libIDL-2.0 >= 0.8.0" >&5
|
||||
echo "configure:13527: checking for libIDL-2.0 >= 0.8.0" >&5
|
||||
|
||||
if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
succeeded=yes
|
||||
|
||||
echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6
|
||||
echo "configure:13520: checking LIBIDL_CFLAGS" >&5
|
||||
echo "configure:13534: checking LIBIDL_CFLAGS" >&5
|
||||
LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"`
|
||||
echo "$ac_t""$LIBIDL_CFLAGS" 1>&6
|
||||
|
||||
echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6
|
||||
echo "configure:13525: checking LIBIDL_LIBS" >&5
|
||||
echo "configure:13539: checking LIBIDL_LIBS" >&5
|
||||
LIBIDL_LIBS=`$PKG_CONFIG --libs "libIDL-2.0 >= 0.8.0"`
|
||||
echo "$ac_t""$LIBIDL_LIBS" 1>&6
|
||||
else
|
||||
@ -13641,7 +13655,7 @@ fi
|
||||
# Extract the first word of "glib-config", so it can be a program name with args.
|
||||
set dummy glib-config; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:13645: checking for $ac_word" >&5
|
||||
echo "configure:13659: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -13676,7 +13690,7 @@ fi
|
||||
|
||||
min_glib_version=1.2.0
|
||||
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
|
||||
echo "configure:13680: checking for GLIB - version >= $min_glib_version" >&5
|
||||
echo "configure:13694: checking for GLIB - version >= $min_glib_version" >&5
|
||||
no_glib=""
|
||||
if test "$GLIB_CONFIG" = "no" ; then
|
||||
no_glib=yes
|
||||
@ -13699,7 +13713,7 @@ echo "configure:13680: checking for GLIB - version >= $min_glib_version" >&5
|
||||
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 13703 "configure"
|
||||
#line 13717 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <glib.h>
|
||||
@ -13775,7 +13789,7 @@ main ()
|
||||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:13779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:13793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
@ -13809,7 +13823,7 @@ fi
|
||||
CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
||||
LIBS="$LIBS $GLIB_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 13813 "configure"
|
||||
#line 13827 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <glib.h>
|
||||
@ -13819,7 +13833,7 @@ int main() {
|
||||
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:13823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:13837: \"$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 GLIB or finding the wrong"
|
||||
@ -13863,7 +13877,7 @@ rm -f conftest*
|
||||
# Extract the first word of "libIDL-config", so it can be a program name with args.
|
||||
set dummy libIDL-config; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:13867: checking for $ac_word" >&5
|
||||
echo "configure:13881: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -13898,7 +13912,7 @@ fi
|
||||
|
||||
min_libIDL_version=$LIBIDL_VERSION
|
||||
echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6
|
||||
echo "configure:13902: checking for libIDL - version >= $min_libIDL_version" >&5
|
||||
echo "configure:13916: checking for libIDL - version >= $min_libIDL_version" >&5
|
||||
no_libIDL=""
|
||||
if test "$LIBIDL_CONFIG" = "no" ; then
|
||||
no_libIDL=yes
|
||||
@ -13925,7 +13939,7 @@ echo "configure:13902: checking for libIDL - version >= $min_libIDL_version" >&5
|
||||
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 13929 "configure"
|
||||
#line 13943 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <stdio.h>
|
||||
@ -14011,7 +14025,7 @@ main ()
|
||||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:14015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:14029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
@ -14045,7 +14059,7 @@ fi
|
||||
CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
|
||||
LIBS="$LIBS $LIBIDL_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 14049 "configure"
|
||||
#line 14063 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <stdio.h>
|
||||
@ -14056,7 +14070,7 @@ int main() {
|
||||
return IDL_get_libver_string ? 1 : 0;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:14060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:14074: \"$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 libIDL or finding the wrong"
|
||||
@ -14096,7 +14110,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:14100: checking for $ac_word" >&5
|
||||
echo "configure:14114: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_ORBIT_CONFIG'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -14218,7 +14232,7 @@ fi
|
||||
# Extract the first word of "glib-config", so it can be a program name with args.
|
||||
set dummy glib-config; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:14222: checking for $ac_word" >&5
|
||||
echo "configure:14236: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -14253,7 +14267,7 @@ fi
|
||||
|
||||
min_glib_version=${GLIB_VERSION}
|
||||
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
|
||||
echo "configure:14257: checking for GLIB - version >= $min_glib_version" >&5
|
||||
echo "configure:14271: checking for GLIB - version >= $min_glib_version" >&5
|
||||
no_glib=""
|
||||
if test "$GLIB_CONFIG" = "no" ; then
|
||||
no_glib=yes
|
||||
@ -14276,7 +14290,7 @@ echo "configure:14257: checking for GLIB - version >= $min_glib_version" >&5
|
||||
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 14280 "configure"
|
||||
#line 14294 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <glib.h>
|
||||
@ -14352,7 +14366,7 @@ main ()
|
||||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:14356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:14370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
@ -14386,7 +14400,7 @@ fi
|
||||
CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
||||
LIBS="$LIBS $GLIB_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 14390 "configure"
|
||||
#line 14404 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <glib.h>
|
||||
@ -14396,7 +14410,7 @@ int main() {
|
||||
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:14400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:14414: \"$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 GLIB or finding the wrong"
|
||||
@ -14539,14 +14553,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
|
||||
cross_compiling=$ac_cv_prog_cc_cross
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 14543 "configure"
|
||||
#line 14557 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <gmodule.h>
|
||||
int main() {
|
||||
int x = 1; x++;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:14550: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:14564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
:
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
@ -15203,6 +15217,7 @@ s%@MOC@%$MOC%g
|
||||
s%@MOZ_CALENDAR@%$MOZ_CALENDAR%g
|
||||
s%@MOZ_MAIL_NEWS@%$MOZ_MAIL_NEWS%g
|
||||
s%@MOZ_PHOENIX@%$MOZ_PHOENIX%g
|
||||
s%@MOZ_THUNDERBIRD@%$MOZ_THUNDERBIRD%g
|
||||
s%@MOZ_XUL_APP@%$MOZ_XUL_APP%g
|
||||
s%@FT2_CONFIG@%$FT2_CONFIG%g
|
||||
s%@FT2_CFLAGS@%$FT2_CFLAGS%g
|
||||
|
||||
Loading…
Reference in New Issue
Block a user