forked from pool/MozillaFirefox
6181 lines
232 KiB
Diff
6181 lines
232 KiB
Diff
--- configure
|
|
+++ configure
|
|
@@ -83,6 +83,8 @@
|
|
ac_help="$ac_help
|
|
--with-qtdir=\$dir Specify Qt directory "
|
|
ac_help="$ac_help
|
|
+ --enable-startup-notification Enable startup-notification support (default: disabled) "
|
|
+ac_help="$ac_help
|
|
--enable-application=APP
|
|
Options include:
|
|
suite
|
|
@@ -133,6 +135,8 @@
|
|
ac_help="$ac_help
|
|
--disable-gnomeui Disable libgnomeui support (default: auto, optional at runtime) "
|
|
ac_help="$ac_help
|
|
+ --enable-dbus Enable dbus support (default: disabled) "
|
|
+ac_help="$ac_help
|
|
--disable-crypto Disable crypto support (Personal Security Manager)"
|
|
ac_help="$ac_help
|
|
--disable-jsd Disable JavaScript debug library"
|
|
@@ -960,7 +964,7 @@
|
|
fi
|
|
|
|
echo $ac_n "checking host system type""... $ac_c" 1>&6
|
|
-echo "configure:964: checking host system type" >&5
|
|
+echo "configure:968: checking host system type" >&5
|
|
|
|
host_alias=$host
|
|
case "$host_alias" in
|
|
@@ -981,7 +985,7 @@
|
|
echo "$ac_t""$host" 1>&6
|
|
|
|
echo $ac_n "checking target system type""... $ac_c" 1>&6
|
|
-echo "configure:985: checking target system type" >&5
|
|
+echo "configure:989: checking target system type" >&5
|
|
|
|
target_alias=$target
|
|
case "$target_alias" in
|
|
@@ -999,7 +1003,7 @@
|
|
echo "$ac_t""$target" 1>&6
|
|
|
|
echo $ac_n "checking build system type""... $ac_c" 1>&6
|
|
-echo "configure:1003: checking build system type" >&5
|
|
+echo "configure:1007: checking build system type" >&5
|
|
|
|
build_alias=$build
|
|
case "$build_alias" in
|
|
@@ -1067,14 +1071,15 @@
|
|
GNOMEUI_VERSION=2.2.0
|
|
GCONF_VERSION=1.2.1
|
|
LIBGNOME_VERSION=2.0
|
|
+STARTUP_NOTIFICATION_VERSION=0.8
|
|
|
|
MISSING_X=
|
|
-for ac_prog in gawk mawk nawk awk
|
|
+for ac_prog in mawk gawk nawk awk
|
|
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:1078: checking for $ac_word" >&5
|
|
+echo "configure:1083: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -1172,7 +1177,7 @@
|
|
# 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:1176: checking for $ac_word" >&5
|
|
+echo "configure:1181: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_path_NSINSTALL_BIN'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -1241,13 +1246,13 @@
|
|
_SAVE_LDFLAGS="$LDFLAGS"
|
|
|
|
echo $ac_n "checking for host c compiler""... $ac_c" 1>&6
|
|
-echo "configure:1245: checking for host c compiler" >&5
|
|
+echo "configure:1250: checking for host c compiler" >&5
|
|
for ac_prog in $HOST_CC gcc cc /usr/ucb/cc cl icc
|
|
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:1251: checking for $ac_word" >&5
|
|
+echo "configure:1256: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_HOST_CC'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -1282,13 +1287,13 @@
|
|
fi
|
|
echo "$ac_t""$HOST_CC" 1>&6
|
|
echo $ac_n "checking for host c++ compiler""... $ac_c" 1>&6
|
|
-echo "configure:1286: checking for host c++ compiler" >&5
|
|
+echo "configure:1291: checking for host c++ compiler" >&5
|
|
for ac_prog in $HOST_CXX $CCC c++ g++ gcc CC cxx cc++ cl icc
|
|
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:1292: checking for $ac_word" >&5
|
|
+echo "configure:1297: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_HOST_CXX'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -1337,7 +1342,7 @@
|
|
# 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:1341: checking for $ac_word" >&5
|
|
+echo "configure:1346: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_HOST_RANLIB'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -1372,7 +1377,7 @@
|
|
# 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:1376: checking for $ac_word" >&5
|
|
+echo "configure:1381: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_HOST_AR'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -1407,16 +1412,16 @@
|
|
LDFLAGS="$HOST_LDFLAGS"
|
|
|
|
echo $ac_n "checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6
|
|
-echo "configure:1411: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5
|
|
+echo "configure:1416: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 1413 "configure"
|
|
+#line 1418 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
return(0);
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:1420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:1425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_prog_hostcc_works=1 echo "$ac_t""yes" 1>&6
|
|
else
|
|
@@ -1431,16 +1436,16 @@
|
|
CFLAGS="$HOST_CXXFLAGS"
|
|
|
|
echo $ac_n "checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6
|
|
-echo "configure:1435: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5
|
|
+echo "configure:1440: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 1437 "configure"
|
|
+#line 1442 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
return(0);
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:1444: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:1449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_prog_hostcxx_works=1 echo "$ac_t""yes" 1>&6
|
|
else
|
|
@@ -1469,7 +1474,7 @@
|
|
# 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:1473: checking for $ac_word" >&5
|
|
+echo "configure:1478: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -1503,7 +1508,7 @@
|
|
# Extract the first word of "gcc", so it can be a program name with args.
|
|
set dummy gcc; ac_word=$2
|
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
|
-echo "configure:1507: checking for $ac_word" >&5
|
|
+echo "configure:1512: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -1533,7 +1538,7 @@
|
|
# Extract the first word of "cc", so it can be a program name with args.
|
|
set dummy cc; ac_word=$2
|
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
|
-echo "configure:1537: checking for $ac_word" >&5
|
|
+echo "configure:1542: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -1584,7 +1589,7 @@
|
|
# Extract the first word of "cl", so it can be a program name with args.
|
|
set dummy cl; ac_word=$2
|
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
|
-echo "configure:1588: checking for $ac_word" >&5
|
|
+echo "configure:1593: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -1616,7 +1621,7 @@
|
|
fi
|
|
|
|
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
|
|
-echo "configure:1620: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
|
|
+echo "configure:1625: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
|
|
|
|
ac_ext=c
|
|
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
|
|
@@ -1627,12 +1632,12 @@
|
|
|
|
cat > conftest.$ac_ext << EOF
|
|
|
|
-#line 1631 "configure"
|
|
+#line 1636 "configure"
|
|
#include "confdefs.h"
|
|
|
|
main(){return(0);}
|
|
EOF
|
|
-if { (eval echo configure:1636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:1641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
ac_cv_prog_cc_works=yes
|
|
# If we can't run a trivial program, we are probably using a cross compiler.
|
|
if (./conftest; exit) 2>/dev/null; then
|
|
@@ -1658,12 +1663,12 @@
|
|
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
|
|
fi
|
|
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
|
|
-echo "configure:1662: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
|
|
+echo "configure:1667: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
|
|
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
|
|
cross_compiling=$ac_cv_prog_cc_cross
|
|
|
|
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
|
|
-echo "configure:1667: checking whether we are using GNU C" >&5
|
|
+echo "configure:1672: checking whether we are using GNU C" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -1672,7 +1677,7 @@
|
|
yes;
|
|
#endif
|
|
EOF
|
|
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1676: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
|
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1681: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
|
ac_cv_prog_gcc=yes
|
|
else
|
|
ac_cv_prog_gcc=no
|
|
@@ -1691,7 +1696,7 @@
|
|
ac_save_CFLAGS="$CFLAGS"
|
|
CFLAGS=
|
|
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
|
|
-echo "configure:1695: checking whether ${CC-cc} accepts -g" >&5
|
|
+echo "configure:1700: checking whether ${CC-cc} accepts -g" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -1727,7 +1732,7 @@
|
|
# 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:1731: checking for $ac_word" >&5
|
|
+echo "configure:1736: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -1763,7 +1768,7 @@
|
|
# 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:1767: checking for $ac_word" >&5
|
|
+echo "configure:1772: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -1795,7 +1800,7 @@
|
|
|
|
|
|
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
|
|
-echo "configure:1799: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
|
|
+echo "configure:1804: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
|
|
|
|
ac_ext=C
|
|
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
|
|
@@ -1806,12 +1811,12 @@
|
|
|
|
cat > conftest.$ac_ext << EOF
|
|
|
|
-#line 1810 "configure"
|
|
+#line 1815 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main(){return(0);}
|
|
EOF
|
|
-if { (eval echo configure:1815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:1820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
ac_cv_prog_cxx_works=yes
|
|
# If we can't run a trivial program, we are probably using a cross compiler.
|
|
if (./conftest; exit) 2>/dev/null; then
|
|
@@ -1837,12 +1842,12 @@
|
|
{ echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
|
|
fi
|
|
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
|
|
-echo "configure:1841: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
|
|
+echo "configure:1846: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
|
|
echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
|
|
cross_compiling=$ac_cv_prog_cxx_cross
|
|
|
|
echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
|
|
-echo "configure:1846: checking whether we are using GNU C++" >&5
|
|
+echo "configure:1851: checking whether we are using GNU C++" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -1851,7 +1856,7 @@
|
|
yes;
|
|
#endif
|
|
EOF
|
|
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1855: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
|
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
|
ac_cv_prog_gxx=yes
|
|
else
|
|
ac_cv_prog_gxx=no
|
|
@@ -1870,7 +1875,7 @@
|
|
ac_save_CXXFLAGS="$CXXFLAGS"
|
|
CXXFLAGS=
|
|
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
|
|
-echo "configure:1874: checking whether ${CXX-g++} accepts -g" >&5
|
|
+echo "configure:1879: checking whether ${CXX-g++} accepts -g" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -1901,57 +1906,6 @@
|
|
fi
|
|
fi
|
|
|
|
-for ac_declaration in \
|
|
- ''\
|
|
- '#include <stdlib.h>' \
|
|
- 'extern "C" void std::exit (int) throw (); using std::exit;' \
|
|
- 'extern "C" void std::exit (int); using std::exit;' \
|
|
- 'extern "C" void exit (int) throw ();' \
|
|
- 'extern "C" void exit (int);' \
|
|
- 'void exit (int);'
|
|
-do
|
|
- cat > conftest.$ac_ext <<EOF
|
|
-#line 1915 "configure"
|
|
-#include "confdefs.h"
|
|
-#include <stdlib.h>
|
|
-$ac_declaration
|
|
-int main() {
|
|
-exit (42);
|
|
-; return 0; }
|
|
-EOF
|
|
-if { (eval echo configure:1923: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
- :
|
|
-else
|
|
- echo "configure: failed program was:" >&5
|
|
- cat conftest.$ac_ext >&5
|
|
- rm -rf conftest*
|
|
- continue
|
|
-fi
|
|
-rm -f conftest*
|
|
- cat > conftest.$ac_ext <<EOF
|
|
-#line 1933 "configure"
|
|
-#include "confdefs.h"
|
|
-$ac_declaration
|
|
-int main() {
|
|
-exit (42);
|
|
-; return 0; }
|
|
-EOF
|
|
-if { (eval echo configure:1940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
- rm -rf conftest*
|
|
- break
|
|
-else
|
|
- echo "configure: failed program was:" >&5
|
|
- cat conftest.$ac_ext >&5
|
|
-fi
|
|
-rm -f conftest*
|
|
-done
|
|
-if test -n "$ac_declaration"; then
|
|
- echo '#ifdef __cplusplus' >>confdefs.h
|
|
- echo $ac_declaration >>confdefs.h
|
|
- echo '#endif' >>confdefs.h
|
|
-fi
|
|
-
|
|
-
|
|
|
|
case "$build:$target" in
|
|
powerpc-apple-darwin8*:i?86-apple-darwin*)
|
|
@@ -1965,7 +1919,7 @@
|
|
# 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:1969: checking for $ac_word" >&5
|
|
+echo "configure:1923: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -2000,7 +1954,7 @@
|
|
# 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:2004: checking for $ac_word" >&5
|
|
+echo "configure:1958: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -2035,7 +1989,7 @@
|
|
# 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:2039: checking for $ac_word" >&5
|
|
+echo "configure:1993: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -2076,7 +2030,7 @@
|
|
# 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:2080: checking for $ac_word" >&5
|
|
+echo "configure:2034: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -2111,7 +2065,7 @@
|
|
# 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:2115: checking for $ac_word" >&5
|
|
+echo "configure:2069: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -2146,7 +2100,7 @@
|
|
# 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:2150: checking for $ac_word" >&5
|
|
+echo "configure:2104: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -2184,7 +2138,7 @@
|
|
# Extract the first word of "gcc", so it can be a program name with args.
|
|
set dummy gcc; ac_word=$2
|
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
|
-echo "configure:2188: checking for $ac_word" >&5
|
|
+echo "configure:2142: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -2214,7 +2168,7 @@
|
|
# Extract the first word of "cc", so it can be a program name with args.
|
|
set dummy cc; ac_word=$2
|
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
|
-echo "configure:2218: checking for $ac_word" >&5
|
|
+echo "configure:2172: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -2265,7 +2219,7 @@
|
|
# Extract the first word of "cl", so it can be a program name with args.
|
|
set dummy cl; ac_word=$2
|
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
|
-echo "configure:2269: checking for $ac_word" >&5
|
|
+echo "configure:2223: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -2297,7 +2251,7 @@
|
|
fi
|
|
|
|
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
|
|
-echo "configure:2301: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
|
|
+echo "configure:2255: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
|
|
|
|
ac_ext=c
|
|
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
|
|
@@ -2308,12 +2262,12 @@
|
|
|
|
cat > conftest.$ac_ext << EOF
|
|
|
|
-#line 2312 "configure"
|
|
+#line 2266 "configure"
|
|
#include "confdefs.h"
|
|
|
|
main(){return(0);}
|
|
EOF
|
|
-if { (eval echo configure:2317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:2271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
ac_cv_prog_cc_works=yes
|
|
# If we can't run a trivial program, we are probably using a cross compiler.
|
|
if (./conftest; exit) 2>/dev/null; then
|
|
@@ -2339,12 +2293,12 @@
|
|
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
|
|
fi
|
|
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
|
|
-echo "configure:2343: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
|
|
+echo "configure:2297: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
|
|
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
|
|
cross_compiling=$ac_cv_prog_cc_cross
|
|
|
|
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
|
|
-echo "configure:2348: checking whether we are using GNU C" >&5
|
|
+echo "configure:2302: checking whether we are using GNU C" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -2353,7 +2307,7 @@
|
|
yes;
|
|
#endif
|
|
EOF
|
|
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2357: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
|
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2311: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
|
ac_cv_prog_gcc=yes
|
|
else
|
|
ac_cv_prog_gcc=no
|
|
@@ -2372,7 +2326,7 @@
|
|
ac_save_CFLAGS="$CFLAGS"
|
|
CFLAGS=
|
|
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
|
|
-echo "configure:2376: checking whether ${CC-cc} accepts -g" >&5
|
|
+echo "configure:2330: checking whether ${CC-cc} accepts -g" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -2408,7 +2362,7 @@
|
|
# 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:2412: checking for $ac_word" >&5
|
|
+echo "configure:2366: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -2440,7 +2394,7 @@
|
|
|
|
|
|
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
|
|
-echo "configure:2444: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
|
|
+echo "configure:2398: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
|
|
|
|
ac_ext=C
|
|
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
|
|
@@ -2451,12 +2405,12 @@
|
|
|
|
cat > conftest.$ac_ext << EOF
|
|
|
|
-#line 2455 "configure"
|
|
+#line 2409 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main(){return(0);}
|
|
EOF
|
|
-if { (eval echo configure:2460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:2414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
ac_cv_prog_cxx_works=yes
|
|
# If we can't run a trivial program, we are probably using a cross compiler.
|
|
if (./conftest; exit) 2>/dev/null; then
|
|
@@ -2482,12 +2436,12 @@
|
|
{ echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
|
|
fi
|
|
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
|
|
-echo "configure:2486: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
|
|
+echo "configure:2440: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
|
|
echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
|
|
cross_compiling=$ac_cv_prog_cxx_cross
|
|
|
|
echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
|
|
-echo "configure:2491: checking whether we are using GNU C++" >&5
|
|
+echo "configure:2445: checking whether we are using GNU C++" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -2496,7 +2450,7 @@
|
|
yes;
|
|
#endif
|
|
EOF
|
|
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2500: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
|
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2454: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
|
ac_cv_prog_gxx=yes
|
|
else
|
|
ac_cv_prog_gxx=no
|
|
@@ -2515,7 +2469,7 @@
|
|
ac_save_CXXFLAGS="$CXXFLAGS"
|
|
CXXFLAGS=
|
|
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
|
|
-echo "configure:2519: checking whether ${CXX-g++} accepts -g" >&5
|
|
+echo "configure:2473: checking whether ${CXX-g++} accepts -g" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -2546,61 +2500,10 @@
|
|
fi
|
|
fi
|
|
|
|
-for ac_declaration in \
|
|
- ''\
|
|
- '#include <stdlib.h>' \
|
|
- 'extern "C" void std::exit (int) throw (); using std::exit;' \
|
|
- 'extern "C" void std::exit (int); using std::exit;' \
|
|
- 'extern "C" void exit (int) throw ();' \
|
|
- 'extern "C" void exit (int);' \
|
|
- 'void exit (int);'
|
|
-do
|
|
- cat > conftest.$ac_ext <<EOF
|
|
-#line 2560 "configure"
|
|
-#include "confdefs.h"
|
|
-#include <stdlib.h>
|
|
-$ac_declaration
|
|
-int main() {
|
|
-exit (42);
|
|
-; return 0; }
|
|
-EOF
|
|
-if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
- :
|
|
-else
|
|
- echo "configure: failed program was:" >&5
|
|
- cat conftest.$ac_ext >&5
|
|
- rm -rf conftest*
|
|
- continue
|
|
-fi
|
|
-rm -f conftest*
|
|
- cat > conftest.$ac_ext <<EOF
|
|
-#line 2578 "configure"
|
|
-#include "confdefs.h"
|
|
-$ac_declaration
|
|
-int main() {
|
|
-exit (42);
|
|
-; return 0; }
|
|
-EOF
|
|
-if { (eval echo configure:2585: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
- rm -rf conftest*
|
|
- break
|
|
-else
|
|
- echo "configure: failed program was:" >&5
|
|
- cat conftest.$ac_ext >&5
|
|
-fi
|
|
-rm -f conftest*
|
|
-done
|
|
-if test -n "$ac_declaration"; then
|
|
- echo '#ifdef __cplusplus' >>confdefs.h
|
|
- echo $ac_declaration >>confdefs.h
|
|
- echo '#endif' >>confdefs.h
|
|
-fi
|
|
-
|
|
-
|
|
# Extract the first word of "ranlib", so it can be a program name with args.
|
|
set dummy ranlib; ac_word=$2
|
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
|
-echo "configure:2604: checking for $ac_word" >&5
|
|
+echo "configure:2507: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -2632,7 +2535,7 @@
|
|
# 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:2636: checking for $ac_word" >&5
|
|
+echo "configure:2539: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -2673,7 +2576,7 @@
|
|
# 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:2677: checking for $ac_word" >&5
|
|
+echo "configure:2580: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -2708,7 +2611,7 @@
|
|
# 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:2712: checking for $ac_word" >&5
|
|
+echo "configure:2615: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -2743,7 +2646,7 @@
|
|
# 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:2747: checking for $ac_word" >&5
|
|
+echo "configure:2650: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -2778,7 +2681,7 @@
|
|
# 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:2782: checking for $ac_word" >&5
|
|
+echo "configure:2685: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -2867,7 +2770,7 @@
|
|
# 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:2871: checking for $ac_word" >&5
|
|
+echo "configure:2774: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_MIDL'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -2909,14 +2812,14 @@
|
|
cross_compiling=$ac_cv_prog_cc_cross
|
|
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 2913 "configure"
|
|
+#line 2816 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdio.h>
|
|
int main() {
|
|
printf("Hello World\n");
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:2920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:2823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
:
|
|
else
|
|
echo "configure: failed program was:" >&5
|
|
@@ -2934,14 +2837,14 @@
|
|
cross_compiling=$ac_cv_prog_cxx_cross
|
|
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 2938 "configure"
|
|
+#line 2841 "configure"
|
|
#include "confdefs.h"
|
|
#include <new.h>
|
|
int main() {
|
|
unsigned *test = new unsigned(42);
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:2945: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:2848: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
:
|
|
else
|
|
echo "configure: failed program was:" >&5
|
|
@@ -2997,7 +2900,7 @@
|
|
_MIDL_REV_VERSION=`echo ${_MIDL_FULL_VERSION} | $AWK -F\. '{ print $3 }'`
|
|
# Add flags if necessary
|
|
echo $ac_n "checking for midl flags""... $ac_c" 1>&6
|
|
-echo "configure:3001: checking for midl flags" >&5
|
|
+echo "configure:2904: checking for midl flags" >&5
|
|
if test \( "$_MIDL_MAJOR_VERSION" -gt "6" \) -o \( "$_MIDL_MAJOR_VERSION" = "6" -a "$_MIDL_MINOR_VERSION" -gt "0" \) -o \( "$_MIDL_MAJOR_VERSION" = "6" -a "$_MIDL_MINOR_VERSION" = "00" -a "$_MIDL_REV_VERSION" -gt "359" \); then
|
|
# Starting with MIDL version 6.0.359, the MIDL compiler
|
|
# generates /Oicf /robust stubs by default, which is not
|
|
@@ -3019,9 +2922,9 @@
|
|
_W32API_MAJOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $1 }'`
|
|
_W32API_MINOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $2 }'`
|
|
echo $ac_n "checking for w32api version >= $W32API_VERSION""... $ac_c" 1>&6
|
|
-echo "configure:3023: checking for w32api version >= $W32API_VERSION" >&5
|
|
+echo "configure:2926: checking for w32api version >= $W32API_VERSION" >&5
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 3025 "configure"
|
|
+#line 2928 "configure"
|
|
#include "confdefs.h"
|
|
#include <w32api.h>
|
|
int main() {
|
|
@@ -3033,7 +2936,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:3037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:2940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
res=yes
|
|
else
|
|
@@ -3049,7 +2952,7 @@
|
|
fi
|
|
# Check windres version
|
|
echo $ac_n "checking for windres version >= $WINDRES_VERSION""... $ac_c" 1>&6
|
|
-echo "configure:3053: checking for windres version >= $WINDRES_VERSION" >&5
|
|
+echo "configure:2956: checking for windres version >= $WINDRES_VERSION" >&5
|
|
_WINDRES_VERSION=`${WINDRES} --version 2>&1 | grep -i windres 2>/dev/null | $AWK '{ print $3 }'`
|
|
echo "$ac_t""$_WINDRES_VERSION" 1>&6
|
|
_WINDRES_MAJOR_VERSION=`echo $_WINDRES_VERSION | $AWK -F\. '{ print $1 }'`
|
|
@@ -3076,7 +2979,7 @@
|
|
SKIP_COMPILER_CHECKS=1
|
|
SKIP_LIBRARY_CHECKS=1
|
|
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
|
|
-echo "configure:3080: checking how to run the C preprocessor" >&5
|
|
+echo "configure:2983: checking how to run the C preprocessor" >&5
|
|
# On Suns, sometimes $CPP names a directory.
|
|
if test -n "$CPP" && test -d "$CPP"; then
|
|
CPP=
|
|
@@ -3091,13 +2994,13 @@
|
|
# On the NeXT, cc -E runs the code through the compiler's parser,
|
|
# not just through cpp.
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 3095 "configure"
|
|
+#line 2998 "configure"
|
|
#include "confdefs.h"
|
|
#include <assert.h>
|
|
Syntax Error
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:3101: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:3004: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
if test -z "$ac_err"; then
|
|
:
|
|
@@ -3108,13 +3011,13 @@
|
|
rm -rf conftest*
|
|
CPP="${CC-cc} -E -traditional-cpp"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 3112 "configure"
|
|
+#line 3015 "configure"
|
|
#include "confdefs.h"
|
|
#include <assert.h>
|
|
Syntax Error
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:3118: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:3021: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
if test -z "$ac_err"; then
|
|
:
|
|
@@ -3125,13 +3028,13 @@
|
|
rm -rf conftest*
|
|
CPP="${CC-cc} -nologo -E"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 3129 "configure"
|
|
+#line 3032 "configure"
|
|
#include "confdefs.h"
|
|
#include <assert.h>
|
|
Syntax Error
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:3135: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:3038: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
if test -z "$ac_err"; then
|
|
:
|
|
@@ -3159,17 +3062,17 @@
|
|
do
|
|
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
|
-echo "configure:3163: checking for $ac_hdr" >&5
|
|
+echo "configure:3066: checking for $ac_hdr" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 3168 "configure"
|
|
+#line 3071 "configure"
|
|
#include "confdefs.h"
|
|
#include <$ac_hdr>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:3173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:3076: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
if test -z "$ac_err"; then
|
|
rm -rf conftest*
|
|
@@ -3200,10 +3103,10 @@
|
|
if test "$CC" != "icc" -a -z "$_WIN32_MSVC"; then
|
|
if test "x$CC" != xcc; then
|
|
echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6
|
|
-echo "configure:3204: checking whether $CC and cc understand -c and -o together" >&5
|
|
+echo "configure:3107: checking whether $CC and cc understand -c and -o together" >&5
|
|
else
|
|
echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6
|
|
-echo "configure:3207: checking whether cc understands -c and -o together" >&5
|
|
+echo "configure:3110: checking whether cc understands -c and -o together" >&5
|
|
fi
|
|
set dummy $CC; ac_cc="`echo $2 |
|
|
sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`"
|
|
@@ -3215,16 +3118,16 @@
|
|
# We do the test twice because some compilers refuse to overwrite an
|
|
# existing .o file with -o, though they will create one.
|
|
ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5'
|
|
-if { (eval echo configure:3219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
|
|
- test -f conftest.o && { (eval echo configure:3220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
|
|
+if { (eval echo configure:3122: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
|
|
+ test -f conftest.o && { (eval echo configure:3123: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
|
|
then
|
|
eval ac_cv_prog_cc_${ac_cc}_c_o=yes
|
|
if test "x$CC" != xcc; then
|
|
# Test first that cc exists at all.
|
|
- if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3225: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
|
|
+ if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3128: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
|
|
ac_try='cc -c conftest.c -o conftest.o 1>&5'
|
|
- if { (eval echo configure:3227: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
|
|
- test -f conftest.o && { (eval echo configure:3228: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
|
|
+ if { (eval echo configure:3130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
|
|
+ test -f conftest.o && { (eval echo configure:3131: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
|
|
then
|
|
# cc works too.
|
|
:
|
|
@@ -3260,7 +3163,7 @@
|
|
fi
|
|
|
|
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
|
|
-echo "configure:3264: checking how to run the C preprocessor" >&5
|
|
+echo "configure:3167: checking how to run the C preprocessor" >&5
|
|
# On Suns, sometimes $CPP names a directory.
|
|
if test -n "$CPP" && test -d "$CPP"; then
|
|
CPP=
|
|
@@ -3275,13 +3178,13 @@
|
|
# On the NeXT, cc -E runs the code through the compiler's parser,
|
|
# not just through cpp.
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 3279 "configure"
|
|
+#line 3182 "configure"
|
|
#include "confdefs.h"
|
|
#include <assert.h>
|
|
Syntax Error
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:3285: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:3188: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
if test -z "$ac_err"; then
|
|
:
|
|
@@ -3292,13 +3195,13 @@
|
|
rm -rf conftest*
|
|
CPP="${CC-cc} -E -traditional-cpp"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 3296 "configure"
|
|
+#line 3199 "configure"
|
|
#include "confdefs.h"
|
|
#include <assert.h>
|
|
Syntax Error
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:3302: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:3205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
if test -z "$ac_err"; then
|
|
:
|
|
@@ -3309,13 +3212,13 @@
|
|
rm -rf conftest*
|
|
CPP="${CC-cc} -nologo -E"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 3313 "configure"
|
|
+#line 3216 "configure"
|
|
#include "confdefs.h"
|
|
#include <assert.h>
|
|
Syntax Error
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:3319: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:3222: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
if test -z "$ac_err"; then
|
|
:
|
|
@@ -3340,7 +3243,7 @@
|
|
echo "$ac_t""$CPP" 1>&6
|
|
|
|
echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
|
|
-echo "configure:3344: checking how to run the C++ preprocessor" >&5
|
|
+echo "configure:3247: checking how to run the C++ preprocessor" >&5
|
|
if test -z "$CXXCPP"; then
|
|
if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -3353,12 +3256,12 @@
|
|
cross_compiling=$ac_cv_prog_cxx_cross
|
|
CXXCPP="${CXX-g++} -E"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 3357 "configure"
|
|
+#line 3260 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdlib.h>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:3362: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:3265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
if test -z "$ac_err"; then
|
|
:
|
|
@@ -3405,7 +3308,7 @@
|
|
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
|
|
# ./install, which can be erroneously created by make from ./install.sh.
|
|
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
|
|
-echo "configure:3409: checking for a BSD compatible install" >&5
|
|
+echo "configure:3312: checking for a BSD compatible install" >&5
|
|
if test -z "$INSTALL"; then
|
|
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -3458,7 +3361,7 @@
|
|
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
|
|
|
|
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
|
|
-echo "configure:3462: checking whether ln -s works" >&5
|
|
+echo "configure:3365: checking whether ln -s works" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -3483,7 +3386,7 @@
|
|
# 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:3487: checking for $ac_word" >&5
|
|
+echo "configure:3390: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -3523,7 +3426,7 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for minimum required perl version >= $PERL_VERSION""... $ac_c" 1>&6
|
|
-echo "configure:3527: checking for minimum required perl version >= $PERL_VERSION" >&5
|
|
+echo "configure:3430: checking for minimum required perl version >= $PERL_VERSION" >&5
|
|
_perl_version=`PERL_VERSION=$PERL_VERSION $PERL -e 'print "$]"; if ($] >= $ENV{PERL_VERSION}) { exit(0); } else { exit(1); }' 2>&5`
|
|
_perl_res=$?
|
|
echo "$ac_t""$_perl_version" 1>&6
|
|
@@ -3533,7 +3436,7 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for full perl installation""... $ac_c" 1>&6
|
|
-echo "configure:3537: checking for full perl installation" >&5
|
|
+echo "configure:3440: checking for full perl installation" >&5
|
|
_perl_archlib=`$PERL -e 'use Config; if ( -d $Config{archlib} ) { exit(0); } else { exit(1); }' 2>&5`
|
|
_perl_res=$?
|
|
if test "$_perl_res" != 0; then
|
|
@@ -3546,7 +3449,7 @@
|
|
# Extract the first word of "doxygen", so it can be a program name with args.
|
|
set dummy doxygen; ac_word=$2
|
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
|
-echo "configure:3550: checking for $ac_word" >&5
|
|
+echo "configure:3453: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_path_DOXYGEN'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -3582,7 +3485,7 @@
|
|
# Extract the first word of "whoami", so it can be a program name with args.
|
|
set dummy whoami; ac_word=$2
|
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
|
-echo "configure:3586: checking for $ac_word" >&5
|
|
+echo "configure:3489: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_path_WHOAMI'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -3618,7 +3521,7 @@
|
|
# Extract the first word of "autoconf", so it can be a program name with args.
|
|
set dummy autoconf; ac_word=$2
|
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
|
-echo "configure:3622: checking for $ac_word" >&5
|
|
+echo "configure:3525: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_path_AUTOCONF'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -3654,7 +3557,7 @@
|
|
# Extract the first word of "unzip", so it can be a program name with args.
|
|
set dummy unzip; ac_word=$2
|
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
|
-echo "configure:3658: checking for $ac_word" >&5
|
|
+echo "configure:3561: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_path_UNZIP'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -3692,7 +3595,7 @@
|
|
# 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:3696: checking for $ac_word" >&5
|
|
+echo "configure:3599: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_path_ZIP'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -3733,7 +3636,7 @@
|
|
# Extract the first word of "makedepend", so it can be a program name with args.
|
|
set dummy makedepend; ac_word=$2
|
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
|
-echo "configure:3737: checking for $ac_word" >&5
|
|
+echo "configure:3640: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_path_SYSTEM_MAKEDEPEND'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -3768,7 +3671,7 @@
|
|
# Extract the first word of "xargs", so it can be a program name with args.
|
|
set dummy xargs; ac_word=$2
|
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
|
-echo "configure:3772: checking for $ac_word" >&5
|
|
+echo "configure:3675: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_path_XARGS'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -3831,7 +3734,7 @@
|
|
# 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:3835: checking for $ac_word" >&5
|
|
+echo "configure:3738: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_path_PBBUILD'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -3881,7 +3784,7 @@
|
|
# Extract the first word of "sdp", so it can be a program name with args.
|
|
set dummy sdp; ac_word=$2
|
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
|
-echo "configure:3885: checking for $ac_word" >&5
|
|
+echo "configure:3788: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_path_SDP'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -3977,7 +3880,7 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for valid compiler/Mac OS X SDK combination""... $ac_c" 1>&6
|
|
-echo "configure:3981: checking for valid compiler/Mac OS X SDK combination" >&5
|
|
+echo "configure:3884: checking for valid compiler/Mac OS X SDK combination" >&5
|
|
ac_ext=C
|
|
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
|
|
ac_cpp='$CXXCPP $CPPFLAGS'
|
|
@@ -3986,7 +3889,7 @@
|
|
cross_compiling=$ac_cv_prog_cxx_cross
|
|
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 3990 "configure"
|
|
+#line 3893 "configure"
|
|
#include "confdefs.h"
|
|
#include <new>
|
|
int main() { return 0; }
|
|
@@ -3994,7 +3897,7 @@
|
|
result=yes
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:3998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:3901: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
result=no
|
|
else
|
|
@@ -4019,7 +3922,7 @@
|
|
# 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:4023: checking for $ac_word" >&5
|
|
+echo "configure:3926: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -4062,7 +3965,7 @@
|
|
# 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:4066: checking for $ac_word" >&5
|
|
+echo "configure:3969: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -4130,7 +4033,7 @@
|
|
# Uses ac_ vars as temps to allow command line to override cache and checks.
|
|
# --without-x overrides everything else, but does not touch the cache.
|
|
echo $ac_n "checking for X""... $ac_c" 1>&6
|
|
-echo "configure:4134: checking for X" >&5
|
|
+echo "configure:4037: checking for X" >&5
|
|
|
|
# Check whether --with-x or --without-x was given.
|
|
if test "${with_x+set}" = set; then
|
|
@@ -4192,12 +4095,12 @@
|
|
|
|
# First, try using that file with no special directory specified.
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 4196 "configure"
|
|
+#line 4099 "configure"
|
|
#include "confdefs.h"
|
|
#include <$x_direct_test_include>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:4201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:4104: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
if test -z "$ac_err"; then
|
|
rm -rf conftest*
|
|
@@ -4266,14 +4169,14 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-l$x_direct_test_library $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 4270 "configure"
|
|
+#line 4173 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
${x_direct_test_function}()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:4277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:4180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
rm -rf conftest*
|
|
LIBS="$ac_save_LIBS"
|
|
# We can link X programs with no special library path.
|
|
@@ -4379,17 +4282,17 @@
|
|
case "`(uname -sr) 2>/dev/null`" in
|
|
"SunOS 5"*)
|
|
echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
|
|
-echo "configure:4383: checking whether -R must be followed by a space" >&5
|
|
+echo "configure:4286: checking whether -R must be followed by a space" >&5
|
|
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 4386 "configure"
|
|
+#line 4289 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:4393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:4296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
rm -rf conftest*
|
|
ac_R_nospace=yes
|
|
else
|
|
@@ -4405,14 +4308,14 @@
|
|
else
|
|
LIBS="$ac_xsave_LIBS -R $x_libraries"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 4409 "configure"
|
|
+#line 4312 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:4416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:4319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
rm -rf conftest*
|
|
ac_R_space=yes
|
|
else
|
|
@@ -4444,7 +4347,7 @@
|
|
# libraries were built with DECnet support. And karl@cs.umb.edu says
|
|
# the Alpha needs dnet_stub (dnet does not exist).
|
|
echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
|
|
-echo "configure:4448: checking for dnet_ntoa in -ldnet" >&5
|
|
+echo "configure:4351: checking for dnet_ntoa in -ldnet" >&5
|
|
ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -4452,7 +4355,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-ldnet $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 4456 "configure"
|
|
+#line 4359 "configure"
|
|
#include "confdefs.h"
|
|
/* Override any gcc2 internal prototype to avoid an error. */
|
|
#ifdef __cplusplus
|
|
@@ -4466,7 +4369,7 @@
|
|
dnet_ntoa()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:4470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:4373: \"$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
|
|
@@ -4488,7 +4391,7 @@
|
|
|
|
if test $ac_cv_lib_dnet_dnet_ntoa = no; then
|
|
echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
|
|
-echo "configure:4492: checking for dnet_ntoa in -ldnet_stub" >&5
|
|
+echo "configure:4395: checking for dnet_ntoa in -ldnet_stub" >&5
|
|
ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -4496,7 +4399,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-ldnet_stub $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 4500 "configure"
|
|
+#line 4403 "configure"
|
|
#include "confdefs.h"
|
|
/* Override any gcc2 internal prototype to avoid an error. */
|
|
#ifdef __cplusplus
|
|
@@ -4510,7 +4413,7 @@
|
|
dnet_ntoa()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:4514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:4417: \"$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
|
|
@@ -4539,12 +4442,12 @@
|
|
# The nsl library prevents programs from opening the X display
|
|
# on Irix 5.2, according to dickey@clark.net.
|
|
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
|
|
-echo "configure:4543: checking for gethostbyname" >&5
|
|
+echo "configure:4446: checking for gethostbyname" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 4548 "configure"
|
|
+#line 4451 "configure"
|
|
#include "confdefs.h"
|
|
/* System header to define __stub macros and hopefully few prototypes,
|
|
which can conflict with char gethostbyname(); below. */
|
|
@@ -4570,7 +4473,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:4574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:4477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
rm -rf conftest*
|
|
eval "ac_cv_func_gethostbyname=yes"
|
|
else
|
|
@@ -4591,7 +4494,7 @@
|
|
|
|
if test $ac_cv_func_gethostbyname = no; then
|
|
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
|
|
-echo "configure:4595: checking for gethostbyname in -lnsl" >&5
|
|
+echo "configure:4498: checking for gethostbyname in -lnsl" >&5
|
|
ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -4599,7 +4502,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lnsl $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 4603 "configure"
|
|
+#line 4506 "configure"
|
|
#include "confdefs.h"
|
|
/* Override any gcc2 internal prototype to avoid an error. */
|
|
#ifdef __cplusplus
|
|
@@ -4613,7 +4516,7 @@
|
|
gethostbyname()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:4617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:4520: \"$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
|
|
@@ -4643,12 +4546,12 @@
|
|
# -lsocket must be given before -lnsl if both are needed.
|
|
# We assume that if connect needs -lnsl, so does gethostbyname.
|
|
echo $ac_n "checking for connect""... $ac_c" 1>&6
|
|
-echo "configure:4647: checking for connect" >&5
|
|
+echo "configure:4550: checking for connect" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 4652 "configure"
|
|
+#line 4555 "configure"
|
|
#include "confdefs.h"
|
|
/* System header to define __stub macros and hopefully few prototypes,
|
|
which can conflict with char connect(); below. */
|
|
@@ -4674,7 +4577,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:4678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:4581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
rm -rf conftest*
|
|
eval "ac_cv_func_connect=yes"
|
|
else
|
|
@@ -4695,7 +4598,7 @@
|
|
|
|
if test $ac_cv_func_connect = no; then
|
|
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
|
|
-echo "configure:4699: checking for connect in -lsocket" >&5
|
|
+echo "configure:4602: checking for connect in -lsocket" >&5
|
|
ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -4703,7 +4606,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 4707 "configure"
|
|
+#line 4610 "configure"
|
|
#include "confdefs.h"
|
|
/* Override any gcc2 internal prototype to avoid an error. */
|
|
#ifdef __cplusplus
|
|
@@ -4717,7 +4620,7 @@
|
|
connect()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:4721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:4624: \"$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
|
|
@@ -4741,12 +4644,12 @@
|
|
|
|
# gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
|
|
echo $ac_n "checking for remove""... $ac_c" 1>&6
|
|
-echo "configure:4745: checking for remove" >&5
|
|
+echo "configure:4648: checking for remove" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 4750 "configure"
|
|
+#line 4653 "configure"
|
|
#include "confdefs.h"
|
|
/* System header to define __stub macros and hopefully few prototypes,
|
|
which can conflict with char remove(); below. */
|
|
@@ -4772,7 +4675,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:4776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:4679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
rm -rf conftest*
|
|
eval "ac_cv_func_remove=yes"
|
|
else
|
|
@@ -4793,7 +4696,7 @@
|
|
|
|
if test $ac_cv_func_remove = no; then
|
|
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
|
|
-echo "configure:4797: checking for remove in -lposix" >&5
|
|
+echo "configure:4700: checking for remove in -lposix" >&5
|
|
ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -4801,7 +4704,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lposix $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 4805 "configure"
|
|
+#line 4708 "configure"
|
|
#include "confdefs.h"
|
|
/* Override any gcc2 internal prototype to avoid an error. */
|
|
#ifdef __cplusplus
|
|
@@ -4815,7 +4718,7 @@
|
|
remove()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:4819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:4722: \"$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
|
|
@@ -4839,12 +4742,12 @@
|
|
|
|
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
|
|
echo $ac_n "checking for shmat""... $ac_c" 1>&6
|
|
-echo "configure:4843: checking for shmat" >&5
|
|
+echo "configure:4746: checking for shmat" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 4848 "configure"
|
|
+#line 4751 "configure"
|
|
#include "confdefs.h"
|
|
/* System header to define __stub macros and hopefully few prototypes,
|
|
which can conflict with char shmat(); below. */
|
|
@@ -4870,7 +4773,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:4874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:4777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
rm -rf conftest*
|
|
eval "ac_cv_func_shmat=yes"
|
|
else
|
|
@@ -4891,7 +4794,7 @@
|
|
|
|
if test $ac_cv_func_shmat = no; then
|
|
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
|
|
-echo "configure:4895: checking for shmat in -lipc" >&5
|
|
+echo "configure:4798: checking for shmat in -lipc" >&5
|
|
ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -4899,7 +4802,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lipc $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 4903 "configure"
|
|
+#line 4806 "configure"
|
|
#include "confdefs.h"
|
|
/* Override any gcc2 internal prototype to avoid an error. */
|
|
#ifdef __cplusplus
|
|
@@ -4913,7 +4816,7 @@
|
|
shmat()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:4917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:4820: \"$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
|
|
@@ -4946,7 +4849,7 @@
|
|
# libraries we check for below, so use a different variable.
|
|
# --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
|
|
echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
|
|
-echo "configure:4950: checking for IceConnectionNumber in -lICE" >&5
|
|
+echo "configure:4853: checking for IceConnectionNumber in -lICE" >&5
|
|
ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -4954,7 +4857,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 4958 "configure"
|
|
+#line 4861 "configure"
|
|
#include "confdefs.h"
|
|
/* Override any gcc2 internal prototype to avoid an error. */
|
|
#ifdef __cplusplus
|
|
@@ -4968,7 +4871,7 @@
|
|
IceConnectionNumber()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:4972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:4875: \"$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
|
|
@@ -5406,7 +5309,7 @@
|
|
if test "$COMPILE_ENVIRONMENT"; then
|
|
if test "$GNU_CC"; then
|
|
echo $ac_n "checking whether ld has archive extraction flags""... $ac_c" 1>&6
|
|
-echo "configure:5410: checking whether ld has archive extraction flags" >&5
|
|
+echo "configure:5313: checking whether ld has archive extraction flags" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_mkshlib_force_and_unforce'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -5423,14 +5326,14 @@
|
|
LDFLAGS=$force
|
|
LIBS=$unforce
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 5427 "configure"
|
|
+#line 5330 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:5434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:5337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
rm -rf conftest*
|
|
ac_cv_mkshlib_force_and_unforce=$line; break
|
|
else
|
|
@@ -5465,17 +5368,17 @@
|
|
cross_compiling=$ac_cv_prog_cc_cross
|
|
|
|
echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6
|
|
-echo "configure:5469: checking for 64-bit OS" >&5
|
|
+echo "configure:5372: checking for 64-bit OS" >&5
|
|
if test "$cross_compiling" = yes; then
|
|
result="maybe"
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 5474 "configure"
|
|
+#line 5377 "configure"
|
|
#include "confdefs.h"
|
|
int main () {
|
|
if (sizeof(long) == 8) { return 0; } return 1; }
|
|
EOF
|
|
-if { (eval echo configure:5479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:5382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
result="yes"
|
|
else
|
|
@@ -5635,9 +5538,9 @@
|
|
cross_compiling=$ac_cv_prog_cxx_cross
|
|
|
|
echo $ac_n "checking for VisualAge C++ compiler version >= 5.0.2.0""... $ac_c" 1>&6
|
|
-echo "configure:5639: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5
|
|
+echo "configure:5542: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 5641 "configure"
|
|
+#line 5544 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
@@ -5646,7 +5549,7 @@
|
|
#endif
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:5650: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:5553: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
_BAD_COMPILER=
|
|
else
|
|
@@ -5684,17 +5587,17 @@
|
|
do
|
|
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
|
-echo "configure:5688: checking for $ac_hdr" >&5
|
|
+echo "configure:5591: checking for $ac_hdr" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 5693 "configure"
|
|
+#line 5596 "configure"
|
|
#include "confdefs.h"
|
|
#include <$ac_hdr>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:5698: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:5601: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
if test -z "$ac_err"; then
|
|
rm -rf conftest*
|
|
@@ -5736,7 +5639,7 @@
|
|
LIBS="$LIBS -lbe"
|
|
if test "$COMPILE_ENVIRONMENT"; then
|
|
echo $ac_n "checking for main in -lbind""... $ac_c" 1>&6
|
|
-echo "configure:5740: checking for main in -lbind" >&5
|
|
+echo "configure:5643: checking for main in -lbind" >&5
|
|
ac_lib_var=`echo bind'_'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
|
|
@@ -5744,14 +5647,14 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lbind $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 5748 "configure"
|
|
+#line 5651 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
main()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:5755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:5658: \"$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
|
|
@@ -5772,7 +5675,7 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for main in -lzeta""... $ac_c" 1>&6
|
|
-echo "configure:5776: checking for main in -lzeta" >&5
|
|
+echo "configure:5679: checking for main in -lzeta" >&5
|
|
ac_lib_var=`echo zeta'_'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
|
|
@@ -5780,14 +5683,14 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lzeta $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 5784 "configure"
|
|
+#line 5687 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
main()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:5791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:5694: \"$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
|
|
@@ -5851,18 +5754,18 @@
|
|
MACOSX=1
|
|
|
|
echo $ac_n "checking for -dead_strip option to ld""... $ac_c" 1>&6
|
|
-echo "configure:5855: checking for -dead_strip option to ld" >&5
|
|
+echo "configure:5758: checking for -dead_strip option to ld" >&5
|
|
_SAVE_LDFLAGS=$LDFLAGS
|
|
LDFLAGS="$LDFLAGS -Wl,-dead_strip"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 5859 "configure"
|
|
+#line 5762 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
return 0;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:5866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:5769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
rm -rf conftest*
|
|
_HAVE_DEAD_STRIP=1
|
|
else
|
|
@@ -6730,14 +6633,14 @@
|
|
_SAVE_LDFLAGS=$LDFLAGS
|
|
LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 6734 "configure"
|
|
+#line 6637 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdio.h>
|
|
int main() {
|
|
printf("Hello World\n");
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:6741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:6644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
:
|
|
else
|
|
echo "configure: failed program was:" >&5
|
|
@@ -6765,7 +6668,7 @@
|
|
CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'`
|
|
CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'`
|
|
echo $ac_n "checking for Forte compiler version >= WS6U2""... $ac_c" 1>&6
|
|
-echo "configure:6769: checking for Forte compiler version >= WS6U2" >&5
|
|
+echo "configure:6672: checking for Forte compiler version >= WS6U2" >&5
|
|
|
|
ac_ext=C
|
|
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
|
|
@@ -6775,7 +6678,7 @@
|
|
cross_compiling=$ac_cv_prog_cxx_cross
|
|
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 6779 "configure"
|
|
+#line 6682 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
@@ -6784,7 +6687,7 @@
|
|
#endif
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:6788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:6691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
_BAD_COMPILER=
|
|
else
|
|
@@ -6913,7 +6816,7 @@
|
|
;;
|
|
*-darwin*)
|
|
echo $ac_n "checking for -exported_symbols_list option to ld""... $ac_c" 1>&6
|
|
-echo "configure:6917: checking for -exported_symbols_list option to ld" >&5
|
|
+echo "configure:6820: checking for -exported_symbols_list option to ld" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_exported_symbols_list'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -6953,12 +6856,12 @@
|
|
cross_compiling=$ac_cv_prog_cc_cross
|
|
|
|
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
|
|
-echo "configure:6957: checking for ANSI C header files" >&5
|
|
+echo "configure:6860: checking for ANSI C header files" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 6962 "configure"
|
|
+#line 6865 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdlib.h>
|
|
#include <stdarg.h>
|
|
@@ -6966,7 +6869,7 @@
|
|
#include <float.h>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:6970: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:6873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
if test -z "$ac_err"; then
|
|
rm -rf conftest*
|
|
@@ -6983,7 +6886,7 @@
|
|
if test $ac_cv_header_stdc = yes; then
|
|
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 6987 "configure"
|
|
+#line 6890 "configure"
|
|
#include "confdefs.h"
|
|
#include <string.h>
|
|
EOF
|
|
@@ -7001,7 +6904,7 @@
|
|
if test $ac_cv_header_stdc = yes; then
|
|
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 7005 "configure"
|
|
+#line 6908 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdlib.h>
|
|
EOF
|
|
@@ -7022,7 +6925,7 @@
|
|
:
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 7026 "configure"
|
|
+#line 6929 "configure"
|
|
#include "confdefs.h"
|
|
#include <ctype.h>
|
|
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
|
|
@@ -7033,7 +6936,7 @@
|
|
exit (0); }
|
|
|
|
EOF
|
|
-if { (eval echo configure:7037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:6940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
:
|
|
else
|
|
@@ -7057,12 +6960,12 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for working const""... $ac_c" 1>&6
|
|
-echo "configure:7061: checking for working const" >&5
|
|
+echo "configure:6964: checking for working const" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 7066 "configure"
|
|
+#line 6969 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
@@ -7111,7 +7014,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:7115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:7018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_c_const=yes
|
|
else
|
|
@@ -7132,12 +7035,12 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for mode_t""... $ac_c" 1>&6
|
|
-echo "configure:7136: checking for mode_t" >&5
|
|
+echo "configure:7039: checking for mode_t" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 7141 "configure"
|
|
+#line 7044 "configure"
|
|
#include "confdefs.h"
|
|
#include <sys/types.h>
|
|
#if STDC_HEADERS
|
|
@@ -7165,12 +7068,12 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for off_t""... $ac_c" 1>&6
|
|
-echo "configure:7169: checking for off_t" >&5
|
|
+echo "configure:7072: checking for off_t" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 7174 "configure"
|
|
+#line 7077 "configure"
|
|
#include "confdefs.h"
|
|
#include <sys/types.h>
|
|
#if STDC_HEADERS
|
|
@@ -7198,12 +7101,12 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for pid_t""... $ac_c" 1>&6
|
|
-echo "configure:7202: checking for pid_t" >&5
|
|
+echo "configure:7105: checking for pid_t" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 7207 "configure"
|
|
+#line 7110 "configure"
|
|
#include "confdefs.h"
|
|
#include <sys/types.h>
|
|
#if STDC_HEADERS
|
|
@@ -7231,12 +7134,12 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for size_t""... $ac_c" 1>&6
|
|
-echo "configure:7235: checking for size_t" >&5
|
|
+echo "configure:7138: checking for size_t" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 7240 "configure"
|
|
+#line 7143 "configure"
|
|
#include "confdefs.h"
|
|
#include <sys/types.h>
|
|
#if STDC_HEADERS
|
|
@@ -7264,12 +7167,12 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
|
|
-echo "configure:7268: checking for st_blksize in struct stat" >&5
|
|
+echo "configure:7171: checking for st_blksize in struct stat" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 7273 "configure"
|
|
+#line 7176 "configure"
|
|
#include "confdefs.h"
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
@@ -7277,7 +7180,7 @@
|
|
struct stat s; s.st_blksize;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:7281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:7184: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_struct_st_blksize=yes
|
|
else
|
|
@@ -7298,12 +7201,12 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6
|
|
-echo "configure:7302: checking for siginfo_t" >&5
|
|
+echo "configure:7205: checking for siginfo_t" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_siginfo_t'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 7307 "configure"
|
|
+#line 7210 "configure"
|
|
#include "confdefs.h"
|
|
#define _POSIX_C_SOURCE 199506L
|
|
#include <signal.h>
|
|
@@ -7311,7 +7214,7 @@
|
|
siginfo_t* info;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:7315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:7218: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_siginfo_t=true
|
|
else
|
|
@@ -7345,12 +7248,12 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for int16_t""... $ac_c" 1>&6
|
|
-echo "configure:7349: checking for int16_t" >&5
|
|
+echo "configure:7252: checking for int16_t" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_int16_t'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 7354 "configure"
|
|
+#line 7257 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
@@ -7358,7 +7261,7 @@
|
|
int16_t foo = 0;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:7362: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:7265: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_int16_t=true
|
|
else
|
|
@@ -7380,12 +7283,12 @@
|
|
echo "$ac_t""no" 1>&6
|
|
fi
|
|
echo $ac_n "checking for int32_t""... $ac_c" 1>&6
|
|
-echo "configure:7384: checking for int32_t" >&5
|
|
+echo "configure:7287: checking for int32_t" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_int32_t'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 7389 "configure"
|
|
+#line 7292 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
@@ -7393,7 +7296,7 @@
|
|
int32_t foo = 0;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:7397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:7300: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_int32_t=true
|
|
else
|
|
@@ -7415,12 +7318,12 @@
|
|
echo "$ac_t""no" 1>&6
|
|
fi
|
|
echo $ac_n "checking for int64_t""... $ac_c" 1>&6
|
|
-echo "configure:7419: checking for int64_t" >&5
|
|
+echo "configure:7322: checking for int64_t" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_int64_t'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 7424 "configure"
|
|
+#line 7327 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
@@ -7428,7 +7331,7 @@
|
|
int64_t foo = 0;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:7432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:7335: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_int64_t=true
|
|
else
|
|
@@ -7450,12 +7353,12 @@
|
|
echo "$ac_t""no" 1>&6
|
|
fi
|
|
echo $ac_n "checking for int64""... $ac_c" 1>&6
|
|
-echo "configure:7454: checking for int64" >&5
|
|
+echo "configure:7357: checking for int64" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_int64'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 7459 "configure"
|
|
+#line 7362 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
@@ -7463,7 +7366,7 @@
|
|
int64 foo = 0;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:7467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:7370: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_int64=true
|
|
else
|
|
@@ -7485,12 +7388,12 @@
|
|
echo "$ac_t""no" 1>&6
|
|
fi
|
|
echo $ac_n "checking for uint""... $ac_c" 1>&6
|
|
-echo "configure:7489: checking for uint" >&5
|
|
+echo "configure:7392: checking for uint" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_uint'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 7494 "configure"
|
|
+#line 7397 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
@@ -7498,7 +7401,7 @@
|
|
uint foo = 0;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:7502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:7405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_uint=true
|
|
else
|
|
@@ -7520,12 +7423,12 @@
|
|
echo "$ac_t""no" 1>&6
|
|
fi
|
|
echo $ac_n "checking for uint_t""... $ac_c" 1>&6
|
|
-echo "configure:7524: checking for uint_t" >&5
|
|
+echo "configure:7427: checking for uint_t" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_uint_t'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 7529 "configure"
|
|
+#line 7432 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
@@ -7533,7 +7436,7 @@
|
|
uint_t foo = 0;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:7537: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:7440: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_uint_t=true
|
|
else
|
|
@@ -7555,12 +7458,12 @@
|
|
echo "$ac_t""no" 1>&6
|
|
fi
|
|
echo $ac_n "checking for uint16_t""... $ac_c" 1>&6
|
|
-echo "configure:7559: checking for uint16_t" >&5
|
|
+echo "configure:7462: checking for uint16_t" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_uint16_t'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 7564 "configure"
|
|
+#line 7467 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
@@ -7568,7 +7471,7 @@
|
|
uint16_t foo = 0;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:7572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:7475: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_uint16_t=true
|
|
else
|
|
@@ -7599,12 +7502,12 @@
|
|
|
|
|
|
echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6
|
|
-echo "configure:7603: checking for uname.domainname" >&5
|
|
+echo "configure:7506: checking for uname.domainname" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_have_uname_domainname_field'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 7608 "configure"
|
|
+#line 7511 "configure"
|
|
#include "confdefs.h"
|
|
#include <sys/utsname.h>
|
|
int main() {
|
|
@@ -7612,7 +7515,7 @@
|
|
(void)uname(res); if (res != 0) { domain = res->domainname; }
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:7616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:7519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_have_uname_domainname_field=true
|
|
else
|
|
@@ -7636,12 +7539,12 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6
|
|
-echo "configure:7640: checking for uname.__domainname" >&5
|
|
+echo "configure:7543: checking for uname.__domainname" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_have_uname_us_domainname_field'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 7645 "configure"
|
|
+#line 7548 "configure"
|
|
#include "confdefs.h"
|
|
#include <sys/utsname.h>
|
|
int main() {
|
|
@@ -7649,7 +7552,7 @@
|
|
(void)uname(res); if (res != 0) { domain = res->__domainname; }
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:7653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:7556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_have_uname_us_domainname_field=true
|
|
else
|
|
@@ -7682,7 +7585,7 @@
|
|
|
|
|
|
echo $ac_n "checking for usable wchar_t (2 bytes, unsigned)""... $ac_c" 1>&6
|
|
-echo "configure:7686: checking for usable wchar_t (2 bytes, unsigned)" >&5
|
|
+echo "configure:7589: checking for usable wchar_t (2 bytes, unsigned)" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_have_usable_wchar'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -7690,14 +7593,14 @@
|
|
ac_cv_have_usable_wchar="maybe"
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 7694 "configure"
|
|
+#line 7597 "configure"
|
|
#include "confdefs.h"
|
|
#include <stddef.h>
|
|
int main () {
|
|
return (sizeof(wchar_t) != 2) ||
|
|
(wchar_t)-1 < (wchar_t) 0 ; }
|
|
EOF
|
|
-if { (eval echo configure:7701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:7604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
ac_cv_have_usable_wchar="yes"
|
|
else
|
|
@@ -7732,7 +7635,7 @@
|
|
CXXFLAGS="$CXXFLAGS -fshort-wchar"
|
|
|
|
echo $ac_n "checking for compiler -fshort-wchar option""... $ac_c" 1>&6
|
|
-echo "configure:7736: checking for compiler -fshort-wchar option" >&5
|
|
+echo "configure:7639: checking for compiler -fshort-wchar option" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_option'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -7740,14 +7643,17 @@
|
|
ac_cv_have_usable_wchar_option="maybe"
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 7744 "configure"
|
|
+#line 7647 "configure"
|
|
#include "confdefs.h"
|
|
+#ifdef __cplusplus
|
|
+extern "C" void exit(int);
|
|
+#endif
|
|
#include <stddef.h>
|
|
int main () {
|
|
return (sizeof(wchar_t) != 2) ||
|
|
(wchar_t)-1 < (wchar_t) 0 ; }
|
|
EOF
|
|
-if { (eval echo configure:7751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:7657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
ac_cv_have_usable_wchar_option="yes"
|
|
else
|
|
@@ -7783,7 +7689,7 @@
|
|
|
|
if test "$GNU_CC"; then
|
|
echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6
|
|
-echo "configure:7787: checking for visibility(hidden) attribute" >&5
|
|
+echo "configure:7693: checking for visibility(hidden) attribute" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_visibility_hidden'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -7808,7 +7714,7 @@
|
|
|
|
|
|
echo $ac_n "checking for visibility(default) attribute""... $ac_c" 1>&6
|
|
-echo "configure:7812: checking for visibility(default) attribute" >&5
|
|
+echo "configure:7718: checking for visibility(default) attribute" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_visibility_default'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -7833,7 +7739,7 @@
|
|
|
|
|
|
echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6
|
|
-echo "configure:7837: checking for visibility pragma support" >&5
|
|
+echo "configure:7743: checking for visibility pragma support" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_visibility_pragma'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -7858,7 +7764,7 @@
|
|
echo "$ac_t""$ac_cv_visibility_pragma" 1>&6
|
|
if test "$ac_cv_visibility_pragma" = "yes"; then
|
|
echo $ac_n "checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)""... $ac_c" 1>&6
|
|
-echo "configure:7862: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5
|
|
+echo "configure:7768: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_have_visibility_builtin_bug'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -7901,12 +7807,12 @@
|
|
do
|
|
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
|
|
-echo "configure:7905: checking for $ac_hdr that defines DIR" >&5
|
|
+echo "configure:7811: checking for $ac_hdr that defines DIR" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 7910 "configure"
|
|
+#line 7816 "configure"
|
|
#include "confdefs.h"
|
|
#include <sys/types.h>
|
|
#include <$ac_hdr>
|
|
@@ -7914,7 +7820,7 @@
|
|
DIR *dirp = 0;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:7918: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:7824: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
eval "ac_cv_header_dirent_$ac_safe=yes"
|
|
else
|
|
@@ -7939,7 +7845,7 @@
|
|
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
|
|
if test $ac_header_dirent = dirent.h; then
|
|
echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
|
|
-echo "configure:7943: checking for opendir in -ldir" >&5
|
|
+echo "configure:7849: checking for opendir in -ldir" >&5
|
|
ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -7947,7 +7853,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-ldir $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 7951 "configure"
|
|
+#line 7857 "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
|
|
@@ -7958,7 +7864,7 @@
|
|
opendir()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:7962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:7868: \"$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
|
|
@@ -7980,7 +7886,7 @@
|
|
|
|
else
|
|
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
|
|
-echo "configure:7984: checking for opendir in -lx" >&5
|
|
+echo "configure:7890: checking for opendir in -lx" >&5
|
|
ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -7988,7 +7894,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lx $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 7992 "configure"
|
|
+#line 7898 "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
|
|
@@ -7999,7 +7905,7 @@
|
|
opendir()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:8003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:7909: \"$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
|
|
@@ -8031,17 +7937,17 @@
|
|
do
|
|
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
|
-echo "configure:8035: checking for $ac_hdr" >&5
|
|
+echo "configure:7941: checking for $ac_hdr" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 8040 "configure"
|
|
+#line 7946 "configure"
|
|
#include "confdefs.h"
|
|
#include <$ac_hdr>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:8045: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:7951: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
if test -z "$ac_err"; then
|
|
rm -rf conftest*
|
|
@@ -8071,17 +7977,17 @@
|
|
do
|
|
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
|
-echo "configure:8075: checking for $ac_hdr" >&5
|
|
+echo "configure:7981: checking for $ac_hdr" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 8080 "configure"
|
|
+#line 7986 "configure"
|
|
#include "confdefs.h"
|
|
#include <$ac_hdr>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:8085: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:7991: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
if test -z "$ac_err"; then
|
|
rm -rf conftest*
|
|
@@ -8111,17 +8017,17 @@
|
|
do
|
|
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
|
-echo "configure:8115: checking for $ac_hdr" >&5
|
|
+echo "configure:8021: checking for $ac_hdr" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 8120 "configure"
|
|
+#line 8026 "configure"
|
|
#include "confdefs.h"
|
|
#include <$ac_hdr>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:8125: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:8031: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
if test -z "$ac_err"; then
|
|
rm -rf conftest*
|
|
@@ -8151,17 +8057,17 @@
|
|
do
|
|
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
|
-echo "configure:8155: checking for $ac_hdr" >&5
|
|
+echo "configure:8061: checking for $ac_hdr" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 8160 "configure"
|
|
+#line 8066 "configure"
|
|
#include "confdefs.h"
|
|
#include <$ac_hdr>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:8165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:8071: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
if test -z "$ac_err"; then
|
|
rm -rf conftest*
|
|
@@ -8191,17 +8097,17 @@
|
|
do
|
|
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
|
-echo "configure:8195: checking for $ac_hdr" >&5
|
|
+echo "configure:8101: checking for $ac_hdr" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 8200 "configure"
|
|
+#line 8106 "configure"
|
|
#include "confdefs.h"
|
|
#include <$ac_hdr>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:8205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:8111: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
if test -z "$ac_err"; then
|
|
rm -rf conftest*
|
|
@@ -8232,17 +8138,17 @@
|
|
do
|
|
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
|
-echo "configure:8236: checking for $ac_hdr" >&5
|
|
+echo "configure:8142: checking for $ac_hdr" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 8241 "configure"
|
|
+#line 8147 "configure"
|
|
#include "confdefs.h"
|
|
#include <$ac_hdr>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:8246: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:8152: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
if test -z "$ac_err"; then
|
|
rm -rf conftest*
|
|
@@ -8273,17 +8179,17 @@
|
|
do
|
|
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
|
-echo "configure:8277: checking for $ac_hdr" >&5
|
|
+echo "configure:8183: checking for $ac_hdr" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 8282 "configure"
|
|
+#line 8188 "configure"
|
|
#include "confdefs.h"
|
|
#include <$ac_hdr>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:8287: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:8193: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
if test -z "$ac_err"; then
|
|
rm -rf conftest*
|
|
@@ -8320,17 +8226,17 @@
|
|
NEW_H=new.h
|
|
ac_safe=`echo "new" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for new""... $ac_c" 1>&6
|
|
-echo "configure:8324: checking for new" >&5
|
|
+echo "configure:8230: checking for new" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 8329 "configure"
|
|
+#line 8235 "configure"
|
|
#include "confdefs.h"
|
|
#include <new>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:8334: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:8240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
if test -z "$ac_err"; then
|
|
rm -rf conftest*
|
|
@@ -8371,17 +8277,17 @@
|
|
do
|
|
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
|
-echo "configure:8375: checking for $ac_hdr" >&5
|
|
+echo "configure:8281: checking for $ac_hdr" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 8380 "configure"
|
|
+#line 8286 "configure"
|
|
#include "confdefs.h"
|
|
#include <$ac_hdr>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:8385: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:8291: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
if test -z "$ac_err"; then
|
|
rm -rf conftest*
|
|
@@ -8415,7 +8321,7 @@
|
|
;;
|
|
*)
|
|
echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6
|
|
-echo "configure:8419: checking for gethostbyname_r in -lc_r" >&5
|
|
+echo "configure:8325: checking for gethostbyname_r in -lc_r" >&5
|
|
ac_lib_var=`echo c_r'_'gethostbyname_r | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -8423,7 +8329,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lc_r $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 8427 "configure"
|
|
+#line 8333 "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
|
|
@@ -8434,7 +8340,7 @@
|
|
gethostbyname_r()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:8438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:8344: \"$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
|
|
@@ -8464,7 +8370,7 @@
|
|
;;
|
|
esac
|
|
echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6
|
|
-echo "configure:8468: checking for atan in -lm" >&5
|
|
+echo "configure:8374: checking for atan in -lm" >&5
|
|
ac_lib_var=`echo m'_'atan | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -8472,7 +8378,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lm $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 8476 "configure"
|
|
+#line 8382 "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
|
|
@@ -8483,7 +8389,7 @@
|
|
atan()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:8487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:8393: \"$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
|
|
@@ -8517,7 +8423,7 @@
|
|
;;
|
|
*)
|
|
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
|
|
-echo "configure:8521: checking for dlopen in -ldl" >&5
|
|
+echo "configure:8427: checking for dlopen in -ldl" >&5
|
|
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -8525,7 +8431,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-ldl $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 8529 "configure"
|
|
+#line 8435 "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
|
|
@@ -8536,7 +8442,7 @@
|
|
dlopen()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:8540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:8446: \"$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
|
|
@@ -8553,17 +8459,17 @@
|
|
echo "$ac_t""yes" 1>&6
|
|
ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
|
|
-echo "configure:8557: checking for dlfcn.h" >&5
|
|
+echo "configure:8463: checking for dlfcn.h" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 8562 "configure"
|
|
+#line 8468 "configure"
|
|
#include "confdefs.h"
|
|
#include <dlfcn.h>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:8567: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:8473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
if test -z "$ac_err"; then
|
|
rm -rf conftest*
|
|
@@ -8599,7 +8505,7 @@
|
|
case $target in
|
|
*-aix*)
|
|
echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6
|
|
-echo "configure:8603: checking for demangle in -lC_r" >&5
|
|
+echo "configure:8509: checking for demangle in -lC_r" >&5
|
|
ac_lib_var=`echo C_r'_'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
|
|
@@ -8607,7 +8513,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lC_r $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 8611 "configure"
|
|
+#line 8517 "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
|
|
@@ -8618,7 +8524,7 @@
|
|
demangle()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:8622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:8528: \"$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
|
|
@@ -8648,7 +8554,7 @@
|
|
;;
|
|
*)
|
|
echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6
|
|
-echo "configure:8652: checking for demangle in -lC" >&5
|
|
+echo "configure:8558: checking for demangle in -lC" >&5
|
|
ac_lib_var=`echo C'_'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
|
|
@@ -8656,7 +8562,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lC $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 8660 "configure"
|
|
+#line 8566 "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
|
|
@@ -8667,7 +8573,7 @@
|
|
demangle()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:8671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:8577: \"$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
|
|
@@ -8698,7 +8604,7 @@
|
|
esac
|
|
fi
|
|
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
|
|
-echo "configure:8702: checking for socket in -lsocket" >&5
|
|
+echo "configure:8608: checking for socket in -lsocket" >&5
|
|
ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -8706,7 +8612,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lsocket $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 8710 "configure"
|
|
+#line 8616 "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
|
|
@@ -8717,7 +8623,7 @@
|
|
socket()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:8721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:8627: \"$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
|
|
@@ -8762,7 +8668,7 @@
|
|
_SAVE_LDFLAGS="$LDFLAGS"
|
|
LDFLAGS="$XLDFLAGS $LDFLAGS"
|
|
echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6
|
|
-echo "configure:8766: checking for XDrawLines in -lX11" >&5
|
|
+echo "configure:8672: checking for XDrawLines in -lX11" >&5
|
|
ac_lib_var=`echo X11'_'XDrawLines | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -8770,7 +8676,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lX11 $XLIBS $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 8774 "configure"
|
|
+#line 8680 "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
|
|
@@ -8781,7 +8687,7 @@
|
|
XDrawLines()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:8785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:8691: \"$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
|
|
@@ -8803,7 +8709,7 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6
|
|
-echo "configure:8807: checking for XextAddDisplay in -lXext" >&5
|
|
+echo "configure:8713: checking for XextAddDisplay in -lXext" >&5
|
|
ac_lib_var=`echo Xext'_'XextAddDisplay | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -8811,7 +8717,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lXext $XLIBS $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 8815 "configure"
|
|
+#line 8721 "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
|
|
@@ -8822,7 +8728,7 @@
|
|
XextAddDisplay()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:8826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:8732: \"$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
|
|
@@ -8846,7 +8752,7 @@
|
|
|
|
|
|
echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6
|
|
-echo "configure:8850: checking for XtFree in -lXt" >&5
|
|
+echo "configure:8756: checking for XtFree in -lXt" >&5
|
|
ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -8854,7 +8760,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lXt $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 8858 "configure"
|
|
+#line 8764 "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
|
|
@@ -8865,7 +8771,7 @@
|
|
XtFree()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:8869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:8775: \"$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
|
|
@@ -8886,7 +8792,7 @@
|
|
|
|
unset ac_cv_lib_Xt_XtFree
|
|
echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6
|
|
-echo "configure:8890: checking for IceFlush in -lICE" >&5
|
|
+echo "configure:8796: checking for IceFlush in -lICE" >&5
|
|
ac_lib_var=`echo ICE'_'IceFlush | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -8894,7 +8800,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lICE $XT_LIBS $XLIBS $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 8898 "configure"
|
|
+#line 8804 "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
|
|
@@ -8905,7 +8811,7 @@
|
|
IceFlush()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:8909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:8815: \"$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
|
|
@@ -8926,7 +8832,7 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6
|
|
-echo "configure:8930: checking for SmcCloseConnection in -lSM" >&5
|
|
+echo "configure:8836: checking for SmcCloseConnection in -lSM" >&5
|
|
ac_lib_var=`echo SM'_'SmcCloseConnection | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -8934,7 +8840,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lSM $XT_LIBS $XLIBS $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 8938 "configure"
|
|
+#line 8844 "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
|
|
@@ -8945,7 +8851,7 @@
|
|
SmcCloseConnection()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:8949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:8855: \"$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
|
|
@@ -8966,7 +8872,7 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6
|
|
-echo "configure:8970: checking for XtFree in -lXt" >&5
|
|
+echo "configure:8876: checking for XtFree in -lXt" >&5
|
|
ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -8974,7 +8880,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lXt $X_PRE_LIBS $XT_LIBS $XLIBS $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 8978 "configure"
|
|
+#line 8884 "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
|
|
@@ -8985,7 +8891,7 @@
|
|
XtFree()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:8989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:8895: \"$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
|
|
@@ -9019,7 +8925,7 @@
|
|
esac
|
|
|
|
echo $ac_n "checking for XineramaIsActive in -lXinerama""... $ac_c" 1>&6
|
|
-echo "configure:9023: checking for XineramaIsActive in -lXinerama" >&5
|
|
+echo "configure:8929: checking for XineramaIsActive in -lXinerama" >&5
|
|
ac_lib_var=`echo Xinerama'_'XineramaIsActive | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -9027,7 +8933,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lXinerama $XLIBS $XEXT_LIBS $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 9031 "configure"
|
|
+#line 8937 "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
|
|
@@ -9038,7 +8944,7 @@
|
|
XineramaIsActive()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:9042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:8948: \"$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
|
|
@@ -9060,17 +8966,17 @@
|
|
|
|
ac_safe=`echo "X11/extensions/Xinerama.h" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for X11/extensions/Xinerama.h""... $ac_c" 1>&6
|
|
-echo "configure:9064: checking for X11/extensions/Xinerama.h" >&5
|
|
+echo "configure:8970: checking for X11/extensions/Xinerama.h" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 9069 "configure"
|
|
+#line 8975 "configure"
|
|
#include "confdefs.h"
|
|
#include <X11/extensions/Xinerama.h>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:9074: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:8980: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
if test -z "$ac_err"; then
|
|
rm -rf conftest*
|
|
@@ -9093,7 +8999,7 @@
|
|
|
|
|
|
echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6
|
|
-echo "configure:9097: checking for XShmCreateImage in -lXext" >&5
|
|
+echo "configure:9003: checking for XShmCreateImage in -lXext" >&5
|
|
ac_lib_var=`echo Xext'_'XShmCreateImage | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -9101,7 +9007,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lXext $XLIBS $XEXT_LIBS $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 9105 "configure"
|
|
+#line 9011 "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
|
|
@@ -9112,7 +9018,7 @@
|
|
XShmCreateImage()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:9116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:9022: \"$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
|
|
@@ -9134,17 +9040,17 @@
|
|
|
|
ac_safe=`echo "X11/extensions/XShm.h" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for X11/extensions/XShm.h""... $ac_c" 1>&6
|
|
-echo "configure:9138: checking for X11/extensions/XShm.h" >&5
|
|
+echo "configure:9044: checking for X11/extensions/XShm.h" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 9143 "configure"
|
|
+#line 9049 "configure"
|
|
#include "confdefs.h"
|
|
#include <X11/extensions/XShm.h>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:9148: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:9054: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
if test -z "$ac_err"; then
|
|
rm -rf conftest*
|
|
@@ -9174,7 +9080,7 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for XieFloGeometry in -lXIE""... $ac_c" 1>&6
|
|
-echo "configure:9178: checking for XieFloGeometry in -lXIE" >&5
|
|
+echo "configure:9084: checking for XieFloGeometry in -lXIE" >&5
|
|
ac_lib_var=`echo XIE'_'XieFloGeometry | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -9182,7 +9088,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lXIE $XLIBS $XEXT_LIBS $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 9186 "configure"
|
|
+#line 9092 "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
|
|
@@ -9193,7 +9099,7 @@
|
|
XieFloGeometry()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:9197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:9103: \"$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
|
|
@@ -9215,17 +9121,17 @@
|
|
|
|
ac_safe=`echo "X11/extensions/XIElib.h" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for X11/extensions/XIElib.h""... $ac_c" 1>&6
|
|
-echo "configure:9219: checking for X11/extensions/XIElib.h" >&5
|
|
+echo "configure:9125: checking for X11/extensions/XIElib.h" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 9224 "configure"
|
|
+#line 9130 "configure"
|
|
#include "confdefs.h"
|
|
#include <X11/extensions/XIElib.h>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:9229: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:9135: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
if test -z "$ac_err"; then
|
|
rm -rf conftest*
|
|
@@ -9299,7 +9205,7 @@
|
|
# 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:9303: checking for $ac_word" >&5
|
|
+echo "configure:9209: 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
|
|
@@ -9335,7 +9241,7 @@
|
|
|
|
min_ft_version=6.1.0
|
|
echo $ac_n "checking for FreeType - version >= $min_ft_version""... $ac_c" 1>&6
|
|
-echo "configure:9339: checking for FreeType - version >= $min_ft_version" >&5
|
|
+echo "configure:9245: checking for FreeType - version >= $min_ft_version" >&5
|
|
no_ft=""
|
|
if test "$FT2_CONFIG" = "no" ; then
|
|
no_ft=yes
|
|
@@ -9383,7 +9289,7 @@
|
|
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 9387 "configure"
|
|
+#line 9293 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <ft2build.h>
|
|
@@ -9409,7 +9315,7 @@
|
|
}
|
|
|
|
EOF
|
|
-if { (eval echo configure:9413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:9319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
:
|
|
else
|
|
@@ -9461,7 +9367,7 @@
|
|
|
|
|
|
echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
|
|
-echo "configure:9465: checking for pthread_create in -lpthreads" >&5
|
|
+echo "configure:9371: checking for pthread_create in -lpthreads" >&5
|
|
echo "
|
|
#include <pthread.h>
|
|
void *foo(void *v) { int a = 1; }
|
|
@@ -9483,7 +9389,7 @@
|
|
echo "$ac_t""no" 1>&6
|
|
|
|
echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
|
|
-echo "configure:9487: checking for pthread_create in -lpthread" >&5
|
|
+echo "configure:9393: checking for pthread_create in -lpthread" >&5
|
|
echo "
|
|
#include <pthread.h>
|
|
void *foo(void *v) { int a = 1; }
|
|
@@ -9505,7 +9411,7 @@
|
|
echo "$ac_t""no" 1>&6
|
|
|
|
echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
|
|
-echo "configure:9509: checking for pthread_create in -lc_r" >&5
|
|
+echo "configure:9415: checking for pthread_create in -lc_r" >&5
|
|
echo "
|
|
#include <pthread.h>
|
|
void *foo(void *v) { int a = 1; }
|
|
@@ -9527,7 +9433,7 @@
|
|
echo "$ac_t""no" 1>&6
|
|
|
|
echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6
|
|
-echo "configure:9531: checking for pthread_create in -lc" >&5
|
|
+echo "configure:9437: checking for pthread_create in -lc" >&5
|
|
echo "
|
|
#include <pthread.h>
|
|
void *foo(void *v) { int a = 1; }
|
|
@@ -9583,7 +9489,7 @@
|
|
rm -f conftest*
|
|
ac_cv_have_dash_pthread=no
|
|
echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6
|
|
-echo "configure:9587: checking whether ${CC-cc} accepts -pthread" >&5
|
|
+echo "configure:9493: checking whether ${CC-cc} accepts -pthread" >&5
|
|
echo 'int main() { return 0; }' | cat > conftest.c
|
|
${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1
|
|
if test $? -eq 0; then
|
|
@@ -9606,7 +9512,7 @@
|
|
ac_cv_have_dash_pthreads=no
|
|
if test "$ac_cv_have_dash_pthread" = "no"; then
|
|
echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6
|
|
-echo "configure:9610: checking whether ${CC-cc} accepts -pthreads" >&5
|
|
+echo "configure:9516: checking whether ${CC-cc} accepts -pthreads" >&5
|
|
echo 'int main() { return 0; }' | cat > conftest.c
|
|
${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1
|
|
if test $? -eq 0; then
|
|
@@ -9728,7 +9634,7 @@
|
|
|
|
|
|
echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6
|
|
-echo "configure:9732: checking whether mmap() sees write()s" >&5
|
|
+echo "configure:9638: checking whether mmap() sees write()s" >&5
|
|
|
|
|
|
mmap_test_prog='
|
|
@@ -9767,11 +9673,11 @@
|
|
result="yes"
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 9771 "configure"
|
|
+#line 9677 "configure"
|
|
#include "confdefs.h"
|
|
$mmap_test_prog
|
|
EOF
|
|
-if { (eval echo configure:9775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:9681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
result="yes"
|
|
else
|
|
@@ -9796,13 +9702,13 @@
|
|
|
|
if test $ac_cv_prog_gcc = yes; then
|
|
echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
|
|
-echo "configure:9800: checking whether ${CC-cc} needs -traditional" >&5
|
|
+echo "configure:9706: checking whether ${CC-cc} needs -traditional" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
ac_pattern="Autoconf.*'x'"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 9806 "configure"
|
|
+#line 9712 "configure"
|
|
#include "confdefs.h"
|
|
#include <sgtty.h>
|
|
Autoconf TIOCGETP
|
|
@@ -9820,7 +9726,7 @@
|
|
|
|
if test $ac_cv_prog_gcc_traditional = no; then
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 9824 "configure"
|
|
+#line 9730 "configure"
|
|
#include "confdefs.h"
|
|
#include <termio.h>
|
|
Autoconf TCGETA
|
|
@@ -9842,7 +9748,7 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
|
|
-echo "configure:9846: checking for 8-bit clean memcmp" >&5
|
|
+echo "configure:9752: checking for 8-bit clean memcmp" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -9850,7 +9756,7 @@
|
|
ac_cv_func_memcmp_clean=no
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 9854 "configure"
|
|
+#line 9760 "configure"
|
|
#include "confdefs.h"
|
|
|
|
main()
|
|
@@ -9860,7 +9766,7 @@
|
|
}
|
|
|
|
EOF
|
|
-if { (eval echo configure:9864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:9770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
ac_cv_func_memcmp_clean=yes
|
|
else
|
|
@@ -9880,12 +9786,12 @@
|
|
for ac_func in random strerror lchown fchmod snprintf statvfs memmove rint stat64 lstat64
|
|
do
|
|
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
|
-echo "configure:9884: checking for $ac_func" >&5
|
|
+echo "configure:9790: 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 9889 "configure"
|
|
+#line 9795 "configure"
|
|
#include "confdefs.h"
|
|
/* System header to define __stub macros and hopefully few prototypes,
|
|
which can conflict with char $ac_func(); below. */
|
|
@@ -9908,7 +9814,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:9912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:9818: \"$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
|
|
@@ -9935,12 +9841,12 @@
|
|
for ac_func in flockfile getpagesize
|
|
do
|
|
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
|
-echo "configure:9939: checking for $ac_func" >&5
|
|
+echo "configure:9845: 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 9944 "configure"
|
|
+#line 9850 "configure"
|
|
#include "confdefs.h"
|
|
/* System header to define __stub macros and hopefully few prototypes,
|
|
which can conflict with char $ac_func(); below. */
|
|
@@ -9963,7 +9869,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:9967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:9873: \"$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
|
|
@@ -9992,12 +9898,12 @@
|
|
for ac_func in localtime_r strtok_r
|
|
do
|
|
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
|
-echo "configure:9996: checking for $ac_func" >&5
|
|
+echo "configure:9902: 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 10001 "configure"
|
|
+#line 9907 "configure"
|
|
#include "confdefs.h"
|
|
/* System header to define __stub macros and hopefully few prototypes,
|
|
which can conflict with char $ac_func(); below. */
|
|
@@ -10020,7 +9926,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:9930: \"$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
|
|
@@ -10056,19 +9962,19 @@
|
|
cross_compiling=$ac_cv_prog_cxx_cross
|
|
|
|
echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6
|
|
-echo "configure:10060: checking for wcrtomb" >&5
|
|
+echo "configure:9966: checking for wcrtomb" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_have_wcrtomb'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 10065 "configure"
|
|
+#line 9971 "configure"
|
|
#include "confdefs.h"
|
|
#include <wchar.h>
|
|
int main() {
|
|
mbstate_t ps={0};wcrtomb(0,'f',&ps);
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:9978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
rm -rf conftest*
|
|
ac_cv_have_wcrtomb="yes"
|
|
else
|
|
@@ -10088,19 +9994,19 @@
|
|
|
|
fi
|
|
echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6
|
|
-echo "configure:10092: checking for mbrtowc" >&5
|
|
+echo "configure:9998: checking for mbrtowc" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_have_mbrtowc'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 10097 "configure"
|
|
+#line 10003 "configure"
|
|
#include "confdefs.h"
|
|
#include <wchar.h>
|
|
int main() {
|
|
mbstate_t ps={0};mbrtowc(0,0,0,&ps);
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:10010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
rm -rf conftest*
|
|
ac_cv_have_mbrtowc="yes"
|
|
else
|
|
@@ -10129,12 +10035,12 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6
|
|
-echo "configure:10133: checking for res_ninit()" >&5
|
|
+echo "configure:10039: checking for res_ninit()" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_func_res_ninit'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 10138 "configure"
|
|
+#line 10044 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#ifdef linux
|
|
@@ -10146,7 +10052,7 @@
|
|
int foo = res_ninit(&_res);
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:10056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
rm -rf conftest*
|
|
ac_cv_func_res_ninit=yes
|
|
else
|
|
@@ -10176,12 +10082,12 @@
|
|
cross_compiling=$ac_cv_prog_cxx_cross
|
|
|
|
echo $ac_n "checking for gnu_get_libc_version()""... $ac_c" 1>&6
|
|
-echo "configure:10180: checking for gnu_get_libc_version()" >&5
|
|
+echo "configure:10086: checking for gnu_get_libc_version()" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_func_gnu_get_libc_version'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 10185 "configure"
|
|
+#line 10091 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#ifdef HAVE_GNU_LIBC_VERSION_H
|
|
@@ -10192,7 +10098,7 @@
|
|
const char *glibc_version = gnu_get_libc_version();
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:10102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
rm -rf conftest*
|
|
ac_cv_func_gnu_get_libc_version=yes
|
|
else
|
|
@@ -10221,7 +10127,7 @@
|
|
*)
|
|
|
|
echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6
|
|
-echo "configure:10225: checking for iconv in -lc" >&5
|
|
+echo "configure:10131: checking for iconv in -lc" >&5
|
|
ac_lib_var=`echo c'_'iconv | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -10229,7 +10135,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lc $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 10233 "configure"
|
|
+#line 10139 "configure"
|
|
#include "confdefs.h"
|
|
/* Override any gcc2 internal prototype to avoid an error. */
|
|
#ifdef __cplusplus
|
|
@@ -10243,7 +10149,7 @@
|
|
iconv()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:10153: \"$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
|
|
@@ -10262,7 +10168,7 @@
|
|
else
|
|
echo "$ac_t""no" 1>&6
|
|
echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
|
|
-echo "configure:10266: checking for iconv in -liconv" >&5
|
|
+echo "configure:10172: checking for iconv in -liconv" >&5
|
|
ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -10270,7 +10176,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-liconv $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 10274 "configure"
|
|
+#line 10180 "configure"
|
|
#include "confdefs.h"
|
|
/* Override any gcc2 internal prototype to avoid an error. */
|
|
#ifdef __cplusplus
|
|
@@ -10284,7 +10190,7 @@
|
|
iconv()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:10194: \"$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
|
|
@@ -10303,7 +10209,7 @@
|
|
else
|
|
echo "$ac_t""no" 1>&6
|
|
echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
|
|
-echo "configure:10307: checking for libiconv in -liconv" >&5
|
|
+echo "configure:10213: checking for libiconv in -liconv" >&5
|
|
ac_lib_var=`echo iconv'_'libiconv | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -10311,7 +10217,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-liconv $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 10315 "configure"
|
|
+#line 10221 "configure"
|
|
#include "confdefs.h"
|
|
/* Override any gcc2 internal prototype to avoid an error. */
|
|
#ifdef __cplusplus
|
|
@@ -10325,7 +10231,7 @@
|
|
libiconv()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:10235: \"$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
|
|
@@ -10352,12 +10258,12 @@
|
|
_SAVE_LIBS=$LIBS
|
|
LIBS="$LIBS $_ICONV_LIBS"
|
|
echo $ac_n "checking for iconv()""... $ac_c" 1>&6
|
|
-echo "configure:10356: checking for iconv()" >&5
|
|
+echo "configure:10262: checking for iconv()" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 10361 "configure"
|
|
+#line 10267 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <stdlib.h>
|
|
@@ -10371,7 +10277,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:10281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
rm -rf conftest*
|
|
ac_cv_func_iconv=yes
|
|
else
|
|
@@ -10395,12 +10301,12 @@
|
|
LIBXUL_LIBS="$LIBXUL_LIBS $_ICONV_LIBS"
|
|
LIBICONV="$_ICONV_LIBS"
|
|
echo $ac_n "checking for iconv() with const input""... $ac_c" 1>&6
|
|
-echo "configure:10399: checking for iconv() with const input" >&5
|
|
+echo "configure:10305: checking for iconv() with const input" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_func_const_iconv'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 10404 "configure"
|
|
+#line 10310 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <stdlib.h>
|
|
@@ -10415,7 +10321,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:10325: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_func_const_iconv=yes
|
|
else
|
|
@@ -10444,19 +10350,19 @@
|
|
|
|
|
|
echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6
|
|
-echo "configure:10448: checking for nl_langinfo and CODESET" >&5
|
|
+echo "configure:10354: checking for nl_langinfo and CODESET" >&5
|
|
if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 10453 "configure"
|
|
+#line 10359 "configure"
|
|
#include "confdefs.h"
|
|
#include <langinfo.h>
|
|
int main() {
|
|
char* cs = nl_langinfo(CODESET);
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:10366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
rm -rf conftest*
|
|
am_cv_langinfo_codeset=yes
|
|
else
|
|
@@ -10488,7 +10394,7 @@
|
|
|
|
|
|
echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6
|
|
-echo "configure:10492: checking for an implementation of va_copy()" >&5
|
|
+echo "configure:10398: checking for an implementation of va_copy()" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_va_copy'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -10498,7 +10404,7 @@
|
|
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 10502 "configure"
|
|
+#line 10408 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <stdarg.h>
|
|
@@ -10512,7 +10418,7 @@
|
|
}
|
|
int main() { f (0, 42); return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:10422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
ac_cv_va_copy=yes
|
|
else
|
|
@@ -10529,7 +10435,7 @@
|
|
|
|
echo "$ac_t""$ac_cv_va_copy" 1>&6
|
|
echo $ac_n "checking for an implementation of __va_copy()""... $ac_c" 1>&6
|
|
-echo "configure:10533: checking for an implementation of __va_copy()" >&5
|
|
+echo "configure:10439: checking for an implementation of __va_copy()" >&5
|
|
if eval "test \"`echo '$''{'ac_cv___va_copy'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -10539,7 +10445,7 @@
|
|
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 10543 "configure"
|
|
+#line 10449 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <stdarg.h>
|
|
@@ -10553,7 +10459,7 @@
|
|
}
|
|
int main() { f (0, 42); return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:10463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
ac_cv___va_copy=yes
|
|
else
|
|
@@ -10570,7 +10476,7 @@
|
|
|
|
echo "$ac_t""$ac_cv___va_copy" 1>&6
|
|
echo $ac_n "checking whether va_lists can be copied by value""... $ac_c" 1>&6
|
|
-echo "configure:10574: checking whether va_lists can be copied by value" >&5
|
|
+echo "configure:10480: checking whether va_lists can be copied by value" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_va_val_copy'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -10580,7 +10486,7 @@
|
|
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 10584 "configure"
|
|
+#line 10490 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <stdarg.h>
|
|
@@ -10594,7 +10500,7 @@
|
|
}
|
|
int main() { f (0, 42); return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:10504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
ac_cv_va_val_copy=yes
|
|
else
|
|
@@ -10693,7 +10599,7 @@
|
|
if test "$GNU_CXX"; then
|
|
|
|
echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6
|
|
-echo "configure:10697: checking for C++ exceptions flag" >&5
|
|
+echo "configure:10603: checking for C++ exceptions flag" >&5
|
|
|
|
if eval "test \"`echo '$''{'ac_cv_cxx_exceptions_flags'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -10728,12 +10634,12 @@
|
|
HAVE_GCC3_ABI=
|
|
if test "$GNU_CC"; then
|
|
echo $ac_n "checking for gcc 3.0 ABI""... $ac_c" 1>&6
|
|
-echo "configure:10732: checking for gcc 3.0 ABI" >&5
|
|
+echo "configure:10638: checking for gcc 3.0 ABI" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_gcc_three_abi'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 10737 "configure"
|
|
+#line 10643 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
@@ -10746,7 +10652,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10750: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:10656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_gcc_three_abi="yes"
|
|
else
|
|
@@ -10770,12 +10676,12 @@
|
|
|
|
|
|
echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6
|
|
-echo "configure:10774: checking for C++ \"explicit\" keyword" >&5
|
|
+echo "configure:10680: checking for C++ \"explicit\" keyword" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_cpp_explicit'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 10779 "configure"
|
|
+#line 10685 "configure"
|
|
#include "confdefs.h"
|
|
class X {
|
|
public: explicit X(int i) : i_(i) {}
|
|
@@ -10785,7 +10691,7 @@
|
|
X x(3);
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10789: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:10695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_cpp_explicit=yes
|
|
else
|
|
@@ -10806,12 +10712,12 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for C++ \"typename\" keyword""... $ac_c" 1>&6
|
|
-echo "configure:10810: checking for C++ \"typename\" keyword" >&5
|
|
+echo "configure:10716: checking for C++ \"typename\" keyword" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_cpp_typename'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 10815 "configure"
|
|
+#line 10721 "configure"
|
|
#include "confdefs.h"
|
|
class param {
|
|
public:
|
|
@@ -10830,7 +10736,7 @@
|
|
A.foo(0);
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10834: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:10740: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_cpp_typename=yes
|
|
else
|
|
@@ -10851,12 +10757,12 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6
|
|
-echo "configure:10855: checking for modern C++ template specialization syntax support" >&5
|
|
+echo "configure:10761: checking for modern C++ template specialization syntax support" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_cpp_modern_specialize_template_syntax'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 10860 "configure"
|
|
+#line 10766 "configure"
|
|
#include "confdefs.h"
|
|
template <class T> struct X { int a; };
|
|
class Y {};
|
|
@@ -10866,7 +10772,7 @@
|
|
X<Y> y_x;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10870: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:10776: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_cpp_modern_specialize_template_syntax=yes
|
|
else
|
|
@@ -10888,12 +10794,12 @@
|
|
|
|
|
|
echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6
|
|
-echo "configure:10892: checking whether partial template specialization works" >&5
|
|
+echo "configure:10798: checking whether partial template specialization works" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_cpp_partial_specialization'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 10897 "configure"
|
|
+#line 10803 "configure"
|
|
#include "confdefs.h"
|
|
template <class T> class Foo {};
|
|
template <class T> class Foo<T*> {};
|
|
@@ -10901,7 +10807,7 @@
|
|
return 0;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:10811: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_cpp_partial_specialization=yes
|
|
else
|
|
@@ -10922,12 +10828,12 @@
|
|
fi
|
|
|
|
echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6
|
|
-echo "configure:10926: checking whether operators must be re-defined for templates derived from templates" >&5
|
|
+echo "configure:10832: checking whether operators must be re-defined for templates derived from templates" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_need_derived_template_operators'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 10931 "configure"
|
|
+#line 10837 "configure"
|
|
#include "confdefs.h"
|
|
template <class T> class Base { };
|
|
template <class T>
|
|
@@ -10939,7 +10845,7 @@
|
|
return 0;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10943: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:10849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_need_derived_template_operators=no
|
|
else
|
|
@@ -10961,12 +10867,12 @@
|
|
|
|
|
|
echo $ac_n "checking whether we need to cast a derived template to pass as its base class""... $ac_c" 1>&6
|
|
-echo "configure:10965: checking whether we need to cast a derived template to pass as its base class" >&5
|
|
+echo "configure:10871: checking whether we need to cast a derived template to pass as its base class" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_need_cpp_template_cast_to_base'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 10970 "configure"
|
|
+#line 10876 "configure"
|
|
#include "confdefs.h"
|
|
template <class T> class Base { };
|
|
template <class T> class Derived : public Base<T> { };
|
|
@@ -10975,7 +10881,7 @@
|
|
Derived<char> bar; return foo(bar);
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10979: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:10885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_need_cpp_template_cast_to_base=no
|
|
else
|
|
@@ -10996,12 +10902,12 @@
|
|
fi
|
|
|
|
echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6
|
|
-echo "configure:11000: checking whether the compiler can resolve const ambiguities for templates" >&5
|
|
+echo "configure:10906: checking whether the compiler can resolve const ambiguities for templates" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_can_resolve_const_ambiguity'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 11005 "configure"
|
|
+#line 10911 "configure"
|
|
#include "confdefs.h"
|
|
|
|
template <class T> class ptrClass {
|
|
@@ -11022,7 +10928,7 @@
|
|
a(&i);
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:11026: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:10932: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_can_resolve_const_ambiguity=yes
|
|
else
|
|
@@ -11044,12 +10950,12 @@
|
|
|
|
|
|
echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6
|
|
-echo "configure:11048: checking whether the C++ \"using\" keyword can change access" >&5
|
|
+echo "configure:10954: checking whether the C++ \"using\" keyword can change access" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_cpp_access_changing_using2'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 11053 "configure"
|
|
+#line 10959 "configure"
|
|
#include "confdefs.h"
|
|
class A { protected: int foo() { return 0; } };
|
|
class B : public A { public: using A::foo; };
|
|
@@ -11057,10 +10963,10 @@
|
|
B b; return b.foo();
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:11061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:10967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 11064 "configure"
|
|
+#line 10970 "configure"
|
|
#include "confdefs.h"
|
|
class A { public: int foo() { return 1; } };
|
|
class B : public A { private: using A::foo; };
|
|
@@ -11068,7 +10974,7 @@
|
|
B b; return b.foo();
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:11072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:10978: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_cpp_access_changing_using2=no
|
|
else
|
|
@@ -11096,12 +11002,12 @@
|
|
fi
|
|
|
|
echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6
|
|
-echo "configure:11100: checking whether the C++ \"using\" keyword resolves ambiguity" >&5
|
|
+echo "configure:11006: checking whether the C++ \"using\" keyword resolves ambiguity" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_cpp_ambiguity_resolving_using'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 11105 "configure"
|
|
+#line 11011 "configure"
|
|
#include "confdefs.h"
|
|
class X {
|
|
public: int go(const X&) {return 3;}
|
|
@@ -11117,7 +11023,7 @@
|
|
X x; Y y; y.jo(x);
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:11121: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:11027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_cpp_ambiguity_resolving_using=yes
|
|
else
|
|
@@ -11138,19 +11044,19 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6
|
|
-echo "configure:11142: checking for \"std::\" namespace" >&5
|
|
+echo "configure:11048: checking for \"std::\" namespace" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_cpp_namespace_std'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 11147 "configure"
|
|
+#line 11053 "configure"
|
|
#include "confdefs.h"
|
|
#include <algorithm>
|
|
int main() {
|
|
return std::min(0, 1);
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:11154: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:11060: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_cpp_namespace_std=yes
|
|
else
|
|
@@ -11171,12 +11077,12 @@
|
|
fi
|
|
|
|
echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6
|
|
-echo "configure:11175: checking whether standard template operator!=() is ambiguous" >&5
|
|
+echo "configure:11081: checking whether standard template operator!=() is ambiguous" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_cpp_unambiguous_std_notequal'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 11180 "configure"
|
|
+#line 11086 "configure"
|
|
#include "confdefs.h"
|
|
#include <algorithm>
|
|
struct T1 {};
|
|
@@ -11186,7 +11092,7 @@
|
|
T1 a,b; return a != b;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:11190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:11096: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_cpp_unambiguous_std_notequal=unambiguous
|
|
else
|
|
@@ -11208,12 +11114,12 @@
|
|
|
|
|
|
echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6
|
|
-echo "configure:11212: checking for C++ reinterpret_cast" >&5
|
|
+echo "configure:11118: checking for C++ reinterpret_cast" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_cpp_reinterpret_cast'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 11217 "configure"
|
|
+#line 11123 "configure"
|
|
#include "confdefs.h"
|
|
struct X { int i; };
|
|
struct Y { int i; };
|
|
@@ -11221,7 +11127,7 @@
|
|
X x; X*const z = &x;Y*y = reinterpret_cast<Y*>(z);
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:11225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:11131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_cpp_reinterpret_cast=yes
|
|
else
|
|
@@ -11242,7 +11148,7 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6
|
|
-echo "configure:11246: checking for C++ dynamic_cast to void*" >&5
|
|
+echo "configure:11152: checking for C++ dynamic_cast to void*" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_cpp_dynamic_cast_void_ptr'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -11250,8 +11156,11 @@
|
|
ac_cv_cpp_dynamic_cast_void_ptr=no
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 11254 "configure"
|
|
+#line 11160 "configure"
|
|
#include "confdefs.h"
|
|
+#ifdef __cplusplus
|
|
+extern "C" void exit(int);
|
|
+#endif
|
|
class X { int i; public: virtual ~X() { } };
|
|
class Y { int j; public: virtual ~Y() { } };
|
|
class Z : public X, public Y { int k; };
|
|
@@ -11266,7 +11175,7 @@
|
|
((void*)&mdo == dynamic_cast<void*>(suby))));
|
|
}
|
|
EOF
|
|
-if { (eval echo configure:11270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:11179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
ac_cv_cpp_dynamic_cast_void_ptr=yes
|
|
else
|
|
@@ -11290,19 +11199,19 @@
|
|
|
|
|
|
echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6
|
|
-echo "configure:11294: checking whether C++ requires implementation of unused virtual methods" >&5
|
|
+echo "configure:11203: checking whether C++ requires implementation of unused virtual methods" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_cpp_unused_required'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 11299 "configure"
|
|
+#line 11208 "configure"
|
|
#include "confdefs.h"
|
|
class X {private: virtual void never_called();};
|
|
int main() {
|
|
X x;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:11306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:11215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
rm -rf conftest*
|
|
ac_cv_cpp_unused_required=no
|
|
else
|
|
@@ -11325,12 +11234,12 @@
|
|
|
|
|
|
echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6
|
|
-echo "configure:11329: checking for trouble comparing to zero near std::operator!=()" >&5
|
|
+echo "configure:11238: checking for trouble comparing to zero near std::operator!=()" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_trouble_comparing_to_zero'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 11334 "configure"
|
|
+#line 11243 "configure"
|
|
#include "confdefs.h"
|
|
#include <algorithm>
|
|
template <class T> class Foo {};
|
|
@@ -11341,7 +11250,7 @@
|
|
Foo<int> f; return (0 != f);
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:11345: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:11254: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_trouble_comparing_to_zero=no
|
|
else
|
|
@@ -11373,19 +11282,19 @@
|
|
|
|
|
|
echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
|
|
-echo "configure:11377: checking for LC_MESSAGES" >&5
|
|
+echo "configure:11286: checking for LC_MESSAGES" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_i18n_lc_messages'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 11382 "configure"
|
|
+#line 11291 "configure"
|
|
#include "confdefs.h"
|
|
#include <locale.h>
|
|
int main() {
|
|
int category = LC_MESSAGES;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:11389: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:11298: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_i18n_lc_messages=yes
|
|
else
|
|
@@ -11466,7 +11375,7 @@
|
|
# Extract the first word of "nspr-config", so it can be a program name with args.
|
|
set dummy nspr-config; ac_word=$2
|
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
|
-echo "configure:11470: checking for $ac_word" >&5
|
|
+echo "configure:11379: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_path_NSPR_CONFIG'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -11501,7 +11410,7 @@
|
|
|
|
min_nspr_version=4.0.0
|
|
echo $ac_n "checking for NSPR - version >= $min_nspr_version (skipping)""... $ac_c" 1>&6
|
|
-echo "configure:11505: checking for NSPR - version >= $min_nspr_version (skipping)" >&5
|
|
+echo "configure:11414: checking for NSPR - version >= $min_nspr_version (skipping)" >&5
|
|
|
|
no_nspr=""
|
|
if test "$NSPR_CONFIG" = "no"; then
|
|
@@ -11603,7 +11512,7 @@
|
|
# Extract the first word of "nss-config", so it can be a program name with args.
|
|
set dummy nss-config; ac_word=$2
|
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
|
-echo "configure:11607: checking for $ac_word" >&5
|
|
+echo "configure:11516: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_path_NSS_CONFIG'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -11638,7 +11547,7 @@
|
|
|
|
min_nss_version=3.0.0
|
|
echo $ac_n "checking for NSS - version >= $min_nss_version (skipping)""... $ac_c" 1>&6
|
|
-echo "configure:11642: checking for NSS - version >= $min_nss_version (skipping)" >&5
|
|
+echo "configure:11551: checking for NSS - version >= $min_nss_version (skipping)" >&5
|
|
|
|
no_nss=""
|
|
if test "$NSS_CONFIG" = "no"; then
|
|
@@ -11711,7 +11620,7 @@
|
|
SYSTEM_JPEG=
|
|
else
|
|
echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6
|
|
-echo "configure:11715: checking for jpeg_destroy_compress in -ljpeg" >&5
|
|
+echo "configure:11624: checking for jpeg_destroy_compress in -ljpeg" >&5
|
|
ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -11719,7 +11628,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-ljpeg $JPEG_LIBS $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 11723 "configure"
|
|
+#line 11632 "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
|
|
@@ -11730,7 +11639,7 @@
|
|
jpeg_destroy_compress()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:11734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:11643: \"$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
|
|
@@ -11759,7 +11668,7 @@
|
|
SYSTEM_JPEG=
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 11763 "configure"
|
|
+#line 11672 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
@@ -11773,7 +11682,7 @@
|
|
}
|
|
|
|
EOF
|
|
-if { (eval echo configure:11777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:11686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
SYSTEM_JPEG=1
|
|
else
|
|
@@ -11814,7 +11723,7 @@
|
|
SYSTEM_ZLIB=
|
|
else
|
|
echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6
|
|
-echo "configure:11818: checking for gzread in -lz" >&5
|
|
+echo "configure:11727: checking for gzread in -lz" >&5
|
|
ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -11822,7 +11731,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lz $ZLIB_LIBS $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 11826 "configure"
|
|
+#line 11735 "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
|
|
@@ -11833,7 +11742,7 @@
|
|
gzread()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:11837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:11746: \"$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
|
|
@@ -11861,7 +11770,7 @@
|
|
SYSTEM_ZLIB=
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 11865 "configure"
|
|
+#line 11774 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <stdio.h>
|
|
@@ -11882,7 +11791,7 @@
|
|
}
|
|
|
|
EOF
|
|
-if { (eval echo configure:11886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:11795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
SYSTEM_ZLIB=1
|
|
else
|
|
@@ -11925,7 +11834,7 @@
|
|
SYSTEM_PNG=
|
|
else
|
|
echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6
|
|
-echo "configure:11929: checking for png_get_valid in -lpng" >&5
|
|
+echo "configure:11838: checking for png_get_valid in -lpng" >&5
|
|
ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -11933,7 +11842,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lpng $PNG_LIBS $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 11937 "configure"
|
|
+#line 11846 "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
|
|
@@ -11944,7 +11853,7 @@
|
|
png_get_valid()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:11948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:11857: \"$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
|
|
@@ -11972,7 +11881,7 @@
|
|
SYSTEM_PNG=
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 11976 "configure"
|
|
+#line 11885 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
@@ -11986,7 +11895,7 @@
|
|
}
|
|
|
|
EOF
|
|
-if { (eval echo configure:11990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:11899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
SYSTEM_PNG=1
|
|
else
|
|
@@ -12086,8 +11995,8 @@
|
|
MOZ_ENABLE_GTK2=1
|
|
MOZ_ENABLE_XREMOTE=1
|
|
MOZ_ENABLE_COREXFONTS=${MOZ_ENABLE_COREXFONTS-}
|
|
- TK_CFLAGS='$(MOZ_GTK2_CFLAGS)'
|
|
- TK_LIBS='$(MOZ_GTK2_LIBS)'
|
|
+ TK_CFLAGS='$(MOZ_GTK2_CFLAGS) $(MOZ_PANGO_CFLAGS)'
|
|
+ TK_LIBS='$(MOZ_GTK2_LIBS) $(MOZ_PANGO_LIBS)'
|
|
cat >> confdefs.h <<\EOF
|
|
#define MOZ_WIDGET_GTK2 1
|
|
EOF
|
|
@@ -12236,7 +12145,7 @@
|
|
# 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:12240: checking for $ac_word" >&5
|
|
+echo "configure:12149: 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
|
|
@@ -12271,7 +12180,7 @@
|
|
|
|
min_gtk_version=$GTK_VERSION
|
|
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
|
|
-echo "configure:12275: checking for GTK - version >= $min_gtk_version" >&5
|
|
+echo "configure:12184: checking for GTK - version >= $min_gtk_version" >&5
|
|
no_gtk=""
|
|
if test "$GTK_CONFIG" = "no" ; then
|
|
no_gtk=yes
|
|
@@ -12294,7 +12203,7 @@
|
|
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 12298 "configure"
|
|
+#line 12207 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <gtk/gtk.h>
|
|
@@ -12372,7 +12281,7 @@
|
|
}
|
|
|
|
EOF
|
|
-if { (eval echo configure:12376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:12285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
:
|
|
else
|
|
@@ -12407,7 +12316,7 @@
|
|
CFLAGS="$CFLAGS $GTK_CFLAGS"
|
|
LIBS="$LIBS $GTK_LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 12411 "configure"
|
|
+#line 12320 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <gtk/gtk.h>
|
|
@@ -12417,7 +12326,7 @@
|
|
return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:12421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:12330: \"$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"
|
|
@@ -12469,7 +12378,7 @@
|
|
# 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:12473: checking for $ac_word" >&5
|
|
+echo "configure:12382: 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
|
|
@@ -12513,19 +12422,19 @@
|
|
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""... $ac_c" 1>&6
|
|
-echo "configure:12517: checking for gtk+-2.0 >= 1.3.7" >&5
|
|
+echo "configure:12426: checking for gtk+-2.0 >= 1.3.7" >&5
|
|
|
|
if $PKG_CONFIG --exists "gtk+-2.0 >= 1.3.7" ; then
|
|
echo "$ac_t""yes" 1>&6
|
|
succeeded=yes
|
|
|
|
echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6
|
|
-echo "configure:12524: checking MOZ_GTK2_CFLAGS" >&5
|
|
+echo "configure:12433: checking MOZ_GTK2_CFLAGS" >&5
|
|
MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7"`
|
|
echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6
|
|
|
|
echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6
|
|
-echo "configure:12529: checking MOZ_GTK2_LIBS" >&5
|
|
+echo "configure:12438: checking MOZ_GTK2_LIBS" >&5
|
|
## don't use --libs since that can do evil things like add
|
|
## -Wl,--export-dynamic
|
|
MOZ_GTK2_LIBS="`$PKG_CONFIG --libs-only-L \"gtk+-2.0 >= 1.3.7\"` `$PKG_CONFIG --libs-only-l \"gtk+-2.0 >= 1.3.7\"`"
|
|
@@ -12590,7 +12499,7 @@
|
|
# 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:12594: checking for $ac_word" >&5
|
|
+echo "configure:12503: 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
|
|
@@ -12642,7 +12551,7 @@
|
|
cross_compiling=$ac_cv_prog_cxx_cross
|
|
|
|
echo $ac_n "checking for main in -lqt""... $ac_c" 1>&6
|
|
-echo "configure:12646: checking for main in -lqt" >&5
|
|
+echo "configure:12555: 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
|
|
@@ -12650,14 +12559,14 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lqt $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 12654 "configure"
|
|
+#line 12563 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
main()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:12661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:12570: \"$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
|
|
@@ -12676,7 +12585,7 @@
|
|
else
|
|
echo "$ac_t""no" 1>&6
|
|
echo $ac_n "checking for main in -lqt-mt""... $ac_c" 1>&6
|
|
-echo "configure:12680: checking for main in -lqt-mt" >&5
|
|
+echo "configure:12589: 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
|
|
@@ -12684,14 +12593,14 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lqt-mt $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 12688 "configure"
|
|
+#line 12597 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
main()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:12695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:12604: \"$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
|
|
@@ -12727,9 +12636,9 @@
|
|
LIBS="$LIBS $QT_LIBS"
|
|
|
|
echo $ac_n "checking Qt - version >= $QT_VERSION""... $ac_c" 1>&6
|
|
-echo "configure:12731: checking Qt - version >= $QT_VERSION" >&5
|
|
+echo "configure:12640: checking Qt - version >= $QT_VERSION" >&5
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 12733 "configure"
|
|
+#line 12642 "configure"
|
|
#include "confdefs.h"
|
|
#include <qglobal.h>
|
|
int main() {
|
|
@@ -12740,7 +12649,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:12744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:12653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
result="yes"
|
|
else
|
|
@@ -12771,6 +12680,138 @@
|
|
|
|
|
|
|
|
+if test "$MOZ_ENABLE_GTK2"
|
|
+then
|
|
+ MOZ_ENABLE_STARTUP_NOTIFICATION=
|
|
+
|
|
+ # Check whether --enable-startup-notification or --disable-startup-notification was given.
|
|
+if test "${enable_startup_notification+set}" = set; then
|
|
+ enableval="$enable_startup_notification"
|
|
+ if test "$enableval" = "yes"; then
|
|
+ MOZ_ENABLE_STARTUP_NOTIFICATION=force
|
|
+ elif test "$enableval" = "no"; then
|
|
+ MOZ_ENABLE_STARTUP_NOTIFICATION=
|
|
+ else
|
|
+ { echo "configure: error: Option, startup-notification, does not take an argument ($enableval)." 1>&2; exit 1; }
|
|
+ fi
|
|
+fi
|
|
+
|
|
+
|
|
+ if test "$MOZ_ENABLE_STARTUP_NOTIFICATION"
|
|
+ then
|
|
+
|
|
+ succeeded=no
|
|
+
|
|
+ if test -z "$PKG_CONFIG"; 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:12710: 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
|
|
+ case "$PKG_CONFIG" in
|
|
+ /*)
|
|
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
|
|
+ ;;
|
|
+ ?:/*)
|
|
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
|
|
+ ;;
|
|
+ *)
|
|
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
|
|
+ ac_dummy="$PATH"
|
|
+ for ac_dir in $ac_dummy; do
|
|
+ test -z "$ac_dir" && ac_dir=.
|
|
+ if test -f $ac_dir/$ac_word; then
|
|
+ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
|
|
+ break
|
|
+ fi
|
|
+ done
|
|
+ IFS="$ac_save_ifs"
|
|
+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
|
|
+ ;;
|
|
+esac
|
|
+fi
|
|
+PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
|
|
+if test -n "$PKG_CONFIG"; then
|
|
+ echo "$ac_t""$PKG_CONFIG" 1>&6
|
|
+else
|
|
+ echo "$ac_t""no" 1>&6
|
|
+fi
|
|
+
|
|
+ fi
|
|
+
|
|
+ if test "$PKG_CONFIG" = "no" ; then
|
|
+ echo "*** The pkg-config script could not be found. Make sure it is"
|
|
+ echo "*** in your path, or set the PKG_CONFIG environment variable"
|
|
+ echo "*** to the full path to pkg-config."
|
|
+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
|
|
+ else
|
|
+ PKG_CONFIG_MIN_VERSION=0.9.0
|
|
+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
|
|
+ echo $ac_n "checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION""... $ac_c" 1>&6
|
|
+echo "configure:12754: checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" >&5
|
|
+
|
|
+ if $PKG_CONFIG --exists "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" ; then
|
|
+ echo "$ac_t""yes" 1>&6
|
|
+ succeeded=yes
|
|
+
|
|
+ echo $ac_n "checking MOZ_STARTUP_NOTIFICATION_CFLAGS""... $ac_c" 1>&6
|
|
+echo "configure:12761: checking MOZ_STARTUP_NOTIFICATION_CFLAGS" >&5
|
|
+ MOZ_STARTUP_NOTIFICATION_CFLAGS=`$PKG_CONFIG --cflags "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION"`
|
|
+ echo "$ac_t""$MOZ_STARTUP_NOTIFICATION_CFLAGS" 1>&6
|
|
+
|
|
+ echo $ac_n "checking MOZ_STARTUP_NOTIFICATION_LIBS""... $ac_c" 1>&6
|
|
+echo "configure:12766: checking MOZ_STARTUP_NOTIFICATION_LIBS" >&5
|
|
+ ## don't use --libs since that can do evil things like add
|
|
+ ## -Wl,--export-dynamic
|
|
+ MOZ_STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG --libs-only-L \"libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION\"` `$PKG_CONFIG --libs-only-l \"libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION\"`"
|
|
+ echo "$ac_t""$MOZ_STARTUP_NOTIFICATION_LIBS" 1>&6
|
|
+ else
|
|
+ MOZ_STARTUP_NOTIFICATION_CFLAGS=""
|
|
+ MOZ_STARTUP_NOTIFICATION_LIBS=""
|
|
+ ## If we have a custom action on failure, don't print errors, but
|
|
+ ## do set a variable so people can do so.
|
|
+ MOZ_STARTUP_NOTIFICATION_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION"`
|
|
+
|
|
+ fi
|
|
+
|
|
+
|
|
+
|
|
+ else
|
|
+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
|
|
+ echo "*** See http://www.freedesktop.org/software/pkgconfig"
|
|
+ fi
|
|
+ fi
|
|
+
|
|
+ if test $succeeded = yes; then
|
|
+ MOZ_ENABLE_STARTUP_NOTIFICATION=1
|
|
+ else
|
|
+
|
|
+ if test "$MOZ_ENABLE_STARTUP_NOTIFICATION" = "force"
|
|
+ then
|
|
+ { echo "configure: error: * * * Could not find startup-notification >= $STARTUP_NOTIFICATION_VERSION" 1>&2; exit 1; }
|
|
+ fi
|
|
+ MOZ_ENABLE_STARTUP_NOTIFICATION=
|
|
+
|
|
+ fi
|
|
+
|
|
+ fi
|
|
+
|
|
+ if test "$MOZ_ENABLE_STARTUP_NOTIFICATION"; then
|
|
+ cat >> confdefs.h <<\EOF
|
|
+#define MOZ_ENABLE_STARTUP_NOTIFICATION 1
|
|
+EOF
|
|
+
|
|
+ fi
|
|
+
|
|
+ TK_LIBS="$TK_LIBS $MOZ_STARTUP_NOTIFICATION_LIBS"
|
|
+fi
|
|
+
|
|
+
|
|
+
|
|
+
|
|
+
|
|
|
|
|
|
|
|
@@ -13336,7 +13377,7 @@
|
|
# 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:13340: checking for $ac_word" >&5
|
|
+echo "configure:13381: 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
|
|
@@ -13380,19 +13421,19 @@
|
|
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:13384: checking for xft" >&5
|
|
+echo "configure:13425: 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:13391: checking MOZ_XFT_CFLAGS" >&5
|
|
+echo "configure:13432: 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:13396: checking MOZ_XFT_LIBS" >&5
|
|
+echo "configure:13437: checking MOZ_XFT_LIBS" >&5
|
|
## don't use --libs since that can do evil things like add
|
|
## -Wl,--export-dynamic
|
|
MOZ_XFT_LIBS="`$PKG_CONFIG --libs-only-L \"xft\"` `$PKG_CONFIG --libs-only-l \"xft\"`"
|
|
@@ -13427,7 +13468,7 @@
|
|
# 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:13431: checking for $ac_word" >&5
|
|
+echo "configure:13472: 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
|
|
@@ -13470,31 +13511,31 @@
|
|
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 >= 1.1.0""... $ac_c" 1>&6
|
|
-echo "configure:13475: checking for pango >= 1.1.0" >&5
|
|
+ echo $ac_n "checking for pangoxft >= 1.1.0 pangox""... $ac_c" 1>&6
|
|
+echo "configure:13516: checking for pangoxft >= 1.1.0 pangox" >&5
|
|
|
|
- if $PKG_CONFIG --exists "pango >= 1.1.0" ; then
|
|
+ if $PKG_CONFIG --exists "pangoxft >= 1.1.0 pangox" ; then
|
|
echo "$ac_t""yes" 1>&6
|
|
succeeded=yes
|
|
|
|
- echo $ac_n "checking _PANGOCHK_CFLAGS""... $ac_c" 1>&6
|
|
-echo "configure:13482: checking _PANGOCHK_CFLAGS" >&5
|
|
- _PANGOCHK_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.1.0"`
|
|
- echo "$ac_t""$_PANGOCHK_CFLAGS" 1>&6
|
|
+ echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6
|
|
+echo "configure:13523: checking MOZ_PANGO_CFLAGS" >&5
|
|
+ MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pangoxft >= 1.1.0 pangox"`
|
|
+ echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6
|
|
|
|
- echo $ac_n "checking _PANGOCHK_LIBS""... $ac_c" 1>&6
|
|
-echo "configure:13487: checking _PANGOCHK_LIBS" >&5
|
|
+ echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6
|
|
+echo "configure:13528: checking MOZ_PANGO_LIBS" >&5
|
|
## don't use --libs since that can do evil things like add
|
|
## -Wl,--export-dynamic
|
|
- _PANGOCHK_LIBS="`$PKG_CONFIG --libs-only-L \"pango >= 1.1.0\"` `$PKG_CONFIG --libs-only-l \"pango >= 1.1.0\"`"
|
|
- echo "$ac_t""$_PANGOCHK_LIBS" 1>&6
|
|
+ MOZ_PANGO_LIBS="`$PKG_CONFIG --libs-only-L \"pangoxft >= 1.1.0 pangox\"` `$PKG_CONFIG --libs-only-l \"pangoxft >= 1.1.0 pangox\"`"
|
|
+ echo "$ac_t""$MOZ_PANGO_LIBS" 1>&6
|
|
else
|
|
- _PANGOCHK_CFLAGS=""
|
|
- _PANGOCHK_LIBS=""
|
|
+ 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.
|
|
- _PANGOCHK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pango >= 1.1.0"`
|
|
- echo $_PANGOCHK_PKG_ERRORS
|
|
+ MOZ_PANGO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangoxft >= 1.1.0 pangox"`
|
|
+ echo $MOZ_PANGO_PKG_ERRORS
|
|
fi
|
|
|
|
|
|
@@ -13508,7 +13549,7 @@
|
|
if test $succeeded = yes; then
|
|
:
|
|
else
|
|
- { echo "configure: error: Library requirements (pango >= 1.1.0) 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 (pangoxft >= 1.1.0 pangox) 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
|
|
@@ -13517,6 +13558,8 @@
|
|
|
|
|
|
|
|
+
|
|
+
|
|
# Check whether --enable-pango or --disable-pango was given.
|
|
if test "${enable_pango+set}" = set; then
|
|
enableval="$enable_pango"
|
|
@@ -13543,7 +13586,7 @@
|
|
# 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:13547: checking for $ac_word" >&5
|
|
+echo "configure:13590: 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
|
|
@@ -13587,19 +13630,19 @@
|
|
PKG_CONFIG_MIN_VERSION=0.9.0
|
|
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
|
|
echo $ac_n "checking for pangoxft >= 1.6.0""... $ac_c" 1>&6
|
|
-echo "configure:13591: checking for pangoxft >= 1.6.0" >&5
|
|
+echo "configure:13634: checking for pangoxft >= 1.6.0" >&5
|
|
|
|
if $PKG_CONFIG --exists "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:13598: checking MOZ_PANGO_CFLAGS" >&5
|
|
+echo "configure:13641: checking MOZ_PANGO_CFLAGS" >&5
|
|
MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "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:13603: checking MOZ_PANGO_LIBS" >&5
|
|
+echo "configure:13646: checking MOZ_PANGO_LIBS" >&5
|
|
## don't use --libs since that can do evil things like add
|
|
## -Wl,--export-dynamic
|
|
MOZ_PANGO_LIBS="`$PKG_CONFIG --libs-only-L \"pangoxft >= 1.6.0\"` `$PKG_CONFIG --libs-only-l \"pangoxft >= 1.6.0\"`"
|
|
@@ -13627,10 +13670,110 @@
|
|
{ echo "configure: error: Library requirements (pangoxft >= 1.6.0) 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
|
|
|
|
+
|
|
+ succeeded=no
|
|
+
|
|
+ if test -z "$PKG_CONFIG"; 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:13681: 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
|
|
+ case "$PKG_CONFIG" in
|
|
+ /*)
|
|
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
|
|
+ ;;
|
|
+ ?:/*)
|
|
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
|
|
+ ;;
|
|
+ *)
|
|
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
|
|
+ ac_dummy="$PATH"
|
|
+ for ac_dir in $ac_dummy; do
|
|
+ test -z "$ac_dir" && ac_dir=.
|
|
+ if test -f $ac_dir/$ac_word; then
|
|
+ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
|
|
+ break
|
|
+ fi
|
|
+ done
|
|
+ IFS="$ac_save_ifs"
|
|
+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
|
|
+ ;;
|
|
+esac
|
|
+fi
|
|
+PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
|
|
+if test -n "$PKG_CONFIG"; then
|
|
+ echo "$ac_t""$PKG_CONFIG" 1>&6
|
|
+else
|
|
+ echo "$ac_t""no" 1>&6
|
|
+fi
|
|
+
|
|
+ fi
|
|
+
|
|
+ if test "$PKG_CONFIG" = "no" ; then
|
|
+ echo "*** The pkg-config script could not be found. Make sure it is"
|
|
+ echo "*** in your path, or set the PKG_CONFIG environment variable"
|
|
+ echo "*** to the full path to pkg-config."
|
|
+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
|
|
+ else
|
|
+ PKG_CONFIG_MIN_VERSION=0.9.0
|
|
+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
|
|
+ echo $ac_n "checking for pangocairo >= 1.10.0""... $ac_c" 1>&6
|
|
+echo "configure:13725: checking for pangocairo >= 1.10.0" >&5
|
|
+
|
|
+ if $PKG_CONFIG --exists "pangocairo >= 1.10.0" ; then
|
|
+ echo "$ac_t""yes" 1>&6
|
|
+ succeeded=yes
|
|
+
|
|
+ echo $ac_n "checking PANGOCAIRO_CHK_CFLAGS""... $ac_c" 1>&6
|
|
+echo "configure:13732: checking PANGOCAIRO_CHK_CFLAGS" >&5
|
|
+ PANGOCAIRO_CHK_CFLAGS=`$PKG_CONFIG --cflags "pangocairo >= 1.10.0"`
|
|
+ echo "$ac_t""$PANGOCAIRO_CHK_CFLAGS" 1>&6
|
|
+
|
|
+ echo $ac_n "checking PANGOCAIRO_CHK_LIBS""... $ac_c" 1>&6
|
|
+echo "configure:13737: checking PANGOCAIRO_CHK_LIBS" >&5
|
|
+ ## don't use --libs since that can do evil things like add
|
|
+ ## -Wl,--export-dynamic
|
|
+ PANGOCAIRO_CHK_LIBS="`$PKG_CONFIG --libs-only-L \"pangocairo >= 1.10.0\"` `$PKG_CONFIG --libs-only-l \"pangocairo >= 1.10.0\"`"
|
|
+ echo "$ac_t""$PANGOCAIRO_CHK_LIBS" 1>&6
|
|
+ else
|
|
+ PANGOCAIRO_CHK_CFLAGS=""
|
|
+ PANGOCAIRO_CHK_LIBS=""
|
|
+ ## If we have a custom action on failure, don't print errors, but
|
|
+ ## do set a variable so people can do so.
|
|
+ PANGOCAIRO_CHK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangocairo >= 1.10.0"`
|
|
+
|
|
+ fi
|
|
+
|
|
+
|
|
+
|
|
+ else
|
|
+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
|
|
+ echo "*** See http://www.freedesktop.org/software/pkgconfig"
|
|
+ fi
|
|
+ fi
|
|
+
|
|
+ if test $succeeded = yes; then
|
|
+
|
|
+ MOZ_PANGOCAIRO=1
|
|
+ cat >> confdefs.h <<\EOF
|
|
+#define MOZ_PANGOCAIRO 1
|
|
+EOF
|
|
+
|
|
+ MOZ_PANGO_CFLAGS="$PANGOCAIRO_CHK_CFLAGS $MOZ_PANGO_CFLAGS"
|
|
+ MOZ_PANGO_LIBS="$PANGOCAIRO_CHK_LIBS $MOZ_PANGO_LIBS"
|
|
+
|
|
+ else
|
|
+ :
|
|
+ fi
|
|
+
|
|
|
|
|
|
|
|
|
|
+
|
|
fi
|
|
|
|
if test "$MOZ_X11"
|
|
@@ -13667,7 +13810,7 @@
|
|
_SAVE_LDFLAGS="$LDFLAGS"
|
|
LDFLAGS="$XLDFLAGS $LDFLAGS"
|
|
echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6
|
|
-echo "configure:13671: checking for XpGetPrinterList in -lXp" >&5
|
|
+echo "configure:13814: 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
|
|
@@ -13675,7 +13818,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lXp $XEXT_LIBS $XLIBS $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 13679 "configure"
|
|
+#line 13822 "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
|
|
@@ -13686,7 +13829,7 @@
|
|
XpGetPrinterList()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:13690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:13833: \"$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
|
|
@@ -13759,7 +13902,7 @@
|
|
# 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:13763: checking for $ac_word" >&5
|
|
+echo "configure:13906: 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
|
|
@@ -13803,19 +13946,19 @@
|
|
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:13807: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5
|
|
+echo "configure:13950: 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:13814: checking MOZ_GNOMEVFS_CFLAGS" >&5
|
|
+echo "configure:13957: 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:13819: checking MOZ_GNOMEVFS_LIBS" >&5
|
|
+echo "configure:13962: checking MOZ_GNOMEVFS_LIBS" >&5
|
|
## don't use --libs since that can do evil things like add
|
|
## -Wl,--export-dynamic
|
|
MOZ_GNOMEVFS_LIBS="`$PKG_CONFIG --libs-only-L \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\"` `$PKG_CONFIG --libs-only-l \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\"`"
|
|
@@ -13866,7 +14009,7 @@
|
|
# 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:13870: checking for $ac_word" >&5
|
|
+echo "configure:14013: 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
|
|
@@ -13910,19 +14053,19 @@
|
|
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:13914: checking for gconf-2.0 >= $GCONF_VERSION" >&5
|
|
+echo "configure:14057: 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:13921: checking MOZ_GCONF_CFLAGS" >&5
|
|
+echo "configure:14064: 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:13926: checking MOZ_GCONF_LIBS" >&5
|
|
+echo "configure:14069: checking MOZ_GCONF_LIBS" >&5
|
|
## don't use --libs since that can do evil things like add
|
|
## -Wl,--export-dynamic
|
|
MOZ_GCONF_LIBS="`$PKG_CONFIG --libs-only-L \"gconf-2.0 >= $GCONF_VERSION\"` `$PKG_CONFIG --libs-only-l \"gconf-2.0 >= $GCONF_VERSION\"`"
|
|
@@ -13959,6 +14102,7 @@
|
|
|
|
|
|
|
|
+
|
|
|
|
if test "$MOZ_ENABLE_LIBGNOME"
|
|
then
|
|
@@ -13969,7 +14113,7 @@
|
|
# 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:13973: checking for $ac_word" >&5
|
|
+echo "configure:14117: 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
|
|
@@ -14013,19 +14157,19 @@
|
|
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:14017: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5
|
|
+echo "configure:14161: 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:14024: checking MOZ_LIBGNOME_CFLAGS" >&5
|
|
+echo "configure:14168: 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:14029: checking MOZ_LIBGNOME_LIBS" >&5
|
|
+echo "configure:14173: checking MOZ_LIBGNOME_LIBS" >&5
|
|
## don't use --libs since that can do evil things like add
|
|
## -Wl,--export-dynamic
|
|
MOZ_LIBGNOME_LIBS="`$PKG_CONFIG --libs-only-L \"libgnome-2.0 >= $LIBGNOME_VERSION\"` `$PKG_CONFIG --libs-only-l \"libgnome-2.0 >= $LIBGNOME_VERSION\"`"
|
|
@@ -14103,7 +14247,7 @@
|
|
# 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:14107: checking for $ac_word" >&5
|
|
+echo "configure:14251: 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
|
|
@@ -14147,19 +14291,19 @@
|
|
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:14151: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5
|
|
+echo "configure:14295: 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:14158: checking MOZ_GNOMEUI_CFLAGS" >&5
|
|
+echo "configure:14302: 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:14163: checking MOZ_GNOMEUI_LIBS" >&5
|
|
+echo "configure:14307: checking MOZ_GNOMEUI_LIBS" >&5
|
|
## don't use --libs since that can do evil things like add
|
|
## -Wl,--export-dynamic
|
|
MOZ_GNOMEUI_LIBS="`$PKG_CONFIG --libs-only-L \"libgnomeui-2.0 >= $GNOMEUI_VERSION\"` `$PKG_CONFIG --libs-only-l \"libgnomeui-2.0 >= $GNOMEUI_VERSION\"`"
|
|
@@ -14210,6 +14354,221 @@
|
|
|
|
|
|
|
|
+if test "$MOZ_ENABLE_GTK2"
|
|
+then
|
|
+ # Check whether --enable-dbus or --disable-dbus was given.
|
|
+if test "${enable_dbus+set}" = set; then
|
|
+ enableval="$enable_dbus"
|
|
+ if test "$enableval" = "yes"; then
|
|
+ MOZ_ENABLE_DBUS=1
|
|
+ elif test "$enableval" = "no"; then
|
|
+ MOZ_ENABLE_DBUS=
|
|
+ else
|
|
+ { echo "configure: error: Option, dbus, does not take an argument ($enableval)." 1>&2; exit 1; }
|
|
+ fi
|
|
+fi
|
|
+
|
|
+
|
|
+ if test "$MOZ_ENABLE_DBUS"
|
|
+ then
|
|
+
|
|
+ succeeded=no
|
|
+
|
|
+ if test -z "$PKG_CONFIG"; 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:14382: 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
|
|
+ case "$PKG_CONFIG" in
|
|
+ /*)
|
|
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
|
|
+ ;;
|
|
+ ?:/*)
|
|
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
|
|
+ ;;
|
|
+ *)
|
|
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
|
|
+ ac_dummy="$PATH"
|
|
+ for ac_dir in $ac_dummy; do
|
|
+ test -z "$ac_dir" && ac_dir=.
|
|
+ if test -f $ac_dir/$ac_word; then
|
|
+ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
|
|
+ break
|
|
+ fi
|
|
+ done
|
|
+ IFS="$ac_save_ifs"
|
|
+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
|
|
+ ;;
|
|
+esac
|
|
+fi
|
|
+PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
|
|
+if test -n "$PKG_CONFIG"; then
|
|
+ echo "$ac_t""$PKG_CONFIG" 1>&6
|
|
+else
|
|
+ echo "$ac_t""no" 1>&6
|
|
+fi
|
|
+
|
|
+ fi
|
|
+
|
|
+ if test "$PKG_CONFIG" = "no" ; then
|
|
+ echo "*** The pkg-config script could not be found. Make sure it is"
|
|
+ echo "*** in your path, or set the PKG_CONFIG environment variable"
|
|
+ echo "*** to the full path to pkg-config."
|
|
+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
|
|
+ else
|
|
+ PKG_CONFIG_MIN_VERSION=0.9.0
|
|
+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
|
|
+ echo $ac_n "checking for dbus-glib-1""... $ac_c" 1>&6
|
|
+echo "configure:14426: checking for dbus-glib-1" >&5
|
|
+
|
|
+ if $PKG_CONFIG --exists "dbus-glib-1" ; then
|
|
+ echo "$ac_t""yes" 1>&6
|
|
+ succeeded=yes
|
|
+
|
|
+ echo $ac_n "checking MOZ_DBUS_GLIB_CFLAGS""... $ac_c" 1>&6
|
|
+echo "configure:14433: checking MOZ_DBUS_GLIB_CFLAGS" >&5
|
|
+ MOZ_DBUS_GLIB_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1"`
|
|
+ echo "$ac_t""$MOZ_DBUS_GLIB_CFLAGS" 1>&6
|
|
+
|
|
+ echo $ac_n "checking MOZ_DBUS_GLIB_LIBS""... $ac_c" 1>&6
|
|
+echo "configure:14438: checking MOZ_DBUS_GLIB_LIBS" >&5
|
|
+ ## don't use --libs since that can do evil things like add
|
|
+ ## -Wl,--export-dynamic
|
|
+ MOZ_DBUS_GLIB_LIBS="`$PKG_CONFIG --libs-only-L \"dbus-glib-1\"` `$PKG_CONFIG --libs-only-l \"dbus-glib-1\"`"
|
|
+ echo "$ac_t""$MOZ_DBUS_GLIB_LIBS" 1>&6
|
|
+ else
|
|
+ MOZ_DBUS_GLIB_CFLAGS=""
|
|
+ MOZ_DBUS_GLIB_LIBS=""
|
|
+ ## If we have a custom action on failure, don't print errors, but
|
|
+ ## do set a variable so people can do so.
|
|
+ MOZ_DBUS_GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1"`
|
|
+ echo $MOZ_DBUS_GLIB_PKG_ERRORS
|
|
+ fi
|
|
+
|
|
+
|
|
+
|
|
+ else
|
|
+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
|
|
+ echo "*** See http://www.freedesktop.org/software/pkgconfig"
|
|
+ fi
|
|
+ fi
|
|
+
|
|
+ if test $succeeded = yes; then
|
|
+ :
|
|
+ else
|
|
+ { echo "configure: error: Library requirements (dbus-glib-1) 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
|
|
+
|
|
+
|
|
+ succeeded=no
|
|
+
|
|
+ if test -z "$PKG_CONFIG"; 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:14473: 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
|
|
+ case "$PKG_CONFIG" in
|
|
+ /*)
|
|
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
|
|
+ ;;
|
|
+ ?:/*)
|
|
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
|
|
+ ;;
|
|
+ *)
|
|
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
|
|
+ ac_dummy="$PATH"
|
|
+ for ac_dir in $ac_dummy; do
|
|
+ test -z "$ac_dir" && ac_dir=.
|
|
+ if test -f $ac_dir/$ac_word; then
|
|
+ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
|
|
+ break
|
|
+ fi
|
|
+ done
|
|
+ IFS="$ac_save_ifs"
|
|
+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
|
|
+ ;;
|
|
+esac
|
|
+fi
|
|
+PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
|
|
+if test -n "$PKG_CONFIG"; then
|
|
+ echo "$ac_t""$PKG_CONFIG" 1>&6
|
|
+else
|
|
+ echo "$ac_t""no" 1>&6
|
|
+fi
|
|
+
|
|
+ fi
|
|
+
|
|
+ if test "$PKG_CONFIG" = "no" ; then
|
|
+ echo "*** The pkg-config script could not be found. Make sure it is"
|
|
+ echo "*** in your path, or set the PKG_CONFIG environment variable"
|
|
+ echo "*** to the full path to pkg-config."
|
|
+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
|
|
+ else
|
|
+ PKG_CONFIG_MIN_VERSION=0.9.0
|
|
+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
|
|
+ echo $ac_n "checking for gthread-2.0""... $ac_c" 1>&6
|
|
+echo "configure:14517: checking for gthread-2.0" >&5
|
|
+
|
|
+ if $PKG_CONFIG --exists "gthread-2.0" ; then
|
|
+ echo "$ac_t""yes" 1>&6
|
|
+ succeeded=yes
|
|
+
|
|
+ echo $ac_n "checking MOZ_GTHREAD_CFLAGS""... $ac_c" 1>&6
|
|
+echo "configure:14524: checking MOZ_GTHREAD_CFLAGS" >&5
|
|
+ MOZ_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0"`
|
|
+ echo "$ac_t""$MOZ_GTHREAD_CFLAGS" 1>&6
|
|
+
|
|
+ echo $ac_n "checking MOZ_GTHREAD_LIBS""... $ac_c" 1>&6
|
|
+echo "configure:14529: checking MOZ_GTHREAD_LIBS" >&5
|
|
+ ## don't use --libs since that can do evil things like add
|
|
+ ## -Wl,--export-dynamic
|
|
+ MOZ_GTHREAD_LIBS="`$PKG_CONFIG --libs-only-L \"gthread-2.0\"` `$PKG_CONFIG --libs-only-l \"gthread-2.0\"`"
|
|
+ echo "$ac_t""$MOZ_GTHREAD_LIBS" 1>&6
|
|
+ else
|
|
+ MOZ_GTHREAD_CFLAGS=""
|
|
+ MOZ_GTHREAD_LIBS=""
|
|
+ ## If we have a custom action on failure, don't print errors, but
|
|
+ ## do set a variable so people can do so.
|
|
+ MOZ_GTHREAD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gthread-2.0"`
|
|
+ echo $MOZ_GTHREAD_PKG_ERRORS
|
|
+ fi
|
|
+
|
|
+
|
|
+
|
|
+ else
|
|
+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
|
|
+ echo "*** See http://www.freedesktop.org/software/pkgconfig"
|
|
+ fi
|
|
+ fi
|
|
+
|
|
+ if test $succeeded = yes; then
|
|
+ :
|
|
+ else
|
|
+ { echo "configure: error: Library requirements (gthread-2.0) 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
|
|
+
|
|
+ if test "$MOZ_ENABLE_DBUS"; then
|
|
+ cat >> confdefs.h <<\EOF
|
|
+#define MOZ_ENABLE_DBUS 1
|
|
+EOF
|
|
+
|
|
+ fi
|
|
+fi
|
|
+
|
|
+
|
|
+
|
|
+
|
|
+
|
|
+
|
|
+
|
|
if (test "$MOZ_ENABLE_GTK" || test "$MOZ_ENABLE_GTK2") \
|
|
&& test "$MOZ_ENABLE_COREXFONTS" \
|
|
|| test "$MOZ_ENABLE_XLIB" \
|
|
@@ -14645,7 +15004,7 @@
|
|
# 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:14649: checking for $ac_word" >&5
|
|
+echo "configure:15008: 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
|
|
@@ -14681,7 +15040,7 @@
|
|
# 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:14685: checking for $ac_word" >&5
|
|
+echo "configure:15044: 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
|
|
@@ -14756,6 +15115,13 @@
|
|
MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gnomevfs||'`
|
|
fi
|
|
|
|
+if test -z "$MOZ_ENABLE_DBUS" && test `echo "$MOZ_EXTENSIONS" | grep -c dbus` -ne 0; then
|
|
+ if test -n "$MOZ_X11"; then
|
|
+ echo "configure: warning: Cannot build dbus without required libraries. Removing dbus from MOZ_EXTENSIONS." 1>&2
|
|
+ fi
|
|
+ MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|dbus||'`
|
|
+fi
|
|
+
|
|
if test -z "$MOZ_JSDEBUGGER" && test `echo "$MOZ_EXTENSIONS" | grep -c venkman` -ne 0; then
|
|
echo "configure: warning: Cannot build venkman without JavaScript debug library. Removing venkman from MOZ_EXTENSIONS." 1>&2
|
|
MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'`
|
|
@@ -14928,7 +15294,7 @@
|
|
gdiplus)
|
|
MOZ_SVG_RENDERER_GDIPLUS=1
|
|
echo $ac_n "checking for Gdiplus.h""... $ac_c" 1>&6
|
|
-echo "configure:14932: checking for Gdiplus.h" >&5
|
|
+echo "configure:15298: checking for Gdiplus.h" >&5
|
|
|
|
ac_ext=C
|
|
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
|
|
@@ -14938,7 +15304,7 @@
|
|
cross_compiling=$ac_cv_prog_cxx_cross
|
|
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 14942 "configure"
|
|
+#line 15308 "configure"
|
|
#include "confdefs.h"
|
|
#include <windows.h>
|
|
#include <unknwn.h>
|
|
@@ -14947,7 +15313,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:14951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:15317: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
echo "$ac_t""yes" 1>&6
|
|
else
|
|
@@ -15027,7 +15393,7 @@
|
|
# 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:15031: checking for $ac_word" >&5
|
|
+echo "configure:15397: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_path_MAKENSIS'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -15072,7 +15438,7 @@
|
|
# 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:15076: checking for $ac_word" >&5
|
|
+echo "configure:15442: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_path_HOST_ICONV'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -15141,13 +15507,13 @@
|
|
msvc*|mks*|cygwin*|mingw*|wince*)
|
|
if test -n "$MOZ_UPDATER"; then
|
|
echo $ac_n "checking for iconv""... $ac_c" 1>&6
|
|
-echo "configure:15145: checking for iconv" >&5
|
|
+echo "configure:15511: checking for iconv" >&5
|
|
for ac_prog in $HOST_ICONV "iconv"
|
|
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:15151: checking for $ac_word" >&5
|
|
+echo "configure:15517: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_HOST_ICONV'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -15493,18 +15859,18 @@
|
|
|
|
if test -n "$MOZ_DEBUG"; then
|
|
echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6
|
|
-echo "configure:15497: checking for valid debug flags" >&5
|
|
+echo "configure:15863: checking for valid debug flags" >&5
|
|
_SAVE_CFLAGS=$CFLAGS
|
|
CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 15501 "configure"
|
|
+#line 15867 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdio.h>
|
|
int main() {
|
|
printf("Hello World\n");
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:15508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:15874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
_results=yes
|
|
else
|
|
@@ -15545,18 +15911,18 @@
|
|
if test "$COMPILE_ENVIRONMENT"; then
|
|
if test -n "$MOZ_OPTIMIZE"; then
|
|
echo $ac_n "checking for valid optimization flags""... $ac_c" 1>&6
|
|
-echo "configure:15549: checking for valid optimization flags" >&5
|
|
+echo "configure:15915: checking for valid optimization flags" >&5
|
|
_SAVE_CFLAGS=$CFLAGS
|
|
CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 15553 "configure"
|
|
+#line 15919 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdio.h>
|
|
int main() {
|
|
printf("Hello World\n");
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:15560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:15926: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
_results=yes
|
|
else
|
|
@@ -15773,7 +16139,7 @@
|
|
|
|
if test -n "$_ENABLE_EFENCE"; then
|
|
echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6
|
|
-echo "configure:15777: checking for malloc in -lefence" >&5
|
|
+echo "configure:16143: 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
|
|
@@ -15781,7 +16147,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lefence $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 15785 "configure"
|
|
+#line 16151 "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
|
|
@@ -15792,7 +16158,7 @@
|
|
malloc()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:15796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:16162: \"$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
|
|
@@ -15893,12 +16259,12 @@
|
|
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:15897: checking for $ac_func" >&5
|
|
+echo "configure:16263: 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 15902 "configure"
|
|
+#line 16268 "configure"
|
|
#include "confdefs.h"
|
|
/* System header to define __stub macros and hopefully few prototypes,
|
|
which can conflict with char $ac_func(); below. */
|
|
@@ -15924,7 +16290,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:15928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:16294: \"$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
|
|
@@ -16167,12 +16533,12 @@
|
|
for ac_func in __cxa_demangle
|
|
do
|
|
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
|
-echo "configure:16171: checking for $ac_func" >&5
|
|
+echo "configure:16537: 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 16176 "configure"
|
|
+#line 16542 "configure"
|
|
#include "confdefs.h"
|
|
/* System header to define __stub macros and hopefully few prototypes,
|
|
which can conflict with char $ac_func(); below. */
|
|
@@ -16198,7 +16564,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:16202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:16568: \"$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
|
|
@@ -16336,7 +16702,7 @@
|
|
# Compiler Options
|
|
|
|
echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6
|
|
-echo "configure:16340: checking for gcc -pipe support" >&5
|
|
+echo "configure:16706: 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
|
|
@@ -16351,14 +16717,14 @@
|
|
_SAVE_CFLAGS=$CFLAGS
|
|
CFLAGS="$CFLAGS -pipe"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 16355 "configure"
|
|
+#line 16721 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdio.h>
|
|
int main() {
|
|
printf("Hello World\n");
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:16362: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:16728: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
_res_gcc_pipe="yes"
|
|
else
|
|
@@ -16400,16 +16766,16 @@
|
|
_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:16404: checking whether compiler supports -Wno-long-long" >&5
|
|
+echo "configure:16770: checking whether compiler supports -Wno-long-long" >&5
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 16406 "configure"
|
|
+#line 16772 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
return(0);
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:16413: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:16779: \"$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"
|
|
@@ -16430,16 +16796,16 @@
|
|
CFLAGS="$CFLAGS -fprofile-generate"
|
|
|
|
echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6
|
|
-echo "configure:16434: checking whether C compiler supports -fprofile-generate" >&5
|
|
+echo "configure:16800: checking whether C compiler supports -fprofile-generate" >&5
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 16436 "configure"
|
|
+#line 16802 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
return 0;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:16443: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:16809: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
PROFILE_GEN_CFLAGS="-fprofile-generate"
|
|
result="yes"
|
|
@@ -16457,16 +16823,16 @@
|
|
else
|
|
CFLAGS="$_SAVE_CFLAGS -fprofile-arcs"
|
|
echo $ac_n "checking whether C compiler supports -fprofile-arcs""... $ac_c" 1>&6
|
|
-echo "configure:16461: checking whether C compiler supports -fprofile-arcs" >&5
|
|
+echo "configure:16827: checking whether C compiler supports -fprofile-arcs" >&5
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 16463 "configure"
|
|
+#line 16829 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
return 0;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:16470: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:16836: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
PROFILE_GEN_CFLAGS="-fprofile-arcs"
|
|
result="yes"
|
|
@@ -16512,18 +16878,21 @@
|
|
_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:16516: checking whether C++ compiler has -pedantic long long bug" >&5
|
|
+echo "configure:16882: 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 16521 "configure"
|
|
+#line 16887 "configure"
|
|
#include "confdefs.h"
|
|
+#ifdef __cplusplus
|
|
+extern "C" void exit(int);
|
|
+#endif
|
|
int main () {
|
|
if (sizeof(long long) != 8) { return 1; }
|
|
return 0; }
|
|
EOF
|
|
-if { (eval echo configure:16527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:16896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
result="no"
|
|
else
|
|
@@ -16553,13 +16922,16 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6
|
|
-echo "configure:16557: checking for correct temporary object destruction order" >&5
|
|
+echo "configure:16926: checking for correct temporary object destruction order" >&5
|
|
if test "$cross_compiling" = yes; then
|
|
result="maybe"
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 16562 "configure"
|
|
+#line 16931 "configure"
|
|
#include "confdefs.h"
|
|
+#ifdef __cplusplus
|
|
+extern "C" void exit(int);
|
|
+#endif
|
|
class A {
|
|
public: A(int& x) : mValue(x) {}
|
|
~A() { mValue--; }
|
|
@@ -16578,7 +16950,7 @@
|
|
}
|
|
|
|
EOF
|
|
-if { (eval echo configure:16582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:16954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
result="yes"
|
|
else
|
|
@@ -16599,12 +16971,12 @@
|
|
_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:16603: checking for correct overload resolution with const and templates" >&5
|
|
+echo "configure:16975: 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 16608 "configure"
|
|
+#line 16980 "configure"
|
|
#include "confdefs.h"
|
|
|
|
template <class T>
|
|
@@ -16634,7 +17006,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:16638: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:17010: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_nscap_nonconst_opeq_bug="no"
|
|
else
|
|
@@ -16926,7 +17298,7 @@
|
|
# 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:16930: checking for $ac_word" >&5
|
|
+echo "configure:17302: 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
|
|
@@ -16970,19 +17342,19 @@
|
|
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:16974: checking for libIDL-2.0 >= 0.8.0" >&5
|
|
+echo "configure:17346: 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:16981: checking LIBIDL_CFLAGS" >&5
|
|
+echo "configure:17353: 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:16986: checking LIBIDL_LIBS" >&5
|
|
+echo "configure:17358: checking LIBIDL_LIBS" >&5
|
|
## don't use --libs since that can do evil things like add
|
|
## -Wl,--export-dynamic
|
|
LIBIDL_LIBS="`$PKG_CONFIG --libs-only-L \"libIDL-2.0 >= 0.8.0\"` `$PKG_CONFIG --libs-only-l \"libIDL-2.0 >= 0.8.0\"`"
|
|
@@ -17105,7 +17477,7 @@
|
|
# 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:17109: checking for $ac_word" >&5
|
|
+echo "configure:17481: 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
|
|
@@ -17140,7 +17512,7 @@
|
|
|
|
min_glib_version=1.2.0
|
|
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
|
|
-echo "configure:17144: checking for GLIB - version >= $min_glib_version" >&5
|
|
+echo "configure:17516: checking for GLIB - version >= $min_glib_version" >&5
|
|
no_glib=""
|
|
if test "$GLIB_CONFIG" = "no" ; then
|
|
no_glib=yes
|
|
@@ -17163,7 +17535,7 @@
|
|
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 17167 "configure"
|
|
+#line 17539 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <glib.h>
|
|
@@ -17239,7 +17611,7 @@
|
|
}
|
|
|
|
EOF
|
|
-if { (eval echo configure:17243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:17615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
:
|
|
else
|
|
@@ -17273,7 +17645,7 @@
|
|
CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
|
LIBS="$LIBS $GLIB_LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 17277 "configure"
|
|
+#line 17649 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <glib.h>
|
|
@@ -17283,7 +17655,7 @@
|
|
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:17287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:17659: \"$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"
|
|
@@ -17327,7 +17699,7 @@
|
|
# 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:17331: checking for $ac_word" >&5
|
|
+echo "configure:17703: 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
|
|
@@ -17362,7 +17734,7 @@
|
|
|
|
min_libIDL_version=$LIBIDL_VERSION
|
|
echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6
|
|
-echo "configure:17366: checking for libIDL - version >= $min_libIDL_version" >&5
|
|
+echo "configure:17738: checking for libIDL - version >= $min_libIDL_version" >&5
|
|
no_libIDL=""
|
|
if test "$LIBIDL_CONFIG" = "no" ; then
|
|
no_libIDL=yes
|
|
@@ -17389,7 +17761,7 @@
|
|
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 17393 "configure"
|
|
+#line 17765 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <stdio.h>
|
|
@@ -17475,7 +17847,7 @@
|
|
}
|
|
|
|
EOF
|
|
-if { (eval echo configure:17479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:17851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
:
|
|
else
|
|
@@ -17509,7 +17881,7 @@
|
|
CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
|
|
LIBS="$LIBS $LIBIDL_LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 17513 "configure"
|
|
+#line 17885 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <stdio.h>
|
|
@@ -17520,7 +17892,7 @@
|
|
return IDL_get_libver_string ? 1 : 0;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:17524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:17896: \"$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"
|
|
@@ -17648,7 +18020,7 @@
|
|
# 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:17652: checking for $ac_word" >&5
|
|
+echo "configure:18024: 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
|
|
@@ -17683,7 +18055,7 @@
|
|
|
|
min_glib_version=1.2.0
|
|
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
|
|
-echo "configure:17687: checking for GLIB - version >= $min_glib_version" >&5
|
|
+echo "configure:18059: checking for GLIB - version >= $min_glib_version" >&5
|
|
no_glib=""
|
|
if test "$GLIB_CONFIG" = "no" ; then
|
|
no_glib=yes
|
|
@@ -17706,7 +18078,7 @@
|
|
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 17710 "configure"
|
|
+#line 18082 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <glib.h>
|
|
@@ -17782,7 +18154,7 @@
|
|
}
|
|
|
|
EOF
|
|
-if { (eval echo configure:17786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:18158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
:
|
|
else
|
|
@@ -17816,7 +18188,7 @@
|
|
CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
|
LIBS="$LIBS $GLIB_LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 17820 "configure"
|
|
+#line 18192 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <glib.h>
|
|
@@ -17826,7 +18198,7 @@
|
|
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:17830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:18202: \"$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"
|
|
@@ -17870,7 +18242,7 @@
|
|
# 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:17874: checking for $ac_word" >&5
|
|
+echo "configure:18246: 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
|
|
@@ -17905,7 +18277,7 @@
|
|
|
|
min_libIDL_version=$LIBIDL_VERSION
|
|
echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6
|
|
-echo "configure:17909: checking for libIDL - version >= $min_libIDL_version" >&5
|
|
+echo "configure:18281: checking for libIDL - version >= $min_libIDL_version" >&5
|
|
no_libIDL=""
|
|
if test "$LIBIDL_CONFIG" = "no" ; then
|
|
no_libIDL=yes
|
|
@@ -17932,7 +18304,7 @@
|
|
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 17936 "configure"
|
|
+#line 18308 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <stdio.h>
|
|
@@ -18018,7 +18390,7 @@
|
|
}
|
|
|
|
EOF
|
|
-if { (eval echo configure:18022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:18394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
:
|
|
else
|
|
@@ -18052,7 +18424,7 @@
|
|
CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
|
|
LIBS="$LIBS $LIBIDL_LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 18056 "configure"
|
|
+#line 18428 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <stdio.h>
|
|
@@ -18063,7 +18435,7 @@
|
|
return IDL_get_libver_string ? 1 : 0;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:18067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:18439: \"$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"
|
|
@@ -18104,7 +18476,7 @@
|
|
# 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:18108: checking for $ac_word" >&5
|
|
+echo "configure:18480: 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
|
|
@@ -18148,19 +18520,19 @@
|
|
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:18152: checking for libIDL-2.0 >= 0.8.0" >&5
|
|
+echo "configure:18524: 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:18159: checking LIBIDL_CFLAGS" >&5
|
|
+echo "configure:18531: 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:18164: checking LIBIDL_LIBS" >&5
|
|
+echo "configure:18536: checking LIBIDL_LIBS" >&5
|
|
## don't use --libs since that can do evil things like add
|
|
## -Wl,--export-dynamic
|
|
LIBIDL_LIBS="`$PKG_CONFIG --libs-only-L \"libIDL-2.0 >= 0.8.0\"` `$PKG_CONFIG --libs-only-l \"libIDL-2.0 >= 0.8.0\"`"
|
|
@@ -18196,7 +18568,7 @@
|
|
# 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:18200: checking for $ac_word" >&5
|
|
+echo "configure:18572: 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
|
|
@@ -18233,7 +18605,7 @@
|
|
|
|
if test -n "$ORBIT_CONFIG"; then
|
|
echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6
|
|
-echo "configure:18237: checking for ORBit libIDL usability" >&5
|
|
+echo "configure:18609: checking for ORBit libIDL usability" >&5
|
|
_ORBIT_CFLAGS=`${ORBIT_CONFIG} client --cflags`
|
|
_ORBIT_LIBS=`${ORBIT_CONFIG} client --libs`
|
|
_ORBIT_INC_PATH=`${PERL} -e '{ for $f (@ARGV) { print "$f " if ($f =~ m/^-I/); } }' -- ${_ORBIT_CFLAGS}`
|
|
@@ -18250,7 +18622,7 @@
|
|
result="maybe"
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 18254 "configure"
|
|
+#line 18626 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <stdlib.h>
|
|
@@ -18265,7 +18637,7 @@
|
|
}
|
|
|
|
EOF
|
|
-if { (eval echo configure:18269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:18641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
_LIBIDL_FOUND=1
|
|
result="yes"
|
|
@@ -18322,7 +18694,7 @@
|
|
# 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:18326: checking for $ac_word" >&5
|
|
+echo "configure:18698: 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
|
|
@@ -18366,19 +18738,19 @@
|
|
PKG_CONFIG_MIN_VERSION=0.9.0
|
|
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
|
|
echo $ac_n "checking for glib-2.0 >= 1.3.7""... $ac_c" 1>&6
|
|
-echo "configure:18370: checking for glib-2.0 >= 1.3.7" >&5
|
|
+echo "configure:18742: checking for glib-2.0 >= 1.3.7" >&5
|
|
|
|
if $PKG_CONFIG --exists "glib-2.0 >= 1.3.7" ; then
|
|
echo "$ac_t""yes" 1>&6
|
|
succeeded=yes
|
|
|
|
echo $ac_n "checking GLIB_CFLAGS""... $ac_c" 1>&6
|
|
-echo "configure:18377: checking GLIB_CFLAGS" >&5
|
|
+echo "configure:18749: checking GLIB_CFLAGS" >&5
|
|
GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 1.3.7"`
|
|
echo "$ac_t""$GLIB_CFLAGS" 1>&6
|
|
|
|
echo $ac_n "checking GLIB_LIBS""... $ac_c" 1>&6
|
|
-echo "configure:18382: checking GLIB_LIBS" >&5
|
|
+echo "configure:18754: checking GLIB_LIBS" >&5
|
|
## don't use --libs since that can do evil things like add
|
|
## -Wl,--export-dynamic
|
|
GLIB_LIBS="`$PKG_CONFIG --libs-only-L \"glib-2.0 >= 1.3.7\"` `$PKG_CONFIG --libs-only-l \"glib-2.0 >= 1.3.7\"`"
|
|
@@ -18462,7 +18834,7 @@
|
|
# 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:18466: checking for $ac_word" >&5
|
|
+echo "configure:18838: 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
|
|
@@ -18497,7 +18869,7 @@
|
|
|
|
min_glib_version=${GLIB_VERSION}
|
|
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
|
|
-echo "configure:18501: checking for GLIB - version >= $min_glib_version" >&5
|
|
+echo "configure:18873: checking for GLIB - version >= $min_glib_version" >&5
|
|
no_glib=""
|
|
if test "$GLIB_CONFIG" = "no" ; then
|
|
no_glib=yes
|
|
@@ -18520,7 +18892,7 @@
|
|
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 18524 "configure"
|
|
+#line 18896 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <glib.h>
|
|
@@ -18596,7 +18968,7 @@
|
|
}
|
|
|
|
EOF
|
|
-if { (eval echo configure:18600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:18972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
:
|
|
else
|
|
@@ -18630,7 +19002,7 @@
|
|
CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
|
LIBS="$LIBS $GLIB_LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 18634 "configure"
|
|
+#line 19006 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <glib.h>
|
|
@@ -18640,7 +19012,7 @@
|
|
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:18644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:19016: \"$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"
|
|
@@ -18720,19 +19092,19 @@
|
|
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
|
|
# for constant arguments. Useless!
|
|
echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
|
|
-echo "configure:18724: checking for working alloca.h" >&5
|
|
+echo "configure:19096: checking for working alloca.h" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 18729 "configure"
|
|
+#line 19101 "configure"
|
|
#include "confdefs.h"
|
|
#include <alloca.h>
|
|
int main() {
|
|
char *p = alloca(2 * sizeof(int));
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:18736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:19108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
rm -rf conftest*
|
|
ac_cv_header_alloca_h=yes
|
|
else
|
|
@@ -18753,12 +19125,12 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for alloca""... $ac_c" 1>&6
|
|
-echo "configure:18757: checking for alloca" >&5
|
|
+echo "configure:19129: checking for alloca" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 18762 "configure"
|
|
+#line 19134 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#ifdef __GNUC__
|
|
@@ -18786,7 +19158,7 @@
|
|
char *p = (char *) alloca(1);
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:18790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:19162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
rm -rf conftest*
|
|
ac_cv_func_alloca_works=yes
|
|
else
|
|
@@ -18818,12 +19190,12 @@
|
|
|
|
|
|
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
|
|
-echo "configure:18822: checking whether alloca needs Cray hooks" >&5
|
|
+echo "configure:19194: checking whether alloca needs Cray hooks" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 18827 "configure"
|
|
+#line 19199 "configure"
|
|
#include "confdefs.h"
|
|
#if defined(CRAY) && ! defined(CRAY2)
|
|
webecray
|
|
@@ -18848,12 +19220,12 @@
|
|
if test $ac_cv_os_cray = yes; then
|
|
for ac_func in _getb67 GETB67 getb67; do
|
|
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
|
-echo "configure:18852: checking for $ac_func" >&5
|
|
+echo "configure:19224: 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 18857 "configure"
|
|
+#line 19229 "configure"
|
|
#include "confdefs.h"
|
|
/* System header to define __stub macros and hopefully few prototypes,
|
|
which can conflict with char $ac_func(); below. */
|
|
@@ -18876,7 +19248,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:18880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:19252: \"$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
|
|
@@ -18903,7 +19275,7 @@
|
|
fi
|
|
|
|
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
|
|
-echo "configure:18907: checking stack direction for C alloca" >&5
|
|
+echo "configure:19279: checking stack direction for C alloca" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -18911,7 +19283,7 @@
|
|
ac_cv_c_stack_direction=0
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 18915 "configure"
|
|
+#line 19287 "configure"
|
|
#include "confdefs.h"
|
|
find_stack_direction ()
|
|
{
|
|
@@ -18930,7 +19302,7 @@
|
|
exit (find_stack_direction() < 0);
|
|
}
|
|
EOF
|
|
-if { (eval echo configure:18934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:19306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
ac_cv_c_stack_direction=1
|
|
else
|
|
@@ -18979,17 +19351,17 @@
|
|
do
|
|
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
|
-echo "configure:18983: checking for $ac_hdr" >&5
|
|
+echo "configure:19355: checking for $ac_hdr" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 18988 "configure"
|
|
+#line 19360 "configure"
|
|
#include "confdefs.h"
|
|
#include <$ac_hdr>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:18993: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:19365: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
if test -z "$ac_err"; then
|
|
rm -rf conftest*
|
|
@@ -19080,7 +19452,7 @@
|
|
# 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:19084: checking for $ac_word" >&5
|
|
+echo "configure:19456: 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
|
|
@@ -19124,19 +19496,19 @@
|
|
PKG_CONFIG_MIN_VERSION=0.9.0
|
|
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
|
|
echo $ac_n "checking for cairo >= $CAIRO_VERSION""... $ac_c" 1>&6
|
|
-echo "configure:19128: checking for cairo >= $CAIRO_VERSION" >&5
|
|
+echo "configure:19500: checking for cairo >= $CAIRO_VERSION" >&5
|
|
|
|
if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION" ; then
|
|
echo "$ac_t""yes" 1>&6
|
|
succeeded=yes
|
|
|
|
echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6
|
|
-echo "configure:19135: checking CAIRO_CFLAGS" >&5
|
|
+echo "configure:19507: checking CAIRO_CFLAGS" >&5
|
|
CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION"`
|
|
echo "$ac_t""$CAIRO_CFLAGS" 1>&6
|
|
|
|
echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6
|
|
-echo "configure:19140: checking CAIRO_LIBS" >&5
|
|
+echo "configure:19512: checking CAIRO_LIBS" >&5
|
|
## don't use --libs since that can do evil things like add
|
|
## -Wl,--export-dynamic
|
|
CAIRO_LIBS="`$PKG_CONFIG --libs-only-L \"cairo >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo >= $CAIRO_VERSION\"`"
|
|
@@ -19201,7 +19573,7 @@
|
|
# Extract the first word of "python", so it can be a program name with args.
|
|
set dummy python; ac_word=$2
|
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
|
-echo "configure:19205: checking for $ac_word" >&5
|
|
+echo "configure:19577: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -19477,14 +19849,14 @@
|
|
cross_compiling=$ac_cv_prog_cc_cross
|
|
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 19481 "configure"
|
|
+#line 19853 "configure"
|
|
#include "confdefs.h"
|
|
#include <gmodule.h>
|
|
int main() {
|
|
int x = 1; x++;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:19488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:19860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
:
|
|
else
|
|
echo "configure: failed program was:" >&5
|
|
@@ -19791,7 +20163,7 @@
|
|
_SAVE_CFLAGS=$CFLAGS
|
|
CFLAGS="$CFLAGS $XCFLAGS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 19795 "configure"
|
|
+#line 20167 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <stdio.h>
|
|
@@ -19807,7 +20179,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:19811: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:20183: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
:
|
|
else
|
|
echo "configure: failed program was:" >&5
|
|
@@ -20025,34 +20397,15 @@
|
|
# Transform confdefs.h into DEFS.
|
|
# Protect against shell expansion while executing Makefile rules.
|
|
# Protect against Makefile macro expansion.
|
|
-#
|
|
-# If the first sed substitution is executed (which looks for macros that
|
|
-# take arguments), then we branch to the quote section. Otherwise,
|
|
-# look for a macro that doesn't take arguments.
|
|
-cat >confdef2opt.sed <<\_ACEOF
|
|
-t clear
|
|
-: clear
|
|
-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g
|
|
-t quote
|
|
-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g
|
|
-t quote
|
|
-d
|
|
-: quote
|
|
-s,[ `~#$^&*(){}\\|;'"<>?],\\&,g
|
|
-s,\[,\\&,g
|
|
-s,\],\\&,g
|
|
-s,\$,$$,g
|
|
-p
|
|
-_ACEOF
|
|
-# We use echo to avoid assuming a particular line-breaking character.
|
|
-# The extra dot is to prevent the shell from consuming trailing
|
|
-# line-breaks from the sub-command output. A line-break within
|
|
-# single-quotes doesn't work because, if this script is created in a
|
|
-# platform that uses two characters for line-breaks (e.g., DOS), tr
|
|
-# would break.
|
|
-ac_LF_and_DOT=`echo; echo .`
|
|
-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
|
|
-rm -f confdef2opt.sed
|
|
+cat > conftest.defs <<\EOF
|
|
+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
|
|
+s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g
|
|
+s%\[%\\&%g
|
|
+s%\]%\\&%g
|
|
+s%\$%$$%g
|
|
+EOF
|
|
+DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
|
|
+rm -f conftest.defs
|
|
|
|
MOZ_DEFINES=$DEFS
|
|
|
|
@@ -20299,6 +20652,9 @@
|
|
s%@MOZ_GTK2_LIBS@%$MOZ_GTK2_LIBS%g
|
|
s%@HOST_MOC@%$HOST_MOC%g
|
|
s%@MOZ_DEFAULT_TOOLKIT@%$MOZ_DEFAULT_TOOLKIT%g
|
|
+s%@MOZ_STARTUP_NOTIFICATION_CFLAGS@%$MOZ_STARTUP_NOTIFICATION_CFLAGS%g
|
|
+s%@MOZ_STARTUP_NOTIFICATION_LIBS@%$MOZ_STARTUP_NOTIFICATION_LIBS%g
|
|
+s%@MOZ_ENABLE_STARTUP_NOTIFICATION@%$MOZ_ENABLE_STARTUP_NOTIFICATION%g
|
|
s%@TK_CFLAGS@%$TK_CFLAGS%g
|
|
s%@TK_LIBS@%$TK_LIBS%g
|
|
s%@MOZ_ENABLE_GTK@%$MOZ_ENABLE_GTK%g
|
|
@@ -20335,23 +20691,30 @@
|
|
s%@MOZ_ENABLE_FREETYPE2@%$MOZ_ENABLE_FREETYPE2%g
|
|
s%@MOZ_XFT_CFLAGS@%$MOZ_XFT_CFLAGS%g
|
|
s%@MOZ_XFT_LIBS@%$MOZ_XFT_LIBS%g
|
|
-s%@_PANGOCHK_CFLAGS@%$_PANGOCHK_CFLAGS%g
|
|
-s%@_PANGOCHK_LIBS@%$_PANGOCHK_LIBS%g
|
|
-s%@MOZ_ENABLE_XFT@%$MOZ_ENABLE_XFT%g
|
|
s%@MOZ_PANGO_CFLAGS@%$MOZ_PANGO_CFLAGS%g
|
|
s%@MOZ_PANGO_LIBS@%$MOZ_PANGO_LIBS%g
|
|
+s%@MOZ_ENABLE_XFT@%$MOZ_ENABLE_XFT%g
|
|
+s%@PANGOCAIRO_CHK_CFLAGS@%$PANGOCAIRO_CHK_CFLAGS%g
|
|
+s%@PANGOCAIRO_CHK_LIBS@%$PANGOCAIRO_CHK_LIBS%g
|
|
s%@MOZ_ENABLE_PANGO@%$MOZ_ENABLE_PANGO%g
|
|
+s%@MOZ_PANGOCAIRO@%$MOZ_PANGOCAIRO%g
|
|
s%@MOZ_ENABLE_COREXFONTS@%$MOZ_ENABLE_COREXFONTS%g
|
|
s%@MOZ_GNOMEVFS_CFLAGS@%$MOZ_GNOMEVFS_CFLAGS%g
|
|
s%@MOZ_GNOMEVFS_LIBS@%$MOZ_GNOMEVFS_LIBS%g
|
|
s%@MOZ_GCONF_CFLAGS@%$MOZ_GCONF_CFLAGS%g
|
|
s%@MOZ_GCONF_LIBS@%$MOZ_GCONF_LIBS%g
|
|
+s%@MOZ_ENABLE_GCONF@%$MOZ_ENABLE_GCONF%g
|
|
s%@MOZ_LIBGNOME_CFLAGS@%$MOZ_LIBGNOME_CFLAGS%g
|
|
s%@MOZ_LIBGNOME_LIBS@%$MOZ_LIBGNOME_LIBS%g
|
|
s%@MOZ_ENABLE_GNOME_COMPONENT@%$MOZ_ENABLE_GNOME_COMPONENT%g
|
|
s%@MOZ_GNOMEUI_CFLAGS@%$MOZ_GNOMEUI_CFLAGS%g
|
|
s%@MOZ_GNOMEUI_LIBS@%$MOZ_GNOMEUI_LIBS%g
|
|
s%@MOZ_ENABLE_GNOMEUI@%$MOZ_ENABLE_GNOMEUI%g
|
|
+s%@MOZ_DBUS_GLIB_CFLAGS@%$MOZ_DBUS_GLIB_CFLAGS%g
|
|
+s%@MOZ_DBUS_GLIB_LIBS@%$MOZ_DBUS_GLIB_LIBS%g
|
|
+s%@MOZ_GTHREAD_CFLAGS@%$MOZ_GTHREAD_CFLAGS%g
|
|
+s%@MOZ_GTHREAD_LIBS@%$MOZ_GTHREAD_LIBS%g
|
|
+s%@MOZ_ENABLE_DBUS@%$MOZ_ENABLE_DBUS%g
|
|
s%@MOZ_EXTRA_X11CONVERTERS@%$MOZ_EXTRA_X11CONVERTERS%g
|
|
s%@MOZ_PLAINTEXT_EDITOR_ONLY@%$MOZ_PLAINTEXT_EDITOR_ONLY%g
|
|
s%@MOZ_COMPOSER@%$MOZ_COMPOSER%g
|