forked from pool/MozillaFirefox
6089 lines
229 KiB
Diff
6089 lines
229 KiB
Diff
Index: configure
|
|
===================================================================
|
|
RCS file: /cvsroot/mozilla/configure,v
|
|
retrieving revision 1.1492.2.127
|
|
diff -u -r1.1492.2.127 configure
|
|
--- configure 8 Nov 2007 19:22:51 -0000 1.1492.2.127
|
|
+++ configure 27 Nov 2007 11:57:04 -0000
|
|
@@ -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
|
|
@@ -1214,7 +1219,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:1218: checking for $ac_word" >&5
|
|
+echo "configure:1223: 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
|
|
@@ -1285,13 +1290,13 @@
|
|
_SAVE_LDFLAGS="$LDFLAGS"
|
|
|
|
echo $ac_n "checking for host c compiler""... $ac_c" 1>&6
|
|
-echo "configure:1289: checking for host c compiler" >&5
|
|
+echo "configure:1294: 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:1295: checking for $ac_word" >&5
|
|
+echo "configure:1300: 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
|
|
@@ -1326,13 +1331,13 @@
|
|
fi
|
|
echo "$ac_t""$HOST_CC" 1>&6
|
|
echo $ac_n "checking for host c++ compiler""... $ac_c" 1>&6
|
|
-echo "configure:1330: checking for host c++ compiler" >&5
|
|
+echo "configure:1335: 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:1336: checking for $ac_word" >&5
|
|
+echo "configure:1341: 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
|
|
@@ -1381,7 +1386,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:1385: checking for $ac_word" >&5
|
|
+echo "configure:1390: 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
|
|
@@ -1416,7 +1421,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:1420: checking for $ac_word" >&5
|
|
+echo "configure:1425: 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
|
|
@@ -1451,16 +1456,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:1455: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5
|
|
+echo "configure:1460: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 1457 "configure"
|
|
+#line 1462 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
return(0);
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:1464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:1469: \"$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
|
|
@@ -1475,16 +1480,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:1479: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5
|
|
+echo "configure:1484: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 1481 "configure"
|
|
+#line 1486 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
return(0);
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:1488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:1493: \"$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
|
|
@@ -1513,7 +1518,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:1517: checking for $ac_word" >&5
|
|
+echo "configure:1522: 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
|
|
@@ -1547,7 +1552,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:1551: checking for $ac_word" >&5
|
|
+echo "configure:1556: 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
|
|
@@ -1577,7 +1582,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:1581: checking for $ac_word" >&5
|
|
+echo "configure:1586: 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
|
|
@@ -1628,7 +1633,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:1632: checking for $ac_word" >&5
|
|
+echo "configure:1637: 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
|
|
@@ -1660,7 +1665,7 @@
|
|
fi
|
|
|
|
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
|
|
-echo "configure:1664: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
|
|
+echo "configure:1669: 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.
|
|
@@ -1671,12 +1676,12 @@
|
|
|
|
cat > conftest.$ac_ext << EOF
|
|
|
|
-#line 1675 "configure"
|
|
+#line 1680 "configure"
|
|
#include "confdefs.h"
|
|
|
|
main(){return(0);}
|
|
EOF
|
|
-if { (eval echo configure:1680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:1685: \"$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
|
|
@@ -1702,12 +1707,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:1706: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
|
|
+echo "configure:1711: 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:1711: checking whether we are using GNU C" >&5
|
|
+echo "configure:1716: 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
|
|
@@ -1716,7 +1721,7 @@
|
|
yes;
|
|
#endif
|
|
EOF
|
|
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1720: \"$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:1725: \"$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
|
|
@@ -1735,7 +1740,7 @@
|
|
ac_save_CFLAGS="$CFLAGS"
|
|
CFLAGS=
|
|
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
|
|
-echo "configure:1739: checking whether ${CC-cc} accepts -g" >&5
|
|
+echo "configure:1744: 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
|
|
@@ -1771,7 +1776,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:1775: checking for $ac_word" >&5
|
|
+echo "configure:1780: 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
|
|
@@ -1807,7 +1812,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:1811: checking for $ac_word" >&5
|
|
+echo "configure:1816: 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
|
|
@@ -1839,7 +1844,7 @@
|
|
|
|
|
|
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
|
|
-echo "configure:1843: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
|
|
+echo "configure:1848: 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.
|
|
@@ -1850,12 +1855,12 @@
|
|
|
|
cat > conftest.$ac_ext << EOF
|
|
|
|
-#line 1854 "configure"
|
|
+#line 1859 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main(){return(0);}
|
|
EOF
|
|
-if { (eval echo configure:1859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:1864: \"$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
|
|
@@ -1881,12 +1886,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:1885: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
|
|
+echo "configure:1890: 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:1890: checking whether we are using GNU C++" >&5
|
|
+echo "configure:1895: 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
|
|
@@ -1895,7 +1900,7 @@
|
|
yes;
|
|
#endif
|
|
EOF
|
|
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1899: \"$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:1904: \"$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
|
|
@@ -1914,7 +1919,7 @@
|
|
ac_save_CXXFLAGS="$CXXFLAGS"
|
|
CXXFLAGS=
|
|
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
|
|
-echo "configure:1918: checking whether ${CXX-g++} accepts -g" >&5
|
|
+echo "configure:1923: 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
|
|
@@ -1945,57 +1950,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 1959 "configure"
|
|
-#include "confdefs.h"
|
|
-#include <stdlib.h>
|
|
-$ac_declaration
|
|
-int main() {
|
|
-exit (42);
|
|
-; return 0; }
|
|
-EOF
|
|
-if { (eval echo configure:1967: \"$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 1977 "configure"
|
|
-#include "confdefs.h"
|
|
-$ac_declaration
|
|
-int main() {
|
|
-exit (42);
|
|
-; return 0; }
|
|
-EOF
|
|
-if { (eval echo configure:1984: \"$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*)
|
|
@@ -2009,7 +1963,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:2013: checking for $ac_word" >&5
|
|
+echo "configure:1967: 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
|
|
@@ -2044,7 +1998,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:2048: checking for $ac_word" >&5
|
|
+echo "configure:2002: 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
|
|
@@ -2079,7 +2033,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:2083: checking for $ac_word" >&5
|
|
+echo "configure:2037: 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
|
|
@@ -2120,7 +2074,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:2124: checking for $ac_word" >&5
|
|
+echo "configure:2078: 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
|
|
@@ -2155,7 +2109,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:2159: checking for $ac_word" >&5
|
|
+echo "configure:2113: 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
|
|
@@ -2190,7 +2144,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:2194: checking for $ac_word" >&5
|
|
+echo "configure:2148: 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
|
|
@@ -2228,7 +2182,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:2232: checking for $ac_word" >&5
|
|
+echo "configure:2186: 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
|
|
@@ -2258,7 +2212,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:2262: checking for $ac_word" >&5
|
|
+echo "configure:2216: 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
|
|
@@ -2309,7 +2263,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:2313: checking for $ac_word" >&5
|
|
+echo "configure:2267: 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
|
|
@@ -2341,7 +2295,7 @@
|
|
fi
|
|
|
|
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
|
|
-echo "configure:2345: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
|
|
+echo "configure:2299: 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.
|
|
@@ -2352,12 +2306,12 @@
|
|
|
|
cat > conftest.$ac_ext << EOF
|
|
|
|
-#line 2356 "configure"
|
|
+#line 2310 "configure"
|
|
#include "confdefs.h"
|
|
|
|
main(){return(0);}
|
|
EOF
|
|
-if { (eval echo configure:2361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:2315: \"$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
|
|
@@ -2383,12 +2337,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:2387: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
|
|
+echo "configure:2341: 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:2392: checking whether we are using GNU C" >&5
|
|
+echo "configure:2346: 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
|
|
@@ -2397,7 +2351,7 @@
|
|
yes;
|
|
#endif
|
|
EOF
|
|
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2401: \"$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:2355: \"$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
|
|
@@ -2416,7 +2370,7 @@
|
|
ac_save_CFLAGS="$CFLAGS"
|
|
CFLAGS=
|
|
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
|
|
-echo "configure:2420: checking whether ${CC-cc} accepts -g" >&5
|
|
+echo "configure:2374: 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
|
|
@@ -2452,7 +2406,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:2456: checking for $ac_word" >&5
|
|
+echo "configure:2410: 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
|
|
@@ -2484,7 +2438,7 @@
|
|
|
|
|
|
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
|
|
-echo "configure:2488: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
|
|
+echo "configure:2442: 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.
|
|
@@ -2495,12 +2449,12 @@
|
|
|
|
cat > conftest.$ac_ext << EOF
|
|
|
|
-#line 2499 "configure"
|
|
+#line 2453 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main(){return(0);}
|
|
EOF
|
|
-if { (eval echo configure:2504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:2458: \"$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
|
|
@@ -2526,12 +2480,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:2530: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
|
|
+echo "configure:2484: 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:2535: checking whether we are using GNU C++" >&5
|
|
+echo "configure:2489: 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
|
|
@@ -2540,7 +2494,7 @@
|
|
yes;
|
|
#endif
|
|
EOF
|
|
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2544: \"$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:2498: \"$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
|
|
@@ -2559,7 +2513,7 @@
|
|
ac_save_CXXFLAGS="$CXXFLAGS"
|
|
CXXFLAGS=
|
|
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
|
|
-echo "configure:2563: checking whether ${CXX-g++} accepts -g" >&5
|
|
+echo "configure:2517: 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
|
|
@@ -2590,61 +2544,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 2604 "configure"
|
|
-#include "confdefs.h"
|
|
-#include <stdlib.h>
|
|
-$ac_declaration
|
|
-int main() {
|
|
-exit (42);
|
|
-; return 0; }
|
|
-EOF
|
|
-if { (eval echo configure:2612: \"$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 2622 "configure"
|
|
-#include "confdefs.h"
|
|
-$ac_declaration
|
|
-int main() {
|
|
-exit (42);
|
|
-; return 0; }
|
|
-EOF
|
|
-if { (eval echo configure:2629: \"$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:2648: checking for $ac_word" >&5
|
|
+echo "configure:2551: 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
|
|
@@ -2676,7 +2579,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:2680: checking for $ac_word" >&5
|
|
+echo "configure:2583: 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
|
|
@@ -2717,7 +2620,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:2721: checking for $ac_word" >&5
|
|
+echo "configure:2624: 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
|
|
@@ -2752,7 +2655,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:2756: checking for $ac_word" >&5
|
|
+echo "configure:2659: 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
|
|
@@ -2787,7 +2690,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:2791: checking for $ac_word" >&5
|
|
+echo "configure:2694: 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
|
|
@@ -2822,7 +2725,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:2826: checking for $ac_word" >&5
|
|
+echo "configure:2729: 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
|
|
@@ -2911,7 +2814,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:2915: checking for $ac_word" >&5
|
|
+echo "configure:2818: 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
|
|
@@ -2953,14 +2856,14 @@
|
|
cross_compiling=$ac_cv_prog_cc_cross
|
|
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 2957 "configure"
|
|
+#line 2860 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdio.h>
|
|
int main() {
|
|
printf("Hello World\n");
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:2964: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:2867: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
:
|
|
else
|
|
echo "configure: failed program was:" >&5
|
|
@@ -2978,14 +2881,14 @@
|
|
cross_compiling=$ac_cv_prog_cxx_cross
|
|
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 2982 "configure"
|
|
+#line 2885 "configure"
|
|
#include "confdefs.h"
|
|
#include <new.h>
|
|
int main() {
|
|
unsigned *test = new unsigned(42);
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:2989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:2892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
:
|
|
else
|
|
echo "configure: failed program was:" >&5
|
|
@@ -3041,7 +2944,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:3045: checking for midl flags" >&5
|
|
+echo "configure:2948: 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
|
|
@@ -3063,9 +2966,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:3067: checking for w32api version >= $W32API_VERSION" >&5
|
|
+echo "configure:2970: checking for w32api version >= $W32API_VERSION" >&5
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 3069 "configure"
|
|
+#line 2972 "configure"
|
|
#include "confdefs.h"
|
|
#include <w32api.h>
|
|
int main() {
|
|
@@ -3077,7 +2980,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:3081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:2984: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
res=yes
|
|
else
|
|
@@ -3093,7 +2996,7 @@
|
|
fi
|
|
# Check windres version
|
|
echo $ac_n "checking for windres version >= $WINDRES_VERSION""... $ac_c" 1>&6
|
|
-echo "configure:3097: checking for windres version >= $WINDRES_VERSION" >&5
|
|
+echo "configure:3000: 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 }'`
|
|
@@ -3120,7 +3023,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:3124: checking how to run the C preprocessor" >&5
|
|
+echo "configure:3027: checking how to run the C preprocessor" >&5
|
|
# On Suns, sometimes $CPP names a directory.
|
|
if test -n "$CPP" && test -d "$CPP"; then
|
|
CPP=
|
|
@@ -3135,13 +3038,13 @@
|
|
# On the NeXT, cc -E runs the code through the compiler's parser,
|
|
# not just through cpp.
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 3139 "configure"
|
|
+#line 3042 "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:3145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:3048: \"$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
|
|
:
|
|
@@ -3152,13 +3055,13 @@
|
|
rm -rf conftest*
|
|
CPP="${CC-cc} -E -traditional-cpp"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 3156 "configure"
|
|
+#line 3059 "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:3162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:3065: \"$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
|
|
:
|
|
@@ -3169,13 +3072,13 @@
|
|
rm -rf conftest*
|
|
CPP="${CC-cc} -nologo -E"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 3173 "configure"
|
|
+#line 3076 "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:3179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:3082: \"$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
|
|
:
|
|
@@ -3203,17 +3106,17 @@
|
|
do
|
|
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
|
-echo "configure:3207: checking for $ac_hdr" >&5
|
|
+echo "configure:3110: 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 3212 "configure"
|
|
+#line 3115 "configure"
|
|
#include "confdefs.h"
|
|
#include <$ac_hdr>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:3217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:3120: \"$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*
|
|
@@ -3244,10 +3147,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:3248: checking whether $CC and cc understand -c and -o together" >&5
|
|
+echo "configure:3151: 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:3251: checking whether cc understands -c and -o together" >&5
|
|
+echo "configure:3154: 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]/_/'`"
|
|
@@ -3259,16 +3162,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:3263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
|
|
- test -f conftest.o && { (eval echo configure:3264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
|
|
+if { (eval echo configure:3166: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
|
|
+ test -f conftest.o && { (eval echo configure:3167: \"$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:3269: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
|
|
+ if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3172: \"$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:3271: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
|
|
- test -f conftest.o && { (eval echo configure:3272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
|
|
+ if { (eval echo configure:3174: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
|
|
+ test -f conftest.o && { (eval echo configure:3175: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
|
|
then
|
|
# cc works too.
|
|
:
|
|
@@ -3304,7 +3207,7 @@
|
|
fi
|
|
|
|
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
|
|
-echo "configure:3308: checking how to run the C preprocessor" >&5
|
|
+echo "configure:3211: checking how to run the C preprocessor" >&5
|
|
# On Suns, sometimes $CPP names a directory.
|
|
if test -n "$CPP" && test -d "$CPP"; then
|
|
CPP=
|
|
@@ -3319,13 +3222,13 @@
|
|
# On the NeXT, cc -E runs the code through the compiler's parser,
|
|
# not just through cpp.
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 3323 "configure"
|
|
+#line 3226 "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:3329: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:3232: \"$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
|
|
:
|
|
@@ -3336,13 +3239,13 @@
|
|
rm -rf conftest*
|
|
CPP="${CC-cc} -E -traditional-cpp"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 3340 "configure"
|
|
+#line 3243 "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:3346: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:3249: \"$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
|
|
:
|
|
@@ -3353,13 +3256,13 @@
|
|
rm -rf conftest*
|
|
CPP="${CC-cc} -nologo -E"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 3357 "configure"
|
|
+#line 3260 "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:3363: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:3266: \"$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
|
|
:
|
|
@@ -3384,7 +3287,7 @@
|
|
echo "$ac_t""$CPP" 1>&6
|
|
|
|
echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
|
|
-echo "configure:3388: checking how to run the C++ preprocessor" >&5
|
|
+echo "configure:3291: 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
|
|
@@ -3397,12 +3300,12 @@
|
|
cross_compiling=$ac_cv_prog_cxx_cross
|
|
CXXCPP="${CXX-g++} -E"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 3401 "configure"
|
|
+#line 3304 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdlib.h>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:3406: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:3309: \"$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
|
|
:
|
|
@@ -3449,7 +3352,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:3453: checking for a BSD compatible install" >&5
|
|
+echo "configure:3356: 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
|
|
@@ -3502,7 +3405,7 @@
|
|
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
|
|
|
|
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
|
|
-echo "configure:3506: checking whether ln -s works" >&5
|
|
+echo "configure:3409: 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
|
|
@@ -3527,7 +3430,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:3531: checking for $ac_word" >&5
|
|
+echo "configure:3434: 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
|
|
@@ -3567,7 +3470,7 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for minimum required perl version >= $PERL_VERSION""... $ac_c" 1>&6
|
|
-echo "configure:3571: checking for minimum required perl version >= $PERL_VERSION" >&5
|
|
+echo "configure:3474: 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
|
|
@@ -3577,7 +3480,7 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for full perl installation""... $ac_c" 1>&6
|
|
-echo "configure:3581: checking for full perl installation" >&5
|
|
+echo "configure:3484: 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
|
|
@@ -3590,7 +3493,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:3594: checking for $ac_word" >&5
|
|
+echo "configure:3497: 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
|
|
@@ -3626,7 +3529,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:3630: checking for $ac_word" >&5
|
|
+echo "configure:3533: 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
|
|
@@ -3662,7 +3565,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:3666: checking for $ac_word" >&5
|
|
+echo "configure:3569: 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
|
|
@@ -3698,7 +3601,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:3702: checking for $ac_word" >&5
|
|
+echo "configure:3605: 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
|
|
@@ -3736,7 +3639,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:3740: checking for $ac_word" >&5
|
|
+echo "configure:3643: 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
|
|
@@ -3777,7 +3680,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:3781: checking for $ac_word" >&5
|
|
+echo "configure:3684: 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
|
|
@@ -3812,7 +3715,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:3816: checking for $ac_word" >&5
|
|
+echo "configure:3719: 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
|
|
@@ -3875,7 +3778,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:3879: checking for $ac_word" >&5
|
|
+echo "configure:3782: 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
|
|
@@ -3925,7 +3828,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:3929: checking for $ac_word" >&5
|
|
+echo "configure:3832: 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
|
|
@@ -4029,7 +3932,7 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for valid compiler/Mac OS X SDK combination""... $ac_c" 1>&6
|
|
-echo "configure:4033: checking for valid compiler/Mac OS X SDK combination" >&5
|
|
+echo "configure:3936: 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'
|
|
@@ -4038,7 +3941,7 @@
|
|
cross_compiling=$ac_cv_prog_cxx_cross
|
|
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 4042 "configure"
|
|
+#line 3945 "configure"
|
|
#include "confdefs.h"
|
|
#include <new>
|
|
int main() { return 0; }
|
|
@@ -4046,7 +3949,7 @@
|
|
result=yes
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:4050: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:3953: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
result=no
|
|
else
|
|
@@ -4071,7 +3974,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:4075: checking for $ac_word" >&5
|
|
+echo "configure:3978: 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
|
|
@@ -4114,7 +4017,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:4118: checking for $ac_word" >&5
|
|
+echo "configure:4021: 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
|
|
@@ -4182,7 +4085,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:4186: checking for X" >&5
|
|
+echo "configure:4089: checking for X" >&5
|
|
|
|
# Check whether --with-x or --without-x was given.
|
|
if test "${with_x+set}" = set; then
|
|
@@ -4244,12 +4147,12 @@
|
|
|
|
# First, try using that file with no special directory specified.
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 4248 "configure"
|
|
+#line 4151 "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:4253: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:4156: \"$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*
|
|
@@ -4318,14 +4221,14 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-l$x_direct_test_library $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 4322 "configure"
|
|
+#line 4225 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
${x_direct_test_function}()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:4329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:4232: \"$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.
|
|
@@ -4431,17 +4334,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:4435: checking whether -R must be followed by a space" >&5
|
|
+echo "configure:4338: 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 4438 "configure"
|
|
+#line 4341 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:4445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:4348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
rm -rf conftest*
|
|
ac_R_nospace=yes
|
|
else
|
|
@@ -4457,14 +4360,14 @@
|
|
else
|
|
LIBS="$ac_xsave_LIBS -R $x_libraries"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 4461 "configure"
|
|
+#line 4364 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:4468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:4371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
rm -rf conftest*
|
|
ac_R_space=yes
|
|
else
|
|
@@ -4496,7 +4399,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:4500: checking for dnet_ntoa in -ldnet" >&5
|
|
+echo "configure:4403: 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
|
|
@@ -4504,7 +4407,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-ldnet $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 4508 "configure"
|
|
+#line 4411 "configure"
|
|
#include "confdefs.h"
|
|
/* Override any gcc2 internal prototype to avoid an error. */
|
|
#ifdef __cplusplus
|
|
@@ -4518,7 +4421,7 @@
|
|
dnet_ntoa()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:4522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:4425: \"$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
|
|
@@ -4540,7 +4443,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:4544: checking for dnet_ntoa in -ldnet_stub" >&5
|
|
+echo "configure:4447: 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
|
|
@@ -4548,7 +4451,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-ldnet_stub $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 4552 "configure"
|
|
+#line 4455 "configure"
|
|
#include "confdefs.h"
|
|
/* Override any gcc2 internal prototype to avoid an error. */
|
|
#ifdef __cplusplus
|
|
@@ -4562,7 +4465,7 @@
|
|
dnet_ntoa()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:4566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:4469: \"$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
|
|
@@ -4591,12 +4494,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:4595: checking for gethostbyname" >&5
|
|
+echo "configure:4498: 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 4600 "configure"
|
|
+#line 4503 "configure"
|
|
#include "confdefs.h"
|
|
/* System header to define __stub macros and hopefully few prototypes,
|
|
which can conflict with char gethostbyname(); below. */
|
|
@@ -4622,7 +4525,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:4626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:4529: \"$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
|
|
@@ -4643,7 +4546,7 @@
|
|
|
|
if test $ac_cv_func_gethostbyname = no; then
|
|
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
|
|
-echo "configure:4647: checking for gethostbyname in -lnsl" >&5
|
|
+echo "configure:4550: 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
|
|
@@ -4651,7 +4554,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lnsl $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 4655 "configure"
|
|
+#line 4558 "configure"
|
|
#include "confdefs.h"
|
|
/* Override any gcc2 internal prototype to avoid an error. */
|
|
#ifdef __cplusplus
|
|
@@ -4665,7 +4568,7 @@
|
|
gethostbyname()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:4669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:4572: \"$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
|
|
@@ -4695,12 +4598,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:4699: checking for connect" >&5
|
|
+echo "configure:4602: 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 4704 "configure"
|
|
+#line 4607 "configure"
|
|
#include "confdefs.h"
|
|
/* System header to define __stub macros and hopefully few prototypes,
|
|
which can conflict with char connect(); below. */
|
|
@@ -4726,7 +4629,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:4730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:4633: \"$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
|
|
@@ -4747,7 +4650,7 @@
|
|
|
|
if test $ac_cv_func_connect = no; then
|
|
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
|
|
-echo "configure:4751: checking for connect in -lsocket" >&5
|
|
+echo "configure:4654: 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
|
|
@@ -4755,7 +4658,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 4759 "configure"
|
|
+#line 4662 "configure"
|
|
#include "confdefs.h"
|
|
/* Override any gcc2 internal prototype to avoid an error. */
|
|
#ifdef __cplusplus
|
|
@@ -4769,7 +4672,7 @@
|
|
connect()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:4773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:4676: \"$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
|
|
@@ -4793,12 +4696,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:4797: checking for remove" >&5
|
|
+echo "configure:4700: 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 4802 "configure"
|
|
+#line 4705 "configure"
|
|
#include "confdefs.h"
|
|
/* System header to define __stub macros and hopefully few prototypes,
|
|
which can conflict with char remove(); below. */
|
|
@@ -4824,7 +4727,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:4828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:4731: \"$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
|
|
@@ -4845,7 +4748,7 @@
|
|
|
|
if test $ac_cv_func_remove = no; then
|
|
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
|
|
-echo "configure:4849: checking for remove in -lposix" >&5
|
|
+echo "configure:4752: 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
|
|
@@ -4853,7 +4756,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lposix $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 4857 "configure"
|
|
+#line 4760 "configure"
|
|
#include "confdefs.h"
|
|
/* Override any gcc2 internal prototype to avoid an error. */
|
|
#ifdef __cplusplus
|
|
@@ -4867,7 +4770,7 @@
|
|
remove()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:4871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:4774: \"$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
|
|
@@ -4891,12 +4794,12 @@
|
|
|
|
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
|
|
echo $ac_n "checking for shmat""... $ac_c" 1>&6
|
|
-echo "configure:4895: checking for shmat" >&5
|
|
+echo "configure:4798: 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 4900 "configure"
|
|
+#line 4803 "configure"
|
|
#include "confdefs.h"
|
|
/* System header to define __stub macros and hopefully few prototypes,
|
|
which can conflict with char shmat(); below. */
|
|
@@ -4922,7 +4825,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:4926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:4829: \"$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
|
|
@@ -4943,7 +4846,7 @@
|
|
|
|
if test $ac_cv_func_shmat = no; then
|
|
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
|
|
-echo "configure:4947: checking for shmat in -lipc" >&5
|
|
+echo "configure:4850: 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
|
|
@@ -4951,7 +4854,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lipc $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 4955 "configure"
|
|
+#line 4858 "configure"
|
|
#include "confdefs.h"
|
|
/* Override any gcc2 internal prototype to avoid an error. */
|
|
#ifdef __cplusplus
|
|
@@ -4965,7 +4868,7 @@
|
|
shmat()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:4969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:4872: \"$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
|
|
@@ -4998,7 +4901,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:5002: checking for IceConnectionNumber in -lICE" >&5
|
|
+echo "configure:4905: 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
|
|
@@ -5006,7 +4909,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 5010 "configure"
|
|
+#line 4913 "configure"
|
|
#include "confdefs.h"
|
|
/* Override any gcc2 internal prototype to avoid an error. */
|
|
#ifdef __cplusplus
|
|
@@ -5020,7 +4923,7 @@
|
|
IceConnectionNumber()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:5024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:4927: \"$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
|
|
@@ -5458,7 +5361,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:5462: checking whether ld has archive extraction flags" >&5
|
|
+echo "configure:5365: 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
|
|
@@ -5475,14 +5378,14 @@
|
|
LDFLAGS=$force
|
|
LIBS=$unforce
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 5479 "configure"
|
|
+#line 5382 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:5486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:5389: \"$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
|
|
@@ -5515,7 +5418,7 @@
|
|
'
|
|
|
|
echo $ac_n "checking that static assertion macros used in autoconf tests work""... $ac_c" 1>&6
|
|
-echo "configure:5519: checking that static assertion macros used in autoconf tests work" >&5
|
|
+echo "configure:5422: checking that static assertion macros used in autoconf tests work" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_static_assertion_macros_work'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -5529,14 +5432,14 @@
|
|
|
|
ac_cv_static_assertion_macros_work="yes"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 5533 "configure"
|
|
+#line 5436 "configure"
|
|
#include "confdefs.h"
|
|
$configure_static_assert_macros
|
|
int main() {
|
|
CONFIGURE_STATIC_ASSERT(1)
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:5540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:5443: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
:
|
|
else
|
|
echo "configure: failed program was:" >&5
|
|
@@ -5546,14 +5449,14 @@
|
|
fi
|
|
rm -f conftest*
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 5550 "configure"
|
|
+#line 5453 "configure"
|
|
#include "confdefs.h"
|
|
$configure_static_assert_macros
|
|
int main() {
|
|
CONFIGURE_STATIC_ASSERT(0)
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:5557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:5460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_static_assertion_macros_work="no"
|
|
else
|
|
@@ -5569,14 +5472,14 @@
|
|
cross_compiling=$ac_cv_prog_cxx_cross
|
|
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 5573 "configure"
|
|
+#line 5476 "configure"
|
|
#include "confdefs.h"
|
|
$configure_static_assert_macros
|
|
int main() {
|
|
CONFIGURE_STATIC_ASSERT(1)
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:5580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:5483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
:
|
|
else
|
|
echo "configure: failed program was:" >&5
|
|
@@ -5586,14 +5489,14 @@
|
|
fi
|
|
rm -f conftest*
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 5590 "configure"
|
|
+#line 5493 "configure"
|
|
#include "confdefs.h"
|
|
$configure_static_assert_macros
|
|
int main() {
|
|
CONFIGURE_STATIC_ASSERT(0)
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:5597: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:5500: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_static_assertion_macros_work="no"
|
|
else
|
|
@@ -5628,16 +5531,16 @@
|
|
cross_compiling=$ac_cv_prog_cc_cross
|
|
|
|
echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6
|
|
-echo "configure:5632: checking for 64-bit OS" >&5
|
|
+echo "configure:5535: checking for 64-bit OS" >&5
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 5634 "configure"
|
|
+#line 5537 "configure"
|
|
#include "confdefs.h"
|
|
$configure_static_assert_macros
|
|
int main() {
|
|
CONFIGURE_STATIC_ASSERT(sizeof(long) == 8)
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:5641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:5544: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
result="yes"
|
|
else
|
|
@@ -5795,9 +5698,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:5799: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5
|
|
+echo "configure:5702: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 5801 "configure"
|
|
+#line 5704 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
@@ -5806,7 +5709,7 @@
|
|
#endif
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:5810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:5713: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
_BAD_COMPILER=
|
|
else
|
|
@@ -5844,17 +5747,17 @@
|
|
do
|
|
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
|
-echo "configure:5848: checking for $ac_hdr" >&5
|
|
+echo "configure:5751: 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 5853 "configure"
|
|
+#line 5756 "configure"
|
|
#include "confdefs.h"
|
|
#include <$ac_hdr>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:5858: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:5761: \"$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*
|
|
@@ -5896,7 +5799,7 @@
|
|
LIBS="$LIBS -lbe"
|
|
if test "$COMPILE_ENVIRONMENT"; then
|
|
echo $ac_n "checking for main in -lbind""... $ac_c" 1>&6
|
|
-echo "configure:5900: checking for main in -lbind" >&5
|
|
+echo "configure:5803: 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
|
|
@@ -5904,14 +5807,14 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lbind $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 5908 "configure"
|
|
+#line 5811 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
main()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:5915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:5818: \"$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
|
|
@@ -5932,7 +5835,7 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for main in -lzeta""... $ac_c" 1>&6
|
|
-echo "configure:5936: checking for main in -lzeta" >&5
|
|
+echo "configure:5839: 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
|
|
@@ -5940,14 +5843,14 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lzeta $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 5944 "configure"
|
|
+#line 5847 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
main()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:5951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:5854: \"$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
|
|
@@ -6015,18 +5918,18 @@
|
|
MACOSX=1
|
|
|
|
echo $ac_n "checking for -dead_strip option to ld""... $ac_c" 1>&6
|
|
-echo "configure:6019: checking for -dead_strip option to ld" >&5
|
|
+echo "configure:5922: checking for -dead_strip option to ld" >&5
|
|
_SAVE_LDFLAGS=$LDFLAGS
|
|
LDFLAGS="$LDFLAGS -Wl,-dead_strip"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 6023 "configure"
|
|
+#line 5926 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
return 0;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:6030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:5933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
rm -rf conftest*
|
|
_HAVE_DEAD_STRIP=1
|
|
else
|
|
@@ -6894,14 +6797,14 @@
|
|
_SAVE_LDFLAGS=$LDFLAGS
|
|
LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 6898 "configure"
|
|
+#line 6801 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdio.h>
|
|
int main() {
|
|
printf("Hello World\n");
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:6905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:6808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
:
|
|
else
|
|
echo "configure: failed program was:" >&5
|
|
@@ -6929,7 +6832,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:6933: checking for Forte compiler version >= WS6U2" >&5
|
|
+echo "configure:6836: 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.
|
|
@@ -6939,7 +6842,7 @@
|
|
cross_compiling=$ac_cv_prog_cxx_cross
|
|
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 6943 "configure"
|
|
+#line 6846 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
@@ -6948,7 +6851,7 @@
|
|
#endif
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:6952: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:6855: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
_BAD_COMPILER=
|
|
else
|
|
@@ -7077,7 +6980,7 @@
|
|
;;
|
|
*-darwin*)
|
|
echo $ac_n "checking for -exported_symbols_list option to ld""... $ac_c" 1>&6
|
|
-echo "configure:7081: checking for -exported_symbols_list option to ld" >&5
|
|
+echo "configure:6984: 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
|
|
@@ -7117,12 +7020,12 @@
|
|
cross_compiling=$ac_cv_prog_cc_cross
|
|
|
|
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
|
|
-echo "configure:7121: checking for ANSI C header files" >&5
|
|
+echo "configure:7024: 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 7126 "configure"
|
|
+#line 7029 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdlib.h>
|
|
#include <stdarg.h>
|
|
@@ -7130,7 +7033,7 @@
|
|
#include <float.h>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:7134: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:7037: \"$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*
|
|
@@ -7147,7 +7050,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 7151 "configure"
|
|
+#line 7054 "configure"
|
|
#include "confdefs.h"
|
|
#include <string.h>
|
|
EOF
|
|
@@ -7165,7 +7068,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 7169 "configure"
|
|
+#line 7072 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdlib.h>
|
|
EOF
|
|
@@ -7186,7 +7089,7 @@
|
|
:
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 7190 "configure"
|
|
+#line 7093 "configure"
|
|
#include "confdefs.h"
|
|
#include <ctype.h>
|
|
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
|
|
@@ -7197,7 +7100,7 @@
|
|
exit (0); }
|
|
|
|
EOF
|
|
-if { (eval echo configure:7201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:7104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
:
|
|
else
|
|
@@ -7221,12 +7124,12 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for working const""... $ac_c" 1>&6
|
|
-echo "configure:7225: checking for working const" >&5
|
|
+echo "configure:7128: 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 7230 "configure"
|
|
+#line 7133 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
@@ -7275,7 +7178,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:7279: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:7182: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_c_const=yes
|
|
else
|
|
@@ -7296,12 +7199,12 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for mode_t""... $ac_c" 1>&6
|
|
-echo "configure:7300: checking for mode_t" >&5
|
|
+echo "configure:7203: 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 7305 "configure"
|
|
+#line 7208 "configure"
|
|
#include "confdefs.h"
|
|
#include <sys/types.h>
|
|
#if STDC_HEADERS
|
|
@@ -7329,12 +7232,12 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for off_t""... $ac_c" 1>&6
|
|
-echo "configure:7333: checking for off_t" >&5
|
|
+echo "configure:7236: 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 7338 "configure"
|
|
+#line 7241 "configure"
|
|
#include "confdefs.h"
|
|
#include <sys/types.h>
|
|
#if STDC_HEADERS
|
|
@@ -7362,12 +7265,12 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for pid_t""... $ac_c" 1>&6
|
|
-echo "configure:7366: checking for pid_t" >&5
|
|
+echo "configure:7269: 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 7371 "configure"
|
|
+#line 7274 "configure"
|
|
#include "confdefs.h"
|
|
#include <sys/types.h>
|
|
#if STDC_HEADERS
|
|
@@ -7395,12 +7298,12 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for size_t""... $ac_c" 1>&6
|
|
-echo "configure:7399: checking for size_t" >&5
|
|
+echo "configure:7302: 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 7404 "configure"
|
|
+#line 7307 "configure"
|
|
#include "confdefs.h"
|
|
#include <sys/types.h>
|
|
#if STDC_HEADERS
|
|
@@ -7428,12 +7331,12 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
|
|
-echo "configure:7432: checking for st_blksize in struct stat" >&5
|
|
+echo "configure:7335: 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 7437 "configure"
|
|
+#line 7340 "configure"
|
|
#include "confdefs.h"
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
@@ -7441,7 +7344,7 @@
|
|
struct stat s; s.st_blksize;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:7445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:7348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_struct_st_blksize=yes
|
|
else
|
|
@@ -7462,12 +7365,12 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6
|
|
-echo "configure:7466: checking for siginfo_t" >&5
|
|
+echo "configure:7369: 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 7471 "configure"
|
|
+#line 7374 "configure"
|
|
#include "confdefs.h"
|
|
#define _POSIX_C_SOURCE 199506L
|
|
#include <signal.h>
|
|
@@ -7475,7 +7378,7 @@
|
|
siginfo_t* info;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:7479: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:7382: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_siginfo_t=true
|
|
else
|
|
@@ -7509,12 +7412,12 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for int16_t""... $ac_c" 1>&6
|
|
-echo "configure:7513: checking for int16_t" >&5
|
|
+echo "configure:7416: 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 7518 "configure"
|
|
+#line 7421 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
@@ -7522,7 +7425,7 @@
|
|
int16_t foo = 0;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:7526: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:7429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_int16_t=true
|
|
else
|
|
@@ -7544,12 +7447,12 @@
|
|
echo "$ac_t""no" 1>&6
|
|
fi
|
|
echo $ac_n "checking for int32_t""... $ac_c" 1>&6
|
|
-echo "configure:7548: checking for int32_t" >&5
|
|
+echo "configure:7451: 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 7553 "configure"
|
|
+#line 7456 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
@@ -7557,7 +7460,7 @@
|
|
int32_t foo = 0;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:7561: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:7464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_int32_t=true
|
|
else
|
|
@@ -7579,12 +7482,12 @@
|
|
echo "$ac_t""no" 1>&6
|
|
fi
|
|
echo $ac_n "checking for int64_t""... $ac_c" 1>&6
|
|
-echo "configure:7583: checking for int64_t" >&5
|
|
+echo "configure:7486: 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 7588 "configure"
|
|
+#line 7491 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
@@ -7592,7 +7495,7 @@
|
|
int64_t foo = 0;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:7596: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:7499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_int64_t=true
|
|
else
|
|
@@ -7614,12 +7517,12 @@
|
|
echo "$ac_t""no" 1>&6
|
|
fi
|
|
echo $ac_n "checking for int64""... $ac_c" 1>&6
|
|
-echo "configure:7618: checking for int64" >&5
|
|
+echo "configure:7521: 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 7623 "configure"
|
|
+#line 7526 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
@@ -7627,7 +7530,7 @@
|
|
int64 foo = 0;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:7631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:7534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_int64=true
|
|
else
|
|
@@ -7649,12 +7552,12 @@
|
|
echo "$ac_t""no" 1>&6
|
|
fi
|
|
echo $ac_n "checking for uint""... $ac_c" 1>&6
|
|
-echo "configure:7653: checking for uint" >&5
|
|
+echo "configure:7556: 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 7658 "configure"
|
|
+#line 7561 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
@@ -7662,7 +7565,7 @@
|
|
uint foo = 0;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:7666: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:7569: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_uint=true
|
|
else
|
|
@@ -7684,12 +7587,12 @@
|
|
echo "$ac_t""no" 1>&6
|
|
fi
|
|
echo $ac_n "checking for uint_t""... $ac_c" 1>&6
|
|
-echo "configure:7688: checking for uint_t" >&5
|
|
+echo "configure:7591: 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 7693 "configure"
|
|
+#line 7596 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
@@ -7697,7 +7600,7 @@
|
|
uint_t foo = 0;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:7701: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:7604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_uint_t=true
|
|
else
|
|
@@ -7719,12 +7622,12 @@
|
|
echo "$ac_t""no" 1>&6
|
|
fi
|
|
echo $ac_n "checking for uint16_t""... $ac_c" 1>&6
|
|
-echo "configure:7723: checking for uint16_t" >&5
|
|
+echo "configure:7626: 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 7728 "configure"
|
|
+#line 7631 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
@@ -7732,7 +7635,7 @@
|
|
uint16_t foo = 0;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:7736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:7639: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_uint16_t=true
|
|
else
|
|
@@ -7763,12 +7666,12 @@
|
|
|
|
|
|
echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6
|
|
-echo "configure:7767: checking for uname.domainname" >&5
|
|
+echo "configure:7670: 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 7772 "configure"
|
|
+#line 7675 "configure"
|
|
#include "confdefs.h"
|
|
#include <sys/utsname.h>
|
|
int main() {
|
|
@@ -7776,7 +7679,7 @@
|
|
(void)uname(res); if (res != 0) { domain = res->domainname; }
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:7780: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:7683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_have_uname_domainname_field=true
|
|
else
|
|
@@ -7800,12 +7703,12 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6
|
|
-echo "configure:7804: checking for uname.__domainname" >&5
|
|
+echo "configure:7707: 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 7809 "configure"
|
|
+#line 7712 "configure"
|
|
#include "confdefs.h"
|
|
#include <sys/utsname.h>
|
|
int main() {
|
|
@@ -7813,7 +7716,7 @@
|
|
(void)uname(res); if (res != 0) { domain = res->__domainname; }
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:7817: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:7720: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_have_uname_us_domainname_field=true
|
|
else
|
|
@@ -7846,12 +7749,12 @@
|
|
|
|
|
|
echo $ac_n "checking for usable wchar_t (2 bytes, unsigned)""... $ac_c" 1>&6
|
|
-echo "configure:7850: checking for usable wchar_t (2 bytes, unsigned)" >&5
|
|
+echo "configure:7753: checking for usable wchar_t (2 bytes, unsigned)" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_v2'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 7855 "configure"
|
|
+#line 7758 "configure"
|
|
#include "confdefs.h"
|
|
#include <stddef.h>
|
|
$configure_static_assert_macros
|
|
@@ -7860,7 +7763,7 @@
|
|
CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0)
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:7864: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:7767: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_have_usable_wchar_v2="yes"
|
|
else
|
|
@@ -7893,12 +7796,12 @@
|
|
CXXFLAGS="$CXXFLAGS -fshort-wchar"
|
|
|
|
echo $ac_n "checking for compiler -fshort-wchar option""... $ac_c" 1>&6
|
|
-echo "configure:7897: checking for compiler -fshort-wchar option" >&5
|
|
+echo "configure:7800: checking for compiler -fshort-wchar option" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_option_v2'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 7902 "configure"
|
|
+#line 7805 "configure"
|
|
#include "confdefs.h"
|
|
#include <stddef.h>
|
|
$configure_static_assert_macros
|
|
@@ -7907,7 +7810,7 @@
|
|
CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0)
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:7911: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:7814: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_have_usable_wchar_option_v2="yes"
|
|
else
|
|
@@ -7941,7 +7844,7 @@
|
|
|
|
if test "$GNU_CC"; then
|
|
echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6
|
|
-echo "configure:7945: checking for visibility(hidden) attribute" >&5
|
|
+echo "configure:7848: 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
|
|
@@ -7966,7 +7869,7 @@
|
|
|
|
|
|
echo $ac_n "checking for visibility(default) attribute""... $ac_c" 1>&6
|
|
-echo "configure:7970: checking for visibility(default) attribute" >&5
|
|
+echo "configure:7873: 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
|
|
@@ -7991,7 +7894,7 @@
|
|
|
|
|
|
echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6
|
|
-echo "configure:7995: checking for visibility pragma support" >&5
|
|
+echo "configure:7898: 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
|
|
@@ -8016,7 +7919,7 @@
|
|
echo "$ac_t""$ac_cv_visibility_pragma" 1>&6
|
|
if test "$ac_cv_visibility_pragma" = "yes"; then
|
|
echo $ac_n "checking For gcc visibility bug with class-level attributes (GCC bug 26905)""... $ac_c" 1>&6
|
|
-echo "configure:8020: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5
|
|
+echo "configure:7923: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_have_visibility_class_bug'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -8044,7 +7947,7 @@
|
|
echo "$ac_t""$ac_cv_have_visibility_class_bug" 1>&6
|
|
|
|
echo $ac_n "checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)""... $ac_c" 1>&6
|
|
-echo "configure:8048: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5
|
|
+echo "configure:7951: 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
|
|
@@ -8092,12 +7995,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:8096: checking for $ac_hdr that defines DIR" >&5
|
|
+echo "configure:7999: 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 8101 "configure"
|
|
+#line 8004 "configure"
|
|
#include "confdefs.h"
|
|
#include <sys/types.h>
|
|
#include <$ac_hdr>
|
|
@@ -8105,7 +8008,7 @@
|
|
DIR *dirp = 0;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:8109: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:8012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
eval "ac_cv_header_dirent_$ac_safe=yes"
|
|
else
|
|
@@ -8130,7 +8033,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:8134: checking for opendir in -ldir" >&5
|
|
+echo "configure:8037: 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
|
|
@@ -8138,7 +8041,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-ldir $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 8142 "configure"
|
|
+#line 8045 "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
|
|
@@ -8149,7 +8052,7 @@
|
|
opendir()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:8153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:8056: \"$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
|
|
@@ -8171,7 +8074,7 @@
|
|
|
|
else
|
|
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
|
|
-echo "configure:8175: checking for opendir in -lx" >&5
|
|
+echo "configure:8078: 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
|
|
@@ -8179,7 +8082,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lx $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 8183 "configure"
|
|
+#line 8086 "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
|
|
@@ -8190,7 +8093,7 @@
|
|
opendir()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:8194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:8097: \"$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
|
|
@@ -8222,17 +8125,17 @@
|
|
do
|
|
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
|
-echo "configure:8226: checking for $ac_hdr" >&5
|
|
+echo "configure:8129: 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 8231 "configure"
|
|
+#line 8134 "configure"
|
|
#include "confdefs.h"
|
|
#include <$ac_hdr>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:8236: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:8139: \"$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*
|
|
@@ -8262,17 +8165,17 @@
|
|
do
|
|
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
|
-echo "configure:8266: checking for $ac_hdr" >&5
|
|
+echo "configure:8169: 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 8271 "configure"
|
|
+#line 8174 "configure"
|
|
#include "confdefs.h"
|
|
#include <$ac_hdr>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:8276: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:8179: \"$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*
|
|
@@ -8302,17 +8205,17 @@
|
|
do
|
|
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
|
-echo "configure:8306: checking for $ac_hdr" >&5
|
|
+echo "configure:8209: 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 8311 "configure"
|
|
+#line 8214 "configure"
|
|
#include "confdefs.h"
|
|
#include <$ac_hdr>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:8316: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:8219: \"$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*
|
|
@@ -8342,17 +8245,17 @@
|
|
do
|
|
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
|
-echo "configure:8346: checking for $ac_hdr" >&5
|
|
+echo "configure:8249: 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 8351 "configure"
|
|
+#line 8254 "configure"
|
|
#include "confdefs.h"
|
|
#include <$ac_hdr>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:8356: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:8259: \"$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*
|
|
@@ -8382,17 +8285,17 @@
|
|
do
|
|
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
|
-echo "configure:8386: checking for $ac_hdr" >&5
|
|
+echo "configure:8289: 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 8391 "configure"
|
|
+#line 8294 "configure"
|
|
#include "confdefs.h"
|
|
#include <$ac_hdr>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:8396: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:8299: \"$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*
|
|
@@ -8423,17 +8326,17 @@
|
|
do
|
|
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
|
-echo "configure:8427: checking for $ac_hdr" >&5
|
|
+echo "configure:8330: 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 8432 "configure"
|
|
+#line 8335 "configure"
|
|
#include "confdefs.h"
|
|
#include <$ac_hdr>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:8437: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:8340: \"$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*
|
|
@@ -8464,17 +8367,17 @@
|
|
do
|
|
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
|
-echo "configure:8468: checking for $ac_hdr" >&5
|
|
+echo "configure:8371: 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 8473 "configure"
|
|
+#line 8376 "configure"
|
|
#include "confdefs.h"
|
|
#include <$ac_hdr>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:8478: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:8381: \"$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*
|
|
@@ -8511,17 +8414,17 @@
|
|
NEW_H=new.h
|
|
ac_safe=`echo "new" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for new""... $ac_c" 1>&6
|
|
-echo "configure:8515: checking for new" >&5
|
|
+echo "configure:8418: 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 8520 "configure"
|
|
+#line 8423 "configure"
|
|
#include "confdefs.h"
|
|
#include <new>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:8525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:8428: \"$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*
|
|
@@ -8562,17 +8465,17 @@
|
|
do
|
|
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
|
-echo "configure:8566: checking for $ac_hdr" >&5
|
|
+echo "configure:8469: 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 8571 "configure"
|
|
+#line 8474 "configure"
|
|
#include "confdefs.h"
|
|
#include <$ac_hdr>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:8576: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:8479: \"$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*
|
|
@@ -8606,7 +8509,7 @@
|
|
;;
|
|
*)
|
|
echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6
|
|
-echo "configure:8610: checking for gethostbyname_r in -lc_r" >&5
|
|
+echo "configure:8513: 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
|
|
@@ -8614,7 +8517,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lc_r $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 8618 "configure"
|
|
+#line 8521 "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
|
|
@@ -8625,7 +8528,7 @@
|
|
gethostbyname_r()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:8629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:8532: \"$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
|
|
@@ -8655,7 +8558,7 @@
|
|
;;
|
|
esac
|
|
echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6
|
|
-echo "configure:8659: checking for atan in -lm" >&5
|
|
+echo "configure:8562: 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
|
|
@@ -8663,7 +8566,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lm $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 8667 "configure"
|
|
+#line 8570 "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
|
|
@@ -8674,7 +8577,7 @@
|
|
atan()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:8678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:8581: \"$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
|
|
@@ -8708,7 +8611,7 @@
|
|
;;
|
|
*)
|
|
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
|
|
-echo "configure:8712: checking for dlopen in -ldl" >&5
|
|
+echo "configure:8615: 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
|
|
@@ -8716,7 +8619,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-ldl $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 8720 "configure"
|
|
+#line 8623 "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
|
|
@@ -8727,7 +8630,7 @@
|
|
dlopen()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:8731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:8634: \"$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
|
|
@@ -8744,17 +8647,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:8748: checking for dlfcn.h" >&5
|
|
+echo "configure:8651: 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 8753 "configure"
|
|
+#line 8656 "configure"
|
|
#include "confdefs.h"
|
|
#include <dlfcn.h>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:8758: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:8661: \"$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*
|
|
@@ -8790,7 +8693,7 @@
|
|
case $target in
|
|
*-aix*)
|
|
echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6
|
|
-echo "configure:8794: checking for demangle in -lC_r" >&5
|
|
+echo "configure:8697: 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
|
|
@@ -8798,7 +8701,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lC_r $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 8802 "configure"
|
|
+#line 8705 "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
|
|
@@ -8809,7 +8712,7 @@
|
|
demangle()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:8813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:8716: \"$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
|
|
@@ -8839,7 +8742,7 @@
|
|
;;
|
|
*)
|
|
echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6
|
|
-echo "configure:8843: checking for demangle in -lC" >&5
|
|
+echo "configure:8746: 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
|
|
@@ -8847,7 +8750,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lC $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 8851 "configure"
|
|
+#line 8754 "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
|
|
@@ -8858,7 +8761,7 @@
|
|
demangle()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:8862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:8765: \"$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
|
|
@@ -8889,7 +8792,7 @@
|
|
esac
|
|
fi
|
|
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
|
|
-echo "configure:8893: checking for socket in -lsocket" >&5
|
|
+echo "configure:8796: 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
|
|
@@ -8897,7 +8800,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lsocket $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 8901 "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
|
|
@@ -8908,7 +8811,7 @@
|
|
socket()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:8912: \"$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
|
|
@@ -8953,7 +8856,7 @@
|
|
_SAVE_LDFLAGS="$LDFLAGS"
|
|
LDFLAGS="$XLDFLAGS $LDFLAGS"
|
|
echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6
|
|
-echo "configure:8957: checking for XDrawLines in -lX11" >&5
|
|
+echo "configure:8860: 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
|
|
@@ -8961,7 +8864,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lX11 $XLIBS $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 8965 "configure"
|
|
+#line 8868 "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
|
|
@@ -8972,7 +8875,7 @@
|
|
XDrawLines()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:8976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:8879: \"$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
|
|
@@ -8994,7 +8897,7 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6
|
|
-echo "configure:8998: checking for XextAddDisplay in -lXext" >&5
|
|
+echo "configure:8901: 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
|
|
@@ -9002,7 +8905,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lXext $XLIBS $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 9006 "configure"
|
|
+#line 8909 "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
|
|
@@ -9013,7 +8916,7 @@
|
|
XextAddDisplay()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:9017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:8920: \"$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
|
|
@@ -9037,7 +8940,7 @@
|
|
|
|
|
|
echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6
|
|
-echo "configure:9041: checking for XtFree in -lXt" >&5
|
|
+echo "configure:8944: 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
|
|
@@ -9045,7 +8948,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lXt $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 9049 "configure"
|
|
+#line 8952 "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
|
|
@@ -9056,7 +8959,7 @@
|
|
XtFree()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:9060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:8963: \"$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
|
|
@@ -9077,7 +8980,7 @@
|
|
|
|
unset ac_cv_lib_Xt_XtFree
|
|
echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6
|
|
-echo "configure:9081: checking for IceFlush in -lICE" >&5
|
|
+echo "configure:8984: 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
|
|
@@ -9085,7 +8988,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lICE $XT_LIBS $XLIBS $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 9089 "configure"
|
|
+#line 8992 "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
|
|
@@ -9096,7 +8999,7 @@
|
|
IceFlush()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:9100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:9003: \"$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
|
|
@@ -9117,7 +9020,7 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6
|
|
-echo "configure:9121: checking for SmcCloseConnection in -lSM" >&5
|
|
+echo "configure:9024: 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
|
|
@@ -9125,7 +9028,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lSM $XT_LIBS $XLIBS $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 9129 "configure"
|
|
+#line 9032 "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
|
|
@@ -9136,7 +9039,7 @@
|
|
SmcCloseConnection()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:9140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:9043: \"$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
|
|
@@ -9157,7 +9060,7 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6
|
|
-echo "configure:9161: checking for XtFree in -lXt" >&5
|
|
+echo "configure:9064: 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
|
|
@@ -9165,7 +9068,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lXt $X_PRE_LIBS $XT_LIBS $XLIBS $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 9169 "configure"
|
|
+#line 9072 "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
|
|
@@ -9176,7 +9079,7 @@
|
|
XtFree()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:9180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:9083: \"$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
|
|
@@ -9210,7 +9113,7 @@
|
|
esac
|
|
|
|
echo $ac_n "checking for XineramaIsActive in -lXinerama""... $ac_c" 1>&6
|
|
-echo "configure:9214: checking for XineramaIsActive in -lXinerama" >&5
|
|
+echo "configure:9117: 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
|
|
@@ -9218,7 +9121,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lXinerama $XLIBS $XEXT_LIBS $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 9222 "configure"
|
|
+#line 9125 "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
|
|
@@ -9229,7 +9132,7 @@
|
|
XineramaIsActive()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:9233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:9136: \"$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
|
|
@@ -9251,17 +9154,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:9255: checking for X11/extensions/Xinerama.h" >&5
|
|
+echo "configure:9158: 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 9260 "configure"
|
|
+#line 9163 "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:9265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:9168: \"$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*
|
|
@@ -9284,7 +9187,7 @@
|
|
|
|
|
|
echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6
|
|
-echo "configure:9288: checking for XShmCreateImage in -lXext" >&5
|
|
+echo "configure:9191: 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
|
|
@@ -9292,7 +9195,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lXext $XLIBS $XEXT_LIBS $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 9296 "configure"
|
|
+#line 9199 "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
|
|
@@ -9303,7 +9206,7 @@
|
|
XShmCreateImage()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:9307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:9210: \"$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
|
|
@@ -9325,17 +9228,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:9329: checking for X11/extensions/XShm.h" >&5
|
|
+echo "configure:9232: 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 9334 "configure"
|
|
+#line 9237 "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:9339: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:9242: \"$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*
|
|
@@ -9365,7 +9268,7 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for XieFloGeometry in -lXIE""... $ac_c" 1>&6
|
|
-echo "configure:9369: checking for XieFloGeometry in -lXIE" >&5
|
|
+echo "configure:9272: 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
|
|
@@ -9373,7 +9276,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lXIE $XLIBS $XEXT_LIBS $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 9377 "configure"
|
|
+#line 9280 "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
|
|
@@ -9384,7 +9287,7 @@
|
|
XieFloGeometry()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:9388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:9291: \"$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
|
|
@@ -9406,17 +9309,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:9410: checking for X11/extensions/XIElib.h" >&5
|
|
+echo "configure:9313: 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 9415 "configure"
|
|
+#line 9318 "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:9420: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:9323: \"$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*
|
|
@@ -9490,7 +9393,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:9494: checking for $ac_word" >&5
|
|
+echo "configure:9397: 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
|
|
@@ -9526,7 +9429,7 @@
|
|
|
|
min_ft_version=6.1.0
|
|
echo $ac_n "checking for FreeType - version >= $min_ft_version""... $ac_c" 1>&6
|
|
-echo "configure:9530: checking for FreeType - version >= $min_ft_version" >&5
|
|
+echo "configure:9433: checking for FreeType - version >= $min_ft_version" >&5
|
|
no_ft=""
|
|
if test "$FT2_CONFIG" = "no" ; then
|
|
no_ft=yes
|
|
@@ -9574,7 +9477,7 @@
|
|
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 9578 "configure"
|
|
+#line 9481 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <ft2build.h>
|
|
@@ -9600,7 +9503,7 @@
|
|
}
|
|
|
|
EOF
|
|
-if { (eval echo configure:9604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:9507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
:
|
|
else
|
|
@@ -9652,7 +9555,7 @@
|
|
|
|
|
|
echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
|
|
-echo "configure:9656: checking for pthread_create in -lpthreads" >&5
|
|
+echo "configure:9559: checking for pthread_create in -lpthreads" >&5
|
|
echo "
|
|
#include <pthread.h>
|
|
void *foo(void *v) { int a = 1; }
|
|
@@ -9674,7 +9577,7 @@
|
|
echo "$ac_t""no" 1>&6
|
|
|
|
echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
|
|
-echo "configure:9678: checking for pthread_create in -lpthread" >&5
|
|
+echo "configure:9581: checking for pthread_create in -lpthread" >&5
|
|
echo "
|
|
#include <pthread.h>
|
|
void *foo(void *v) { int a = 1; }
|
|
@@ -9696,7 +9599,7 @@
|
|
echo "$ac_t""no" 1>&6
|
|
|
|
echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
|
|
-echo "configure:9700: checking for pthread_create in -lc_r" >&5
|
|
+echo "configure:9603: checking for pthread_create in -lc_r" >&5
|
|
echo "
|
|
#include <pthread.h>
|
|
void *foo(void *v) { int a = 1; }
|
|
@@ -9718,7 +9621,7 @@
|
|
echo "$ac_t""no" 1>&6
|
|
|
|
echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6
|
|
-echo "configure:9722: checking for pthread_create in -lc" >&5
|
|
+echo "configure:9625: checking for pthread_create in -lc" >&5
|
|
echo "
|
|
#include <pthread.h>
|
|
void *foo(void *v) { int a = 1; }
|
|
@@ -9774,7 +9677,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:9778: checking whether ${CC-cc} accepts -pthread" >&5
|
|
+echo "configure:9681: 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
|
|
@@ -9797,7 +9700,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:9801: checking whether ${CC-cc} accepts -pthreads" >&5
|
|
+echo "configure:9704: 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
|
|
@@ -9919,7 +9822,7 @@
|
|
|
|
|
|
echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6
|
|
-echo "configure:9923: checking whether mmap() sees write()s" >&5
|
|
+echo "configure:9826: checking whether mmap() sees write()s" >&5
|
|
|
|
|
|
mmap_test_prog='
|
|
@@ -9958,11 +9861,11 @@
|
|
result="yes"
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 9962 "configure"
|
|
+#line 9865 "configure"
|
|
#include "confdefs.h"
|
|
$mmap_test_prog
|
|
EOF
|
|
-if { (eval echo configure:9966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:9869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
result="yes"
|
|
else
|
|
@@ -9987,13 +9890,13 @@
|
|
|
|
if test $ac_cv_prog_gcc = yes; then
|
|
echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
|
|
-echo "configure:9991: checking whether ${CC-cc} needs -traditional" >&5
|
|
+echo "configure:9894: 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 9997 "configure"
|
|
+#line 9900 "configure"
|
|
#include "confdefs.h"
|
|
#include <sgtty.h>
|
|
Autoconf TIOCGETP
|
|
@@ -10011,7 +9914,7 @@
|
|
|
|
if test $ac_cv_prog_gcc_traditional = no; then
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 10015 "configure"
|
|
+#line 9918 "configure"
|
|
#include "confdefs.h"
|
|
#include <termio.h>
|
|
Autoconf TCGETA
|
|
@@ -10033,7 +9936,7 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
|
|
-echo "configure:10037: checking for 8-bit clean memcmp" >&5
|
|
+echo "configure:9940: 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
|
|
@@ -10041,7 +9944,7 @@
|
|
ac_cv_func_memcmp_clean=no
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 10045 "configure"
|
|
+#line 9948 "configure"
|
|
#include "confdefs.h"
|
|
|
|
main()
|
|
@@ -10051,7 +9954,7 @@
|
|
}
|
|
|
|
EOF
|
|
-if { (eval echo configure:10055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:9958: \"$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
|
|
@@ -10071,12 +9974,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:10075: checking for $ac_func" >&5
|
|
+echo "configure:9978: 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 10080 "configure"
|
|
+#line 9983 "configure"
|
|
#include "confdefs.h"
|
|
/* System header to define __stub macros and hopefully few prototypes,
|
|
which can conflict with char $ac_func(); below. */
|
|
@@ -10099,7 +10002,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:10006: \"$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
|
|
@@ -10126,12 +10029,12 @@
|
|
for ac_func in flockfile getpagesize
|
|
do
|
|
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
|
-echo "configure:10130: checking for $ac_func" >&5
|
|
+echo "configure:10033: 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 10135 "configure"
|
|
+#line 10038 "configure"
|
|
#include "confdefs.h"
|
|
/* System header to define __stub macros and hopefully few prototypes,
|
|
which can conflict with char $ac_func(); below. */
|
|
@@ -10154,7 +10057,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:10061: \"$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
|
|
@@ -10183,12 +10086,12 @@
|
|
for ac_func in localtime_r strtok_r
|
|
do
|
|
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
|
-echo "configure:10187: checking for $ac_func" >&5
|
|
+echo "configure:10090: 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 10192 "configure"
|
|
+#line 10095 "configure"
|
|
#include "confdefs.h"
|
|
/* System header to define __stub macros and hopefully few prototypes,
|
|
which can conflict with char $ac_func(); below. */
|
|
@@ -10211,7 +10114,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:10118: \"$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
|
|
@@ -10247,19 +10150,19 @@
|
|
cross_compiling=$ac_cv_prog_cxx_cross
|
|
|
|
echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6
|
|
-echo "configure:10251: checking for wcrtomb" >&5
|
|
+echo "configure:10154: 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 10256 "configure"
|
|
+#line 10159 "configure"
|
|
#include "confdefs.h"
|
|
#include <wchar.h>
|
|
int main() {
|
|
mbstate_t ps={0};wcrtomb(0,'f',&ps);
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:10166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
rm -rf conftest*
|
|
ac_cv_have_wcrtomb="yes"
|
|
else
|
|
@@ -10279,19 +10182,19 @@
|
|
|
|
fi
|
|
echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6
|
|
-echo "configure:10283: checking for mbrtowc" >&5
|
|
+echo "configure:10186: 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 10288 "configure"
|
|
+#line 10191 "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:10295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:10198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
rm -rf conftest*
|
|
ac_cv_have_mbrtowc="yes"
|
|
else
|
|
@@ -10320,12 +10223,12 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6
|
|
-echo "configure:10324: checking for res_ninit()" >&5
|
|
+echo "configure:10227: 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 10329 "configure"
|
|
+#line 10232 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#ifdef linux
|
|
@@ -10337,7 +10240,7 @@
|
|
int foo = res_ninit(&_res);
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:10244: \"$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
|
|
@@ -10367,12 +10270,12 @@
|
|
cross_compiling=$ac_cv_prog_cxx_cross
|
|
|
|
echo $ac_n "checking for gnu_get_libc_version()""... $ac_c" 1>&6
|
|
-echo "configure:10371: checking for gnu_get_libc_version()" >&5
|
|
+echo "configure:10274: 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 10376 "configure"
|
|
+#line 10279 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#ifdef HAVE_GNU_LIBC_VERSION_H
|
|
@@ -10383,7 +10286,7 @@
|
|
const char *glibc_version = gnu_get_libc_version();
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:10290: \"$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
|
|
@@ -10412,7 +10315,7 @@
|
|
*)
|
|
|
|
echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6
|
|
-echo "configure:10416: checking for iconv in -lc" >&5
|
|
+echo "configure:10319: 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
|
|
@@ -10420,7 +10323,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lc $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 10424 "configure"
|
|
+#line 10327 "configure"
|
|
#include "confdefs.h"
|
|
/* Override any gcc2 internal prototype to avoid an error. */
|
|
#ifdef __cplusplus
|
|
@@ -10434,7 +10337,7 @@
|
|
iconv()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:10341: \"$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
|
|
@@ -10453,7 +10356,7 @@
|
|
else
|
|
echo "$ac_t""no" 1>&6
|
|
echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
|
|
-echo "configure:10457: checking for iconv in -liconv" >&5
|
|
+echo "configure:10360: 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
|
|
@@ -10461,7 +10364,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-liconv $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 10465 "configure"
|
|
+#line 10368 "configure"
|
|
#include "confdefs.h"
|
|
/* Override any gcc2 internal prototype to avoid an error. */
|
|
#ifdef __cplusplus
|
|
@@ -10475,7 +10378,7 @@
|
|
iconv()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:10382: \"$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
|
|
@@ -10494,7 +10397,7 @@
|
|
else
|
|
echo "$ac_t""no" 1>&6
|
|
echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
|
|
-echo "configure:10498: checking for libiconv in -liconv" >&5
|
|
+echo "configure:10401: 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
|
|
@@ -10502,7 +10405,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-liconv $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 10506 "configure"
|
|
+#line 10409 "configure"
|
|
#include "confdefs.h"
|
|
/* Override any gcc2 internal prototype to avoid an error. */
|
|
#ifdef __cplusplus
|
|
@@ -10516,7 +10419,7 @@
|
|
libiconv()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:10423: \"$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
|
|
@@ -10543,12 +10446,12 @@
|
|
_SAVE_LIBS=$LIBS
|
|
LIBS="$LIBS $_ICONV_LIBS"
|
|
echo $ac_n "checking for iconv()""... $ac_c" 1>&6
|
|
-echo "configure:10547: checking for iconv()" >&5
|
|
+echo "configure:10450: 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 10552 "configure"
|
|
+#line 10455 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <stdlib.h>
|
|
@@ -10562,7 +10465,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:10469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
rm -rf conftest*
|
|
ac_cv_func_iconv=yes
|
|
else
|
|
@@ -10586,12 +10489,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:10590: checking for iconv() with const input" >&5
|
|
+echo "configure:10493: 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 10595 "configure"
|
|
+#line 10498 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <stdlib.h>
|
|
@@ -10606,7 +10509,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10610: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:10513: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_func_const_iconv=yes
|
|
else
|
|
@@ -10635,19 +10538,19 @@
|
|
|
|
|
|
echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6
|
|
-echo "configure:10639: checking for nl_langinfo and CODESET" >&5
|
|
+echo "configure:10542: 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 10644 "configure"
|
|
+#line 10547 "configure"
|
|
#include "confdefs.h"
|
|
#include <langinfo.h>
|
|
int main() {
|
|
char* cs = nl_langinfo(CODESET);
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:10554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
rm -rf conftest*
|
|
am_cv_langinfo_codeset=yes
|
|
else
|
|
@@ -10679,7 +10582,7 @@
|
|
|
|
|
|
echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6
|
|
-echo "configure:10683: checking for an implementation of va_copy()" >&5
|
|
+echo "configure:10586: 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
|
|
@@ -10689,7 +10592,7 @@
|
|
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 10693 "configure"
|
|
+#line 10596 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <stdarg.h>
|
|
@@ -10703,7 +10606,7 @@
|
|
}
|
|
int main() { f (0, 42); return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:10610: \"$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
|
|
@@ -10720,7 +10623,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:10724: checking for an implementation of __va_copy()" >&5
|
|
+echo "configure:10627: 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
|
|
@@ -10730,7 +10633,7 @@
|
|
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 10734 "configure"
|
|
+#line 10637 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <stdarg.h>
|
|
@@ -10744,7 +10647,7 @@
|
|
}
|
|
int main() { f (0, 42); return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:10651: \"$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
|
|
@@ -10761,7 +10664,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:10765: checking whether va_lists can be copied by value" >&5
|
|
+echo "configure:10668: 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
|
|
@@ -10771,7 +10674,7 @@
|
|
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 10775 "configure"
|
|
+#line 10678 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <stdarg.h>
|
|
@@ -10785,7 +10688,7 @@
|
|
}
|
|
int main() { f (0, 42); return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:10692: \"$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
|
|
@@ -10884,7 +10787,7 @@
|
|
if test "$GNU_CXX"; then
|
|
|
|
echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6
|
|
-echo "configure:10888: checking for C++ exceptions flag" >&5
|
|
+echo "configure:10791: 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
|
|
@@ -10919,12 +10822,12 @@
|
|
HAVE_GCC3_ABI=
|
|
if test "$GNU_CC"; then
|
|
echo $ac_n "checking for gcc 3.0 ABI""... $ac_c" 1>&6
|
|
-echo "configure:10923: checking for gcc 3.0 ABI" >&5
|
|
+echo "configure:10826: 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 10928 "configure"
|
|
+#line 10831 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
@@ -10937,7 +10840,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10941: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:10844: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_gcc_three_abi="yes"
|
|
else
|
|
@@ -10961,12 +10864,12 @@
|
|
|
|
|
|
echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6
|
|
-echo "configure:10965: checking for C++ \"explicit\" keyword" >&5
|
|
+echo "configure:10868: 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 10970 "configure"
|
|
+#line 10873 "configure"
|
|
#include "confdefs.h"
|
|
class X {
|
|
public: explicit X(int i) : i_(i) {}
|
|
@@ -10976,7 +10879,7 @@
|
|
X x(3);
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:10980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:10883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_cpp_explicit=yes
|
|
else
|
|
@@ -10997,12 +10900,12 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for C++ \"typename\" keyword""... $ac_c" 1>&6
|
|
-echo "configure:11001: checking for C++ \"typename\" keyword" >&5
|
|
+echo "configure:10904: 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 11006 "configure"
|
|
+#line 10909 "configure"
|
|
#include "confdefs.h"
|
|
class param {
|
|
public:
|
|
@@ -11021,7 +10924,7 @@
|
|
A.foo(0);
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:11025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:10928: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_cpp_typename=yes
|
|
else
|
|
@@ -11042,12 +10945,12 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6
|
|
-echo "configure:11046: checking for modern C++ template specialization syntax support" >&5
|
|
+echo "configure:10949: 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 11051 "configure"
|
|
+#line 10954 "configure"
|
|
#include "confdefs.h"
|
|
template <class T> struct X { int a; };
|
|
class Y {};
|
|
@@ -11057,7 +10960,7 @@
|
|
X<Y> y_x;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:11061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:10964: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_cpp_modern_specialize_template_syntax=yes
|
|
else
|
|
@@ -11079,12 +10982,12 @@
|
|
|
|
|
|
echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6
|
|
-echo "configure:11083: checking whether partial template specialization works" >&5
|
|
+echo "configure:10986: 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 11088 "configure"
|
|
+#line 10991 "configure"
|
|
#include "confdefs.h"
|
|
template <class T> class Foo {};
|
|
template <class T> class Foo<T*> {};
|
|
@@ -11092,7 +10995,7 @@
|
|
return 0;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:11096: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:10999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_cpp_partial_specialization=yes
|
|
else
|
|
@@ -11113,12 +11016,12 @@
|
|
fi
|
|
|
|
echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6
|
|
-echo "configure:11117: checking whether operators must be re-defined for templates derived from templates" >&5
|
|
+echo "configure:11020: 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 11122 "configure"
|
|
+#line 11025 "configure"
|
|
#include "confdefs.h"
|
|
template <class T> class Base { };
|
|
template <class T>
|
|
@@ -11130,7 +11033,7 @@
|
|
return 0;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:11134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:11037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_need_derived_template_operators=no
|
|
else
|
|
@@ -11152,12 +11055,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:11156: checking whether we need to cast a derived template to pass as its base class" >&5
|
|
+echo "configure:11059: 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 11161 "configure"
|
|
+#line 11064 "configure"
|
|
#include "confdefs.h"
|
|
template <class T> class Base { };
|
|
template <class T> class Derived : public Base<T> { };
|
|
@@ -11166,7 +11069,7 @@
|
|
Derived<char> bar; return foo(bar);
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:11170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:11073: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_need_cpp_template_cast_to_base=no
|
|
else
|
|
@@ -11187,12 +11090,12 @@
|
|
fi
|
|
|
|
echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6
|
|
-echo "configure:11191: checking whether the compiler can resolve const ambiguities for templates" >&5
|
|
+echo "configure:11094: 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 11196 "configure"
|
|
+#line 11099 "configure"
|
|
#include "confdefs.h"
|
|
|
|
template <class T> class ptrClass {
|
|
@@ -11213,7 +11116,7 @@
|
|
a(&i);
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:11217: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:11120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_can_resolve_const_ambiguity=yes
|
|
else
|
|
@@ -11235,12 +11138,12 @@
|
|
|
|
|
|
echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6
|
|
-echo "configure:11239: checking whether the C++ \"using\" keyword can change access" >&5
|
|
+echo "configure:11142: 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 11244 "configure"
|
|
+#line 11147 "configure"
|
|
#include "confdefs.h"
|
|
class A { protected: int foo() { return 0; } };
|
|
class B : public A { public: using A::foo; };
|
|
@@ -11248,10 +11151,10 @@
|
|
B b; return b.foo();
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:11252: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:11155: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 11255 "configure"
|
|
+#line 11158 "configure"
|
|
#include "confdefs.h"
|
|
class A { public: int foo() { return 1; } };
|
|
class B : public A { private: using A::foo; };
|
|
@@ -11259,7 +11162,7 @@
|
|
B b; return b.foo();
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:11263: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:11166: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_cpp_access_changing_using2=no
|
|
else
|
|
@@ -11287,12 +11190,12 @@
|
|
fi
|
|
|
|
echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6
|
|
-echo "configure:11291: checking whether the C++ \"using\" keyword resolves ambiguity" >&5
|
|
+echo "configure:11194: 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 11296 "configure"
|
|
+#line 11199 "configure"
|
|
#include "confdefs.h"
|
|
class X {
|
|
public: int go(const X&) {return 3;}
|
|
@@ -11308,7 +11211,7 @@
|
|
X x; Y y; y.jo(x);
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:11312: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:11215: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_cpp_ambiguity_resolving_using=yes
|
|
else
|
|
@@ -11329,19 +11232,19 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6
|
|
-echo "configure:11333: checking for \"std::\" namespace" >&5
|
|
+echo "configure:11236: 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 11338 "configure"
|
|
+#line 11241 "configure"
|
|
#include "confdefs.h"
|
|
#include <algorithm>
|
|
int main() {
|
|
return std::min(0, 1);
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:11345: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:11248: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_cpp_namespace_std=yes
|
|
else
|
|
@@ -11362,12 +11265,12 @@
|
|
fi
|
|
|
|
echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6
|
|
-echo "configure:11366: checking whether standard template operator!=() is ambiguous" >&5
|
|
+echo "configure:11269: 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 11371 "configure"
|
|
+#line 11274 "configure"
|
|
#include "confdefs.h"
|
|
#include <algorithm>
|
|
struct T1 {};
|
|
@@ -11377,7 +11280,7 @@
|
|
T1 a,b; return a != b;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:11381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:11284: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_cpp_unambiguous_std_notequal=unambiguous
|
|
else
|
|
@@ -11399,12 +11302,12 @@
|
|
|
|
|
|
echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6
|
|
-echo "configure:11403: checking for C++ reinterpret_cast" >&5
|
|
+echo "configure:11306: 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 11408 "configure"
|
|
+#line 11311 "configure"
|
|
#include "confdefs.h"
|
|
struct X { int i; };
|
|
struct Y { int i; };
|
|
@@ -11412,7 +11315,7 @@
|
|
X x; X*const z = &x;Y*y = reinterpret_cast<Y*>(z);
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:11416: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:11319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_cpp_reinterpret_cast=yes
|
|
else
|
|
@@ -11433,7 +11336,7 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6
|
|
-echo "configure:11437: checking for C++ dynamic_cast to void*" >&5
|
|
+echo "configure:11340: 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
|
|
@@ -11441,8 +11344,11 @@
|
|
ac_cv_cpp_dynamic_cast_void_ptr=no
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 11445 "configure"
|
|
+#line 11348 "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; };
|
|
@@ -11457,7 +11363,7 @@
|
|
((void*)&mdo == dynamic_cast<void*>(suby))));
|
|
}
|
|
EOF
|
|
-if { (eval echo configure:11461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:11367: \"$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
|
|
@@ -11481,19 +11387,19 @@
|
|
|
|
|
|
echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6
|
|
-echo "configure:11485: checking whether C++ requires implementation of unused virtual methods" >&5
|
|
+echo "configure:11391: 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 11490 "configure"
|
|
+#line 11396 "configure"
|
|
#include "confdefs.h"
|
|
class X {private: virtual void never_called();};
|
|
int main() {
|
|
X x;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:11497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:11403: \"$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
|
|
@@ -11516,12 +11422,12 @@
|
|
|
|
|
|
echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6
|
|
-echo "configure:11520: checking for trouble comparing to zero near std::operator!=()" >&5
|
|
+echo "configure:11426: 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 11525 "configure"
|
|
+#line 11431 "configure"
|
|
#include "confdefs.h"
|
|
#include <algorithm>
|
|
template <class T> class Foo {};
|
|
@@ -11532,7 +11438,7 @@
|
|
Foo<int> f; return (0 != f);
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:11536: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:11442: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_trouble_comparing_to_zero=no
|
|
else
|
|
@@ -11564,19 +11470,19 @@
|
|
|
|
|
|
echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
|
|
-echo "configure:11568: checking for LC_MESSAGES" >&5
|
|
+echo "configure:11474: 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 11573 "configure"
|
|
+#line 11479 "configure"
|
|
#include "confdefs.h"
|
|
#include <locale.h>
|
|
int main() {
|
|
int category = LC_MESSAGES;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:11580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:11486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_cv_i18n_lc_messages=yes
|
|
else
|
|
@@ -11657,7 +11563,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:11661: checking for $ac_word" >&5
|
|
+echo "configure:11567: 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
|
|
@@ -11692,7 +11598,7 @@
|
|
|
|
min_nspr_version=4.0.0
|
|
echo $ac_n "checking for NSPR - version >= $min_nspr_version (skipping)""... $ac_c" 1>&6
|
|
-echo "configure:11696: checking for NSPR - version >= $min_nspr_version (skipping)" >&5
|
|
+echo "configure:11602: checking for NSPR - version >= $min_nspr_version (skipping)" >&5
|
|
|
|
no_nspr=""
|
|
if test "$NSPR_CONFIG" = "no"; then
|
|
@@ -11794,7 +11700,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:11798: checking for $ac_word" >&5
|
|
+echo "configure:11704: 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
|
|
@@ -11829,7 +11735,7 @@
|
|
|
|
min_nss_version=3.0.0
|
|
echo $ac_n "checking for NSS - version >= $min_nss_version (skipping)""... $ac_c" 1>&6
|
|
-echo "configure:11833: checking for NSS - version >= $min_nss_version (skipping)" >&5
|
|
+echo "configure:11739: checking for NSS - version >= $min_nss_version (skipping)" >&5
|
|
|
|
no_nss=""
|
|
if test "$NSS_CONFIG" = "no"; then
|
|
@@ -11902,7 +11808,7 @@
|
|
SYSTEM_JPEG=
|
|
else
|
|
echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6
|
|
-echo "configure:11906: checking for jpeg_destroy_compress in -ljpeg" >&5
|
|
+echo "configure:11812: 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
|
|
@@ -11910,7 +11816,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-ljpeg $JPEG_LIBS $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 11914 "configure"
|
|
+#line 11820 "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
|
|
@@ -11921,7 +11827,7 @@
|
|
jpeg_destroy_compress()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:11925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:11831: \"$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
|
|
@@ -11950,7 +11856,7 @@
|
|
SYSTEM_JPEG=
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 11954 "configure"
|
|
+#line 11860 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
@@ -11964,7 +11870,7 @@
|
|
}
|
|
|
|
EOF
|
|
-if { (eval echo configure:11968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:11874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
SYSTEM_JPEG=1
|
|
else
|
|
@@ -12005,7 +11911,7 @@
|
|
SYSTEM_ZLIB=
|
|
else
|
|
echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6
|
|
-echo "configure:12009: checking for gzread in -lz" >&5
|
|
+echo "configure:11915: 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
|
|
@@ -12013,7 +11919,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lz $ZLIB_LIBS $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 12017 "configure"
|
|
+#line 11923 "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
|
|
@@ -12024,7 +11930,7 @@
|
|
gzread()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:12028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:11934: \"$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
|
|
@@ -12052,7 +11958,7 @@
|
|
SYSTEM_ZLIB=
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 12056 "configure"
|
|
+#line 11962 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <stdio.h>
|
|
@@ -12073,7 +11979,7 @@
|
|
}
|
|
|
|
EOF
|
|
-if { (eval echo configure:12077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:11983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
SYSTEM_ZLIB=1
|
|
else
|
|
@@ -12116,7 +12022,7 @@
|
|
SYSTEM_PNG=
|
|
else
|
|
echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6
|
|
-echo "configure:12120: checking for png_get_valid in -lpng" >&5
|
|
+echo "configure:12026: 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
|
|
@@ -12124,7 +12030,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lpng $PNG_LIBS $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 12128 "configure"
|
|
+#line 12034 "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
|
|
@@ -12135,7 +12041,7 @@
|
|
png_get_valid()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:12139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:12045: \"$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
|
|
@@ -12163,7 +12069,7 @@
|
|
SYSTEM_PNG=
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 12167 "configure"
|
|
+#line 12073 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
@@ -12177,7 +12083,7 @@
|
|
}
|
|
|
|
EOF
|
|
-if { (eval echo configure:12181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:12087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
SYSTEM_PNG=1
|
|
else
|
|
@@ -12427,7 +12333,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:12431: checking for $ac_word" >&5
|
|
+echo "configure:12337: 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
|
|
@@ -12462,7 +12368,7 @@
|
|
|
|
min_gtk_version=$GTK_VERSION
|
|
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
|
|
-echo "configure:12466: checking for GTK - version >= $min_gtk_version" >&5
|
|
+echo "configure:12372: checking for GTK - version >= $min_gtk_version" >&5
|
|
no_gtk=""
|
|
if test "$GTK_CONFIG" = "no" ; then
|
|
no_gtk=yes
|
|
@@ -12485,7 +12391,7 @@
|
|
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 12489 "configure"
|
|
+#line 12395 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <gtk/gtk.h>
|
|
@@ -12563,7 +12469,7 @@
|
|
}
|
|
|
|
EOF
|
|
-if { (eval echo configure:12567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:12473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
:
|
|
else
|
|
@@ -12598,7 +12504,7 @@
|
|
CFLAGS="$CFLAGS $GTK_CFLAGS"
|
|
LIBS="$LIBS $GTK_LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 12602 "configure"
|
|
+#line 12508 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <gtk/gtk.h>
|
|
@@ -12608,7 +12514,7 @@
|
|
return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:12612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:12518: \"$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"
|
|
@@ -12660,7 +12566,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:12664: checking for $ac_word" >&5
|
|
+echo "configure:12570: 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
|
|
@@ -12704,19 +12610,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:12708: checking for gtk+-2.0 >= 1.3.7" >&5
|
|
+echo "configure:12614: 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:12715: checking MOZ_GTK2_CFLAGS" >&5
|
|
+echo "configure:12621: 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:12720: checking MOZ_GTK2_LIBS" >&5
|
|
+echo "configure:12626: 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\"`"
|
|
@@ -12781,7 +12687,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:12785: checking for $ac_word" >&5
|
|
+echo "configure:12691: 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
|
|
@@ -12833,7 +12739,7 @@
|
|
cross_compiling=$ac_cv_prog_cxx_cross
|
|
|
|
echo $ac_n "checking for main in -lqt""... $ac_c" 1>&6
|
|
-echo "configure:12837: checking for main in -lqt" >&5
|
|
+echo "configure:12743: 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
|
|
@@ -12841,14 +12747,14 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lqt $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 12845 "configure"
|
|
+#line 12751 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
main()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:12852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:12758: \"$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
|
|
@@ -12867,7 +12773,7 @@
|
|
else
|
|
echo "$ac_t""no" 1>&6
|
|
echo $ac_n "checking for main in -lqt-mt""... $ac_c" 1>&6
|
|
-echo "configure:12871: checking for main in -lqt-mt" >&5
|
|
+echo "configure:12777: 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
|
|
@@ -12875,14 +12781,14 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lqt-mt $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 12879 "configure"
|
|
+#line 12785 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
main()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:12886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:12792: \"$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
|
|
@@ -12918,9 +12824,9 @@
|
|
LIBS="$LIBS $QT_LIBS"
|
|
|
|
echo $ac_n "checking Qt - version >= $QT_VERSION""... $ac_c" 1>&6
|
|
-echo "configure:12922: checking Qt - version >= $QT_VERSION" >&5
|
|
+echo "configure:12828: checking Qt - version >= $QT_VERSION" >&5
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 12924 "configure"
|
|
+#line 12830 "configure"
|
|
#include "confdefs.h"
|
|
#include <qglobal.h>
|
|
int main() {
|
|
@@ -12931,7 +12837,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:12935: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:12841: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
result="yes"
|
|
else
|
|
@@ -12962,6 +12868,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:12898: 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:12942: 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:12949: 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:12954: 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
|
|
+
|
|
+
|
|
+
|
|
+
|
|
+
|
|
|
|
|
|
|
|
@@ -13527,7 +13565,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:13531: checking for $ac_word" >&5
|
|
+echo "configure:13569: 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
|
|
@@ -13571,19 +13609,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:13575: checking for xft" >&5
|
|
+echo "configure:13613: 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:13582: checking MOZ_XFT_CFLAGS" >&5
|
|
+echo "configure:13620: 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:13587: checking MOZ_XFT_LIBS" >&5
|
|
+echo "configure:13625: 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\"`"
|
|
@@ -13618,7 +13656,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:13622: checking for $ac_word" >&5
|
|
+echo "configure:13660: 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
|
|
@@ -13662,19 +13700,19 @@
|
|
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:13666: checking for pango >= 1.1.0" >&5
|
|
+echo "configure:13704: checking for pango >= 1.1.0" >&5
|
|
|
|
if $PKG_CONFIG --exists "pango >= 1.1.0" ; then
|
|
echo "$ac_t""yes" 1>&6
|
|
succeeded=yes
|
|
|
|
echo $ac_n "checking _PANGOCHK_CFLAGS""... $ac_c" 1>&6
|
|
-echo "configure:13673: checking _PANGOCHK_CFLAGS" >&5
|
|
+echo "configure:13711: checking _PANGOCHK_CFLAGS" >&5
|
|
_PANGOCHK_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.1.0"`
|
|
echo "$ac_t""$_PANGOCHK_CFLAGS" 1>&6
|
|
|
|
echo $ac_n "checking _PANGOCHK_LIBS""... $ac_c" 1>&6
|
|
-echo "configure:13678: checking _PANGOCHK_LIBS" >&5
|
|
+echo "configure:13716: checking _PANGOCHK_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\"`"
|
|
@@ -13734,7 +13772,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:13738: checking for $ac_word" >&5
|
|
+echo "configure:13776: 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
|
|
@@ -13778,19 +13816,19 @@
|
|
PKG_CONFIG_MIN_VERSION=0.9.0
|
|
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
|
|
echo $ac_n "checking for pango >= 1.6.0 pangoft2 >= 1.6.0""... $ac_c" 1>&6
|
|
-echo "configure:13782: checking for pango >= 1.6.0 pangoft2 >= 1.6.0" >&5
|
|
+echo "configure:13820: checking for pango >= 1.6.0 pangoft2 >= 1.6.0" >&5
|
|
|
|
if $PKG_CONFIG --exists "pango >= 1.6.0 pangoft2 >= 1.6.0" ; then
|
|
echo "$ac_t""yes" 1>&6
|
|
succeeded=yes
|
|
|
|
echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6
|
|
-echo "configure:13789: checking MOZ_PANGO_CFLAGS" >&5
|
|
+echo "configure:13827: checking MOZ_PANGO_CFLAGS" >&5
|
|
MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.6.0 pangoft2 >= 1.6.0"`
|
|
echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6
|
|
|
|
echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6
|
|
-echo "configure:13794: checking MOZ_PANGO_LIBS" >&5
|
|
+echo "configure:13832: 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 \"pango >= 1.6.0 pangoft2 >= 1.6.0\"` `$PKG_CONFIG --libs-only-l \"pango >= 1.6.0 pangoft2 >= 1.6.0\"`"
|
|
@@ -13858,7 +13896,7 @@
|
|
_SAVE_LDFLAGS="$LDFLAGS"
|
|
LDFLAGS="$XLDFLAGS $LDFLAGS"
|
|
echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6
|
|
-echo "configure:13862: checking for XpGetPrinterList in -lXp" >&5
|
|
+echo "configure:13900: 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
|
|
@@ -13866,7 +13904,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lXp $XEXT_LIBS $XLIBS $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 13870 "configure"
|
|
+#line 13908 "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
|
|
@@ -13877,7 +13915,7 @@
|
|
XpGetPrinterList()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:13881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:13919: \"$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
|
|
@@ -13950,7 +13988,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:13954: checking for $ac_word" >&5
|
|
+echo "configure:13992: 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
|
|
@@ -13994,19 +14032,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:13998: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5
|
|
+echo "configure:14036: 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:14005: checking MOZ_GNOMEVFS_CFLAGS" >&5
|
|
+echo "configure:14043: 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:14010: checking MOZ_GNOMEVFS_LIBS" >&5
|
|
+echo "configure:14048: 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\"`"
|
|
@@ -14057,7 +14095,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:14061: checking for $ac_word" >&5
|
|
+echo "configure:14099: 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
|
|
@@ -14101,19 +14139,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:14105: checking for gconf-2.0 >= $GCONF_VERSION" >&5
|
|
+echo "configure:14143: 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:14112: checking MOZ_GCONF_CFLAGS" >&5
|
|
+echo "configure:14150: 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:14117: checking MOZ_GCONF_LIBS" >&5
|
|
+echo "configure:14155: 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\"`"
|
|
@@ -14150,6 +14188,7 @@
|
|
|
|
|
|
|
|
+
|
|
|
|
if test "$MOZ_ENABLE_LIBGNOME"
|
|
then
|
|
@@ -14160,7 +14199,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:14164: checking for $ac_word" >&5
|
|
+echo "configure:14203: 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
|
|
@@ -14204,19 +14243,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:14208: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5
|
|
+echo "configure:14247: 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:14215: checking MOZ_LIBGNOME_CFLAGS" >&5
|
|
+echo "configure:14254: 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:14220: checking MOZ_LIBGNOME_LIBS" >&5
|
|
+echo "configure:14259: 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\"`"
|
|
@@ -14294,7 +14333,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:14298: checking for $ac_word" >&5
|
|
+echo "configure:14337: 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
|
|
@@ -14338,19 +14377,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:14342: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5
|
|
+echo "configure:14381: 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:14349: checking MOZ_GNOMEUI_CFLAGS" >&5
|
|
+echo "configure:14388: 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:14354: checking MOZ_GNOMEUI_LIBS" >&5
|
|
+echo "configure:14393: 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\"`"
|
|
@@ -14401,6 +14440,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:14468: 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:14512: 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:14519: 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:14524: 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:14559: 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:14603: 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:14610: 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:14615: 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" \
|
|
@@ -14836,7 +15090,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:14840: checking for $ac_word" >&5
|
|
+echo "configure:15094: 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
|
|
@@ -14872,7 +15126,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:14876: checking for $ac_word" >&5
|
|
+echo "configure:15130: 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
|
|
@@ -14947,6 +15201,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||'`
|
|
@@ -15119,7 +15380,7 @@
|
|
gdiplus)
|
|
MOZ_SVG_RENDERER_GDIPLUS=1
|
|
echo $ac_n "checking for Gdiplus.h""... $ac_c" 1>&6
|
|
-echo "configure:15123: checking for Gdiplus.h" >&5
|
|
+echo "configure:15384: checking for Gdiplus.h" >&5
|
|
|
|
ac_ext=C
|
|
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
|
|
@@ -15129,7 +15390,7 @@
|
|
cross_compiling=$ac_cv_prog_cxx_cross
|
|
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 15133 "configure"
|
|
+#line 15394 "configure"
|
|
#include "confdefs.h"
|
|
#include <windows.h>
|
|
#include <unknwn.h>
|
|
@@ -15138,7 +15399,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:15142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:15403: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
echo "$ac_t""yes" 1>&6
|
|
else
|
|
@@ -15218,7 +15479,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:15222: checking for $ac_word" >&5
|
|
+echo "configure:15483: 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
|
|
@@ -15263,7 +15524,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:15267: checking for $ac_word" >&5
|
|
+echo "configure:15528: 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
|
|
@@ -15332,13 +15593,13 @@
|
|
msvc*|mks*|cygwin*|mingw*|wince*)
|
|
if test -n "$MOZ_UPDATER"; then
|
|
echo $ac_n "checking for iconv""... $ac_c" 1>&6
|
|
-echo "configure:15336: checking for iconv" >&5
|
|
+echo "configure:15597: 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:15342: checking for $ac_word" >&5
|
|
+echo "configure:15603: 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
|
|
@@ -15684,18 +15945,18 @@
|
|
|
|
if test -n "$MOZ_DEBUG"; then
|
|
echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6
|
|
-echo "configure:15688: checking for valid debug flags" >&5
|
|
+echo "configure:15949: checking for valid debug flags" >&5
|
|
_SAVE_CFLAGS=$CFLAGS
|
|
CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 15692 "configure"
|
|
+#line 15953 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdio.h>
|
|
int main() {
|
|
printf("Hello World\n");
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:15699: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:15960: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
_results=yes
|
|
else
|
|
@@ -15736,18 +15997,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:15740: checking for valid optimization flags" >&5
|
|
+echo "configure:16001: checking for valid optimization flags" >&5
|
|
_SAVE_CFLAGS=$CFLAGS
|
|
CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 15744 "configure"
|
|
+#line 16005 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdio.h>
|
|
int main() {
|
|
printf("Hello World\n");
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:15751: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:16012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
_results=yes
|
|
else
|
|
@@ -15964,7 +16225,7 @@
|
|
|
|
if test -n "$_ENABLE_EFENCE"; then
|
|
echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6
|
|
-echo "configure:15968: checking for malloc in -lefence" >&5
|
|
+echo "configure:16229: 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
|
|
@@ -15972,7 +16233,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lefence $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 15976 "configure"
|
|
+#line 16237 "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
|
|
@@ -15983,7 +16244,7 @@
|
|
malloc()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:15987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:16248: \"$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
|
|
@@ -16084,12 +16345,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:16088: checking for $ac_func" >&5
|
|
+echo "configure:16349: 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 16093 "configure"
|
|
+#line 16354 "configure"
|
|
#include "confdefs.h"
|
|
/* System header to define __stub macros and hopefully few prototypes,
|
|
which can conflict with char $ac_func(); below. */
|
|
@@ -16115,7 +16376,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:16119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:16380: \"$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
|
|
@@ -16358,12 +16619,12 @@
|
|
for ac_func in __cxa_demangle
|
|
do
|
|
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
|
-echo "configure:16362: checking for $ac_func" >&5
|
|
+echo "configure:16623: 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 16367 "configure"
|
|
+#line 16628 "configure"
|
|
#include "confdefs.h"
|
|
/* System header to define __stub macros and hopefully few prototypes,
|
|
which can conflict with char $ac_func(); below. */
|
|
@@ -16389,7 +16650,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:16393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:16654: \"$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
|
|
@@ -16527,7 +16788,7 @@
|
|
# Compiler Options
|
|
|
|
echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6
|
|
-echo "configure:16531: checking for gcc -pipe support" >&5
|
|
+echo "configure:16792: 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
|
|
@@ -16542,14 +16803,14 @@
|
|
_SAVE_CFLAGS=$CFLAGS
|
|
CFLAGS="$CFLAGS -pipe"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 16546 "configure"
|
|
+#line 16807 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdio.h>
|
|
int main() {
|
|
printf("Hello World\n");
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:16553: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:16814: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
_res_gcc_pipe="yes"
|
|
else
|
|
@@ -16591,16 +16852,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:16595: checking whether compiler supports -Wno-long-long" >&5
|
|
+echo "configure:16856: checking whether compiler supports -Wno-long-long" >&5
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 16597 "configure"
|
|
+#line 16858 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
return(0);
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:16604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:16865: \"$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"
|
|
@@ -16621,16 +16882,16 @@
|
|
CFLAGS="$CFLAGS -fprofile-generate"
|
|
|
|
echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6
|
|
-echo "configure:16625: checking whether C compiler supports -fprofile-generate" >&5
|
|
+echo "configure:16886: checking whether C compiler supports -fprofile-generate" >&5
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 16627 "configure"
|
|
+#line 16888 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
return 0;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:16634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:16895: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
PROFILE_GEN_CFLAGS="-fprofile-generate"
|
|
result="yes"
|
|
@@ -16648,16 +16909,16 @@
|
|
else
|
|
CFLAGS="$_SAVE_CFLAGS -fprofile-arcs"
|
|
echo $ac_n "checking whether C compiler supports -fprofile-arcs""... $ac_c" 1>&6
|
|
-echo "configure:16652: checking whether C compiler supports -fprofile-arcs" >&5
|
|
+echo "configure:16913: checking whether C compiler supports -fprofile-arcs" >&5
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 16654 "configure"
|
|
+#line 16915 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
return 0;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:16661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:16922: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
PROFILE_GEN_CFLAGS="-fprofile-arcs"
|
|
result="yes"
|
|
@@ -16703,16 +16964,16 @@
|
|
_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:16707: checking whether C++ compiler has -pedantic long long bug" >&5
|
|
+echo "configure:16968: checking whether C++ compiler has -pedantic long long bug" >&5
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 16709 "configure"
|
|
+#line 16970 "configure"
|
|
#include "confdefs.h"
|
|
$configure_static_assert_macros
|
|
int main() {
|
|
CONFIGURE_STATIC_ASSERT(sizeof(long long) == 8)
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:16716: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:16977: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
result="no"
|
|
else
|
|
@@ -16737,13 +16998,16 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6
|
|
-echo "configure:16741: checking for correct temporary object destruction order" >&5
|
|
+echo "configure:17002: checking for correct temporary object destruction order" >&5
|
|
if test "$cross_compiling" = yes; then
|
|
result="maybe"
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 16746 "configure"
|
|
+#line 17007 "configure"
|
|
#include "confdefs.h"
|
|
+#ifdef __cplusplus
|
|
+extern "C" void exit(int);
|
|
+#endif
|
|
class A {
|
|
public: A(int& x) : mValue(x) {}
|
|
~A() { mValue--; }
|
|
@@ -16762,7 +17026,7 @@
|
|
}
|
|
|
|
EOF
|
|
-if { (eval echo configure:16766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:17030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
result="yes"
|
|
else
|
|
@@ -16783,12 +17047,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:16787: checking for correct overload resolution with const and templates" >&5
|
|
+echo "configure:17051: 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 16792 "configure"
|
|
+#line 17056 "configure"
|
|
#include "confdefs.h"
|
|
|
|
template <class T>
|
|
@@ -16818,7 +17082,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:16822: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:17086: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
ac_nscap_nonconst_opeq_bug="no"
|
|
else
|
|
@@ -17110,7 +17374,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:17114: checking for $ac_word" >&5
|
|
+echo "configure:17378: 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
|
|
@@ -17154,19 +17418,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:17158: checking for libIDL-2.0 >= 0.8.0" >&5
|
|
+echo "configure:17422: 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:17165: checking LIBIDL_CFLAGS" >&5
|
|
+echo "configure:17429: 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:17170: checking LIBIDL_LIBS" >&5
|
|
+echo "configure:17434: 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\"`"
|
|
@@ -17289,7 +17553,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:17293: checking for $ac_word" >&5
|
|
+echo "configure:17557: 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
|
|
@@ -17324,7 +17588,7 @@
|
|
|
|
min_glib_version=1.2.0
|
|
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
|
|
-echo "configure:17328: checking for GLIB - version >= $min_glib_version" >&5
|
|
+echo "configure:17592: checking for GLIB - version >= $min_glib_version" >&5
|
|
no_glib=""
|
|
if test "$GLIB_CONFIG" = "no" ; then
|
|
no_glib=yes
|
|
@@ -17347,7 +17611,7 @@
|
|
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 17351 "configure"
|
|
+#line 17615 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <glib.h>
|
|
@@ -17423,7 +17687,7 @@
|
|
}
|
|
|
|
EOF
|
|
-if { (eval echo configure:17427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:17691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
:
|
|
else
|
|
@@ -17457,7 +17721,7 @@
|
|
CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
|
LIBS="$LIBS $GLIB_LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 17461 "configure"
|
|
+#line 17725 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <glib.h>
|
|
@@ -17467,7 +17731,7 @@
|
|
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:17471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:17735: \"$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"
|
|
@@ -17511,7 +17775,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:17515: checking for $ac_word" >&5
|
|
+echo "configure:17779: 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
|
|
@@ -17546,7 +17810,7 @@
|
|
|
|
min_libIDL_version=$LIBIDL_VERSION
|
|
echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6
|
|
-echo "configure:17550: checking for libIDL - version >= $min_libIDL_version" >&5
|
|
+echo "configure:17814: checking for libIDL - version >= $min_libIDL_version" >&5
|
|
no_libIDL=""
|
|
if test "$LIBIDL_CONFIG" = "no" ; then
|
|
no_libIDL=yes
|
|
@@ -17573,7 +17837,7 @@
|
|
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 17577 "configure"
|
|
+#line 17841 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <stdio.h>
|
|
@@ -17659,7 +17923,7 @@
|
|
}
|
|
|
|
EOF
|
|
-if { (eval echo configure:17663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:17927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
:
|
|
else
|
|
@@ -17693,7 +17957,7 @@
|
|
CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
|
|
LIBS="$LIBS $LIBIDL_LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 17697 "configure"
|
|
+#line 17961 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <stdio.h>
|
|
@@ -17704,7 +17968,7 @@
|
|
return IDL_get_libver_string ? 1 : 0;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:17708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:17972: \"$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"
|
|
@@ -17832,7 +18096,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:17836: checking for $ac_word" >&5
|
|
+echo "configure:18100: 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
|
|
@@ -17867,7 +18131,7 @@
|
|
|
|
min_glib_version=1.2.0
|
|
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
|
|
-echo "configure:17871: checking for GLIB - version >= $min_glib_version" >&5
|
|
+echo "configure:18135: checking for GLIB - version >= $min_glib_version" >&5
|
|
no_glib=""
|
|
if test "$GLIB_CONFIG" = "no" ; then
|
|
no_glib=yes
|
|
@@ -17890,7 +18154,7 @@
|
|
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 17894 "configure"
|
|
+#line 18158 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <glib.h>
|
|
@@ -17966,7 +18230,7 @@
|
|
}
|
|
|
|
EOF
|
|
-if { (eval echo configure:17970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:18234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
:
|
|
else
|
|
@@ -18000,7 +18264,7 @@
|
|
CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
|
LIBS="$LIBS $GLIB_LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 18004 "configure"
|
|
+#line 18268 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <glib.h>
|
|
@@ -18010,7 +18274,7 @@
|
|
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:18014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:18278: \"$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"
|
|
@@ -18054,7 +18318,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:18058: checking for $ac_word" >&5
|
|
+echo "configure:18322: 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
|
|
@@ -18089,7 +18353,7 @@
|
|
|
|
min_libIDL_version=$LIBIDL_VERSION
|
|
echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6
|
|
-echo "configure:18093: checking for libIDL - version >= $min_libIDL_version" >&5
|
|
+echo "configure:18357: checking for libIDL - version >= $min_libIDL_version" >&5
|
|
no_libIDL=""
|
|
if test "$LIBIDL_CONFIG" = "no" ; then
|
|
no_libIDL=yes
|
|
@@ -18116,7 +18380,7 @@
|
|
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 18120 "configure"
|
|
+#line 18384 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <stdio.h>
|
|
@@ -18202,7 +18466,7 @@
|
|
}
|
|
|
|
EOF
|
|
-if { (eval echo configure:18206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:18470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
:
|
|
else
|
|
@@ -18236,7 +18500,7 @@
|
|
CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
|
|
LIBS="$LIBS $LIBIDL_LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 18240 "configure"
|
|
+#line 18504 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <stdio.h>
|
|
@@ -18247,7 +18511,7 @@
|
|
return IDL_get_libver_string ? 1 : 0;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:18251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:18515: \"$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"
|
|
@@ -18288,7 +18552,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:18292: checking for $ac_word" >&5
|
|
+echo "configure:18556: 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
|
|
@@ -18332,19 +18596,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:18336: checking for libIDL-2.0 >= 0.8.0" >&5
|
|
+echo "configure:18600: 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:18343: checking LIBIDL_CFLAGS" >&5
|
|
+echo "configure:18607: 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:18348: checking LIBIDL_LIBS" >&5
|
|
+echo "configure:18612: 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\"`"
|
|
@@ -18380,7 +18644,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:18384: checking for $ac_word" >&5
|
|
+echo "configure:18648: 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
|
|
@@ -18417,7 +18681,7 @@
|
|
|
|
if test -n "$ORBIT_CONFIG"; then
|
|
echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6
|
|
-echo "configure:18421: checking for ORBit libIDL usability" >&5
|
|
+echo "configure:18685: 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}`
|
|
@@ -18434,7 +18698,7 @@
|
|
result="maybe"
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 18438 "configure"
|
|
+#line 18702 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <stdlib.h>
|
|
@@ -18449,7 +18713,7 @@
|
|
}
|
|
|
|
EOF
|
|
-if { (eval echo configure:18453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:18717: \"$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"
|
|
@@ -18506,7 +18770,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:18510: checking for $ac_word" >&5
|
|
+echo "configure:18774: 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
|
|
@@ -18550,19 +18814,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:18554: checking for glib-2.0 >= 1.3.7" >&5
|
|
+echo "configure:18818: 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:18561: checking GLIB_CFLAGS" >&5
|
|
+echo "configure:18825: 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:18566: checking GLIB_LIBS" >&5
|
|
+echo "configure:18830: 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\"`"
|
|
@@ -18646,7 +18910,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:18650: checking for $ac_word" >&5
|
|
+echo "configure:18914: 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
|
|
@@ -18681,7 +18945,7 @@
|
|
|
|
min_glib_version=${GLIB_VERSION}
|
|
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
|
|
-echo "configure:18685: checking for GLIB - version >= $min_glib_version" >&5
|
|
+echo "configure:18949: checking for GLIB - version >= $min_glib_version" >&5
|
|
no_glib=""
|
|
if test "$GLIB_CONFIG" = "no" ; then
|
|
no_glib=yes
|
|
@@ -18704,7 +18968,7 @@
|
|
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 18708 "configure"
|
|
+#line 18972 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <glib.h>
|
|
@@ -18780,7 +19044,7 @@
|
|
}
|
|
|
|
EOF
|
|
-if { (eval echo configure:18784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:19048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
then
|
|
:
|
|
else
|
|
@@ -18814,7 +19078,7 @@
|
|
CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
|
LIBS="$LIBS $GLIB_LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 18818 "configure"
|
|
+#line 19082 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <glib.h>
|
|
@@ -18824,7 +19088,7 @@
|
|
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:18828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:19092: \"$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"
|
|
@@ -18904,19 +19168,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:18908: checking for working alloca.h" >&5
|
|
+echo "configure:19172: 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 18913 "configure"
|
|
+#line 19177 "configure"
|
|
#include "confdefs.h"
|
|
#include <alloca.h>
|
|
int main() {
|
|
char *p = alloca(2 * sizeof(int));
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:18920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:19184: \"$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
|
|
@@ -18937,12 +19201,12 @@
|
|
fi
|
|
|
|
echo $ac_n "checking for alloca""... $ac_c" 1>&6
|
|
-echo "configure:18941: checking for alloca" >&5
|
|
+echo "configure:19205: 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 18946 "configure"
|
|
+#line 19210 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#ifdef __GNUC__
|
|
@@ -18970,7 +19234,7 @@
|
|
char *p = (char *) alloca(1);
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:18974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:19238: \"$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
|
|
@@ -19002,12 +19266,12 @@
|
|
|
|
|
|
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
|
|
-echo "configure:19006: checking whether alloca needs Cray hooks" >&5
|
|
+echo "configure:19270: 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 19011 "configure"
|
|
+#line 19275 "configure"
|
|
#include "confdefs.h"
|
|
#if defined(CRAY) && ! defined(CRAY2)
|
|
webecray
|
|
@@ -19032,12 +19296,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:19036: checking for $ac_func" >&5
|
|
+echo "configure:19300: 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 19041 "configure"
|
|
+#line 19305 "configure"
|
|
#include "confdefs.h"
|
|
/* System header to define __stub macros and hopefully few prototypes,
|
|
which can conflict with char $ac_func(); below. */
|
|
@@ -19060,7 +19324,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:19064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:19328: \"$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
|
|
@@ -19087,7 +19351,7 @@
|
|
fi
|
|
|
|
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
|
|
-echo "configure:19091: checking stack direction for C alloca" >&5
|
|
+echo "configure:19355: 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
|
|
@@ -19095,7 +19359,7 @@
|
|
ac_cv_c_stack_direction=0
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 19099 "configure"
|
|
+#line 19363 "configure"
|
|
#include "confdefs.h"
|
|
find_stack_direction ()
|
|
{
|
|
@@ -19114,7 +19378,7 @@
|
|
exit (find_stack_direction() < 0);
|
|
}
|
|
EOF
|
|
-if { (eval echo configure:19118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:19382: \"$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
|
|
@@ -19163,17 +19427,17 @@
|
|
do
|
|
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
|
-echo "configure:19167: checking for $ac_hdr" >&5
|
|
+echo "configure:19431: 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 19172 "configure"
|
|
+#line 19436 "configure"
|
|
#include "confdefs.h"
|
|
#include <$ac_hdr>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:19177: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:19441: \"$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*
|
|
@@ -19264,7 +19528,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:19268: checking for $ac_word" >&5
|
|
+echo "configure:19532: 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
|
|
@@ -19308,19 +19572,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:19312: checking for cairo >= $CAIRO_VERSION" >&5
|
|
+echo "configure:19576: 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:19319: checking CAIRO_CFLAGS" >&5
|
|
+echo "configure:19583: 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:19324: checking CAIRO_LIBS" >&5
|
|
+echo "configure:19588: 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\"`"
|
|
@@ -19385,7 +19649,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:19389: checking for $ac_word" >&5
|
|
+echo "configure:19653: 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
|
|
@@ -19661,14 +19925,14 @@
|
|
cross_compiling=$ac_cv_prog_cc_cross
|
|
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 19665 "configure"
|
|
+#line 19929 "configure"
|
|
#include "confdefs.h"
|
|
#include <gmodule.h>
|
|
int main() {
|
|
int x = 1; x++;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:19672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:19936: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
:
|
|
else
|
|
echo "configure: failed program was:" >&5
|
|
@@ -19975,7 +20239,7 @@
|
|
_SAVE_CFLAGS=$CFLAGS
|
|
CFLAGS="$CFLAGS $XCFLAGS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 19979 "configure"
|
|
+#line 20243 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#include <stdio.h>
|
|
@@ -19991,7 +20255,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:19995: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:20259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
:
|
|
else
|
|
echo "configure: failed program was:" >&5
|
|
@@ -20209,34 +20473,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
|
|
|
|
@@ -20484,6 +20729,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
|
|
@@ -20531,12 +20779,18 @@
|
|
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
|