From a5288481101298be528c7f8cd86426dfbcfdc6e0 Mon Sep 17 00:00:00 2001 From: "briano%netscape.com" Date: Fri, 26 Mar 1999 05:44:30 +0000 Subject: [PATCH] Automated update --- configure | 1157 +++++++++++++++++++++++++---------------------------- 1 file changed, 536 insertions(+), 621 deletions(-) diff --git a/configure b/configure index 34a1348b217..b20b0bf7b8c 100755 --- a/configure +++ b/configure @@ -42,7 +42,7 @@ ac_help="$ac_help ac_help="$ac_help --enable-debug Enable debug symbols" ac_help="$ac_help - --enable-md Use compiler-based dependencies " + --disable-md Use compiler-based dependencies " ac_help="$ac_help --enable-pedantic Issue all warnings demanded by strict ANSI C " ac_help="$ac_help @@ -753,18 +753,19 @@ then # Check for a couple representative files in the source tree for file in $_topsrcdir/Makefile $_topsrcdir/config/autoconf.mk; do if test -f $file; then - echo 2>&1 - echo "Error: Your source tree contains the file," 2>&1 - echo " $file" 2>&1 - echo 2>&1 - echo " This is an indication that you have built in the source tree." 2>&1 - echo " The files that were built in the source tree can mess up the" 2>&1 - echo " separate objdir build in strange and mysterious ways." 2>&1 - echo 2>&1 - echo " You can clean up the source tree with the following steps:" 2>&1 - echo " 1. cd $_topsrcdir" 2>&1 - echo " 2. gmake realclean; build/autoconf/clean-config.sh" 2>&1 - echo 2>&1 + cat 1>&2 <<-EOF + Error: Your source tree contains the file, + $file + + This is an indication that you previously built in the source + tree. Files built in the source tree can confuse the separate + objdir build. + + You can clean up the source tree with the following steps: + 1. cd $_topsrcdir + 2. gmake realclean; build/autoconf/clean-config.sh + + EOF exit 1 break fi @@ -774,7 +775,7 @@ fi # 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:778: checking for $ac_word" >&5 +echo "configure:779: 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 @@ -803,7 +804,7 @@ if test -z "$CC"; then # 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:807: checking for $ac_word" >&5 +echo "configure:808: 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 @@ -851,7 +852,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:855: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:856: 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. @@ -861,11 +862,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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 @@ -885,12 +886,12 @@ if test $ac_cv_prog_cc_works = no; then { 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:889: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:890: 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:894: checking whether we are using GNU C" >&5 +echo "configure:895: 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 @@ -899,7 +900,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:903: \"$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:904: \"$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 @@ -914,7 +915,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:918: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:919: 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 @@ -946,7 +947,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:950: checking for $ac_word" >&5 +echo "configure:951: 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 @@ -977,7 +978,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:981: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:982: 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. @@ -987,11 +988,11 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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 @@ -1017,12 +1018,12 @@ if test $ac_cv_prog_cxx_works = no; then { 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:1021: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1022: 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:1026: checking whether we are using GNU C++" >&5 +echo "configure:1027: 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 @@ -1031,7 +1032,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1035: \"$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:1036: \"$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 @@ -1046,7 +1047,7 @@ if test $ac_cv_prog_gxx = yes; then ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1050: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1051: 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 @@ -1075,10 +1076,10 @@ fi 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:1079: checking whether $CC and cc understand -c and -o together" >&5 +echo "configure:1080: 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:1082: checking whether cc understands -c and -o together" >&5 +echo "configure:1083: 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]/_/'`" @@ -1090,16 +1091,16 @@ else # 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:1094: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:1095: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; +if { (eval echo configure:1095: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:1096: \"$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:1100: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:1101: \"$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:1102: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:1103: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; + if { (eval echo configure:1103: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:1104: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then # cc works too. : @@ -1133,7 +1134,7 @@ if grep "NO_MINUS_C_MINUS_O 1" ./confdefs.h >/dev/null; then CXX="${srcdir}/build/hcpp '$CXX'" fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1137: checking how to run the C preprocessor" >&5 +echo "configure:1138: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1148,13 +1149,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1158: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1159: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1165,13 +1166,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1175: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1176: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1194,7 +1195,7 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1198: checking how to run the C++ preprocessor" >&5 +echo "configure:1199: 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 @@ -1207,12 +1208,12 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1216: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1237,7 +1238,7 @@ CXXCPP="$ac_cv_prog_CXXCPP" echo "$ac_t""$CXXCPP" 1>&6 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1241: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1242: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1274,7 +1275,7 @@ fi # 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:1278: checking for a BSD compatible install" >&5 +echo "configure:1279: 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 @@ -1328,7 +1329,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1332: checking for $ac_word" >&5 +echo "configure:1333: 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 @@ -1359,7 +1360,7 @@ done # 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:1363: checking for $ac_word" >&5 +echo "configure:1364: 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 @@ -1391,7 +1392,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1395: checking for $ac_word" >&5 +echo "configure:1396: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_EMACS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1428,7 +1429,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1432: checking for $ac_word" >&5 +echo "configure:1433: 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 @@ -1463,7 +1464,7 @@ test -n "$PERL" || PERL=":" # 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:1467: checking for $ac_word" >&5 +echo "configure:1468: 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 @@ -1495,7 +1496,7 @@ fi # 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:1499: checking for $ac_word" >&5 +echo "configure:1500: 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 @@ -1527,7 +1528,7 @@ fi # Extract the first word of "zip", so it can be a program name with args. set dummy zip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1531: checking for $ac_word" >&5 +echo "configure:1532: 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 @@ -1562,7 +1563,7 @@ fi # 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:1566: checking for X" >&5 +echo "configure:1567: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -1624,12 +1625,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1633: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1634: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1698,14 +1699,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -1811,17 +1812,17 @@ else 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:1815: checking whether -R must be followed by a space" >&5 +echo "configure:1816: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_nospace=yes else @@ -1837,14 +1838,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_space=yes else @@ -1876,7 +1877,7 @@ rm -f conftest* # 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:1880: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:1881: 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 @@ -1884,7 +1885,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1917,7 +1918,7 @@ fi 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:1921: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:1922: 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 @@ -1925,7 +1926,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1965,12 +1966,12 @@ fi # 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:1969: checking for gethostbyname" >&5 +echo "configure:1970: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -2014,7 +2015,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:2018: checking for gethostbyname in -lnsl" >&5 +echo "configure:2019: 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 @@ -2022,7 +2023,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2063,12 +2064,12 @@ fi # -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:2067: checking for connect" >&5 +echo "configure:2068: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -2112,7 +2113,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:2116: checking for connect in -lsocket" >&5 +echo "configure:2117: 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 @@ -2120,7 +2121,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2155,12 +2156,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:2159: checking for remove" >&5 +echo "configure:2160: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -2204,7 +2205,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:2208: checking for remove in -lposix" >&5 +echo "configure:2209: 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 @@ -2212,7 +2213,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2247,12 +2248,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:2251: checking for shmat" >&5 +echo "configure:2252: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -2296,7 +2297,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:2300: checking for shmat in -lipc" >&5 +echo "configure:2301: 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 @@ -2304,7 +2305,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2348,7 +2349,7 @@ fi # 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:2352: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:2353: 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 @@ -2356,7 +2357,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2395,10 +2396,12 @@ fi XLDFLAGS="$X_LIBS" XLIBS="$X_EXTRA_LIBS" -if test "$GCC" = "yes" ; then +GNU_CC= +GNU_CXX= +if test "$GCC" = "yes"; then GNU_CC=1 fi -if test "$GXX" = "yes" ; then +if test "$GXX" = "yes"; then GNU_CXX=1 fi @@ -2414,7 +2417,7 @@ MKSHLIB='$(LD) $(DSO_LDOPTS)' DSO_LDOPTS='-shared -h $(@:$(OBJDIR)/%.$(DLL_SUFFIX)=%.$(DLL_SUFFIX))' DSO_CFLAGS='-KPIC' -if test "$GNU_CC" = 1; then +if test "$GNU_CC"; then MKSHLIB='$(CXX) $(DSO_LDOPTS)' MKSHLIB_FORCE_ALL='-Wl,--whole-archive' MKSHLIB_UNFORCE_ALL='-Wl,--no-whole-archive' @@ -2424,12 +2427,22 @@ if test "$GNU_CC" = 1; then # Turn on GNU specific features _WARNINGS_CFLAGS="${_WARNINGS_CXXFLAGS} -Wall" #_WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -pedantic" + + _DEFINES_CFLAGS='-include $(DEPTH)/config-defs.h' + _USE_CPP_INCLUDE_FLAG=1 +else + _DEFINES_CFLAGS='$(ACDEFINES)' fi -if test "$GNU_CXX" = 1; then +if test "$GNU_CXX"; then # Turn on GNU specific features _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wall" #_WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -pedantic" + + _DEFINES_CXXFLAGS='-include $(DEPTH)/config-defs.h' + _USE_CPP_INCLUDE_FLAG=1 +else + _DEFINES_CXXFLAGS='$(ACDEFINES)' fi case "$target" in @@ -2437,7 +2450,7 @@ case "$target" in DLL_SUFFIX="so" MKSHLIB_FORCE_ALL='' MKSHLIB_UNFORCE_ALL='' - if test "$GNU_CC" != 1 ; then + if test ! "$GNU_CC"; then DSO_LDOPTS='-ldl -bM:SRE -brtl -berok -bexpall -bnoentry -L$(DIST)/lib' DSO_CFLAGS='-DPIC -brtl -O -qnortti -qflag=w:w' fi @@ -2449,7 +2462,7 @@ case "$target" in #define BROKEN_QSORT 1 EOF - if test -z "$GNU_CC"; then + if test ! "$GNU_CC"; then LDFLAGS='-xildoff' MKSHLIB='$(CXX) $(DSO_LDOPTS)' MKSHLIB_FORCE_ALL='-z allextract' @@ -2493,7 +2506,7 @@ alpha*-*-linux*) ;; alpha*-*-osf*) - if test "$GNU_CC" = 1 ; then + if test "$GNU_CC"; then DSO_LDOPTS='-shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.$(DLL_SUFFIX)=%.$(DLL_SUFFIX))' else CFLAGS="$CFLAGS -std1 -ieee_with_inexact" @@ -2519,7 +2532,7 @@ alpha*-*-osf*) DLL_SUFFIX="so.1.0" DSO_LDOPTS="-shared" fi - if test -z "$GNU_CC"; then + if test ! "$GNU_CC"; then DSO_LDOPTS="-Bshareable $DSO_LDOPTS" fi ;; @@ -2528,10 +2541,10 @@ alpha*-*-osf*) DSO_CFLAGS='-fPIC' DSO_LDOPTS='-Wl,-shared -Wl,-h -Wl,$(@:$(OBJDIR)/%.$(DLL_SUFFIX)=%.$(DLL_SUFFIX))' MKSHLIB='$(CXX) $(DSO_LDOPTS)' - if test -z "`$CC -E - -dM /dev/null; then DSO_LDOPTS="-Bshareable" fi - if test -n "$LIBRUNPATH"; then + if test "$LIBRUNPATH"; then DSO_LDOPTS="-R$LIBRUNPATH $DSO_LDOPTS" fi ;; @@ -2541,16 +2554,16 @@ alpha*-*-osf*) DSO_CFLAGS='-fPIC' DSO_LDOPTS='-shared -h $(@:$(OBJDIR)/%.$(DLL_SUFFIX)=%.$(DLL_SUFFIX))' MKSHLIB='$(LD) $(DSO_LDOPTS)' - if test -z "`$CC -E - -dM /dev/null; then DSO_LDOPTS="-Bshareable /usr/lib/c++rt0.o" fi - if test -n "$LIBRUNPATH"; then + if test "$LIBRUNPATH"; then DSO_LDOPTS="-R$LIBRUNPATH $DSO_LDOPTS" fi ;; *-hpux*) - if test -z "$GNU_CC"; then + if test ! "$GNU_CC"; then DSO_CFLAGS="+Z" fi DLL_SUFFIX="sl" @@ -2567,24 +2580,24 @@ EOF MKSHLIB='$(CCC) $(DSO_LDOPTS)' MKSHLIB_FORCE_ALL='-all' MKSHLIB_UNFORCE_ALL= - if test "$GCC"x != "yesx"; then - CFLAGS="$CFLAGS -woff 3262" - CXXFLAGS="$CXXFLAGS -woff 3262" - else + if test "$GNU_CC"; then MKSHLIB_FORCE_ALL=-Wl,-all MKSHLIB_UNFORCE_ALL=-Wl,-none + else + CFLAGS="$CFLAGS -woff 3262" + CXXFLAGS="$CXXFLAGS -woff 3262" fi ;; esac echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2583: checking for working const" >&5 +echo "configure:2596: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2650: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2654,12 +2667,12 @@ EOF fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2658: checking for ANSI C header files" >&5 +echo "configure:2671: 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 < #include @@ -2667,7 +2680,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2671: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2684: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2684,7 +2697,7 @@ rm -f conftest* 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 @@ -2702,7 +2715,7 @@ fi 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 @@ -2723,7 +2736,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2734,7 +2747,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:2738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -2758,12 +2771,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:2762: checking for mode_t" >&5 +echo "configure:2775: 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 < #if STDC_HEADERS @@ -2791,12 +2804,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:2795: checking for off_t" >&5 +echo "configure:2808: 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 < #if STDC_HEADERS @@ -2824,12 +2837,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:2828: checking for pid_t" >&5 +echo "configure:2841: 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 < #if STDC_HEADERS @@ -2857,12 +2870,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2861: checking for size_t" >&5 +echo "configure:2874: 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 < #if STDC_HEADERS @@ -2890,12 +2903,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:2894: checking for uid_t in sys/types.h" >&5 +echo "configure:2907: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -2924,12 +2937,12 @@ EOF fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:2928: checking for st_blksize in struct stat" >&5 +echo "configure:2941: 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 < #include @@ -2937,7 +2950,7 @@ int main() { struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:2941: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2954: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -2958,12 +2971,12 @@ EOF fi echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 -echo "configure:2962: checking for st_rdev in struct stat" >&5 +echo "configure:2975: checking for st_rdev in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2971,7 +2984,7 @@ int main() { struct stat s; s.st_rdev; ; return 0; } EOF -if { (eval echo configure:2975: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2988: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_rdev=yes else @@ -2992,12 +3005,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:2996: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:3009: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3005,7 +3018,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:3009: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3022: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -3026,12 +3039,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:3030: checking for tm_zone in struct tm" >&5 +echo "configure:3043: checking for tm_zone in struct tm" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_cv_struct_tm> @@ -3039,7 +3052,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:3043: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3056: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -3059,12 +3072,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:3063: checking for tzname" >&5 +echo "configure:3076: checking for tzname" >&5 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifndef tzname /* For SGI. */ @@ -3074,7 +3087,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:3078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -3097,12 +3110,12 @@ fi echo $ac_n "checking for int16_t""... $ac_c" 1>&6 -echo "configure:3101: checking for int16_t" >&5 +echo "configure:3114: 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 < #include @@ -3110,20 +3123,19 @@ int main() { int16_t foo = 0; ; return 0; } EOF -if { (eval echo configure:3114: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - ac_int16_t=true + ac_cv_int16_t=true else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - ac_int16_t=false + ac_cv_int16_t=false fi rm -f conftest* - ac_cv_int16_t=$ac_int16_t fi -if test "$ac_int16_t" = true ; then +if test "$ac_cv_int16_t" = true ; then cat >> confdefs.h <<\EOF #define HAVE_INT16_T 1 EOF @@ -3133,12 +3145,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for int32_t""... $ac_c" 1>&6 -echo "configure:3137: checking for int32_t" >&5 +echo "configure:3149: 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 < #include @@ -3146,20 +3158,19 @@ int main() { int32_t foo = 0; ; return 0; } EOF -if { (eval echo configure:3150: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3162: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - ac_int32_t=true + ac_cv_int32_t=true else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - ac_int32_t=false + ac_cv_int32_t=false fi rm -f conftest* - ac_cv_int32_t=$ac_int32_t fi -if test "$ac_int32_t" = true ; then +if test "$ac_cv_int32_t" = true ; then cat >> confdefs.h <<\EOF #define HAVE_INT32_T 1 EOF @@ -3169,12 +3180,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for uint16_t""... $ac_c" 1>&6 -echo "configure:3173: checking for uint16_t" >&5 +echo "configure:3184: 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 < #include @@ -3182,20 +3193,19 @@ int main() { uint16_t foo = 0; ; return 0; } EOF -if { (eval echo configure:3186: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3197: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - ac_uint16_t=true + ac_cv_uint16_t=true else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - ac_uint16_t=false + ac_cv_uint16_t=false fi rm -f conftest* - ac_cv_uint16_t=$ac_uint16_t fi -if test "$ac_uint16_t" = true ; then +if test "$ac_cv_uint16_t" = true ; then cat >> confdefs.h <<\EOF #define HAVE_UINT16_T 1 EOF @@ -3210,12 +3220,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h 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:3214: checking for $ac_hdr that defines DIR" >&5 +echo "configure:3224: 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 < #include <$ac_hdr> @@ -3223,7 +3233,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:3227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3237: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -3248,7 +3258,7 @@ done # 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:3252: checking for opendir in -ldir" >&5 +echo "configure:3262: 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 @@ -3256,7 +3266,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3289,7 +3299,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:3293: checking for opendir in -lx" >&5 +echo "configure:3303: 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 @@ -3297,7 +3307,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3331,12 +3341,12 @@ fi fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3335: checking for ANSI C header files" >&5 +echo "configure:3345: 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 < #include @@ -3344,7 +3354,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3348: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3358: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3361,7 +3371,7 @@ rm -f conftest* 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 @@ -3379,7 +3389,7 @@ fi 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 @@ -3400,7 +3410,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -3411,7 +3421,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:3415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -3435,12 +3445,12 @@ EOF fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:3439: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:3449: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3456,7 +3466,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:3460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3470: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -3477,12 +3487,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3481: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:3491: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3491,7 +3501,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3495: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3505: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -3515,17 +3525,17 @@ for ac_hdr in fcntl.h limits.h malloc.h paths.h strings.h unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3519: checking for $ac_hdr" >&5 +echo "configure:3529: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3529: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3539: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3555,17 +3565,17 @@ for ac_hdr in sys/bittypes.h sys/file.h sys/ioctl.h sys/time.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3559: checking for $ac_hdr" >&5 +echo "configure:3569: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3569: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3579: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3595,17 +3605,17 @@ for ac_hdr in getopt.h ioctl.h filio.h systeminfo.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3599: checking for $ac_hdr" >&5 +echo "configure:3609: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3609: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3619: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3640,17 +3650,17 @@ case $target in do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3644: checking for $ac_hdr" >&5 +echo "configure:3654: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3654: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3664: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3680,7 +3690,7 @@ done esac echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 -echo "configure:3684: checking for gethostbyname_r in -lc_r" >&5 +echo "configure:3694: 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 @@ -3688,7 +3698,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3725,7 +3735,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for strcpy in -lc""... $ac_c" 1>&6 -echo "configure:3729: checking for strcpy in -lc" >&5 +echo "configure:3739: checking for strcpy in -lc" >&5 ac_lib_var=`echo c'_'strcpy | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3733,7 +3743,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3774,7 +3784,7 @@ fi fi echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6 -echo "configure:3778: checking for atan in -lm" >&5 +echo "configure:3788: 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 @@ -3782,7 +3792,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3821,7 +3831,7 @@ else fi echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:3825: checking for dlopen in -ldl" >&5 +echo "configure:3835: 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 @@ -3829,7 +3839,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3867,9 +3877,9 @@ else echo "$ac_t""no" 1>&6 fi -if test -z "$GNU_CXX" ; then +if test ! "$GNU_CXX"; then echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6 -echo "configure:3873: checking for demangle in -lC" >&5 +echo "configure:3883: 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 @@ -3877,7 +3887,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lC $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3917,7 +3927,7 @@ fi fi echo $ac_n "checking for res_gethostbyaddr in -lresolv""... $ac_c" 1>&6 -echo "configure:3921: checking for res_gethostbyaddr in -lresolv" >&5 +echo "configure:3931: checking for res_gethostbyaddr in -lresolv" >&5 ac_lib_var=`echo resolv'_'res_gethostbyaddr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3925,7 +3935,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3964,7 +3974,7 @@ else fi echo $ac_n "checking for getnetbyaddr in -lsocket""... $ac_c" 1>&6 -echo "configure:3968: checking for getnetbyaddr in -lsocket" >&5 +echo "configure:3978: checking for getnetbyaddr in -lsocket" >&5 ac_lib_var=`echo socket'_'getnetbyaddr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3972,7 +3982,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4011,7 +4021,7 @@ else fi echo $ac_n "checking for login in -lutil""... $ac_c" 1>&6 -echo "configure:4015: checking for login in -lutil" >&5 +echo "configure:4025: checking for login in -lutil" >&5 ac_lib_var=`echo util'_'login | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4019,7 +4029,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lutil $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4058,7 +4068,7 @@ else fi echo $ac_n "checking for xdr_string in -lnsl""... $ac_c" 1>&6 -echo "configure:4062: checking for xdr_string in -lnsl" >&5 +echo "configure:4072: checking for xdr_string in -lnsl" >&5 ac_lib_var=`echo nsl'_'xdr_string | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4066,7 +4076,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4105,7 +4115,7 @@ else fi echo $ac_n "checking for elf_rawdata in -lelf""... $ac_c" 1>&6 -echo "configure:4109: checking for elf_rawdata in -lelf" >&5 +echo "configure:4119: checking for elf_rawdata in -lelf" >&5 ac_lib_var=`echo elf'_'elf_rawdata | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4113,7 +4123,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lelf $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4152,7 +4162,7 @@ else fi echo $ac_n "checking for textdomain in -lintl""... $ac_c" 1>&6 -echo "configure:4156: checking for textdomain in -lintl" >&5 +echo "configure:4166: checking for textdomain in -lintl" >&5 ac_lib_var=`echo intl'_'textdomain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4160,7 +4170,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4199,7 +4209,7 @@ else fi echo $ac_n "checking for shm_open in -lposix4""... $ac_c" 1>&6 -echo "configure:4203: checking for shm_open in -lposix4" >&5 +echo "configure:4213: checking for shm_open in -lposix4" >&5 ac_lib_var=`echo posix4'_'shm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4207,7 +4217,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4246,7 +4256,7 @@ else fi echo $ac_n "checking for iswupper in -lw""... $ac_c" 1>&6 -echo "configure:4250: checking for iswupper in -lw" >&5 +echo "configure:4260: checking for iswupper in -lw" >&5 ac_lib_var=`echo w'_'iswupper | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4254,7 +4264,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lw $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4293,7 +4303,7 @@ else fi echo $ac_n "checking for yywrap in -ll""... $ac_c" 1>&6 -echo "configure:4297: checking for yywrap in -ll" >&5 +echo "configure:4307: checking for yywrap in -ll" >&5 ac_lib_var=`echo l'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4301,7 +4311,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ll $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4338,7 +4348,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for yywrap in -lfl""... $ac_c" 1>&6 -echo "configure:4342: checking for yywrap in -lfl" >&5 +echo "configure:4352: checking for yywrap in -lfl" >&5 ac_lib_var=`echo fl'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4346,7 +4356,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lfl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4387,7 +4397,7 @@ fi fi echo $ac_n "checking for IDL_file_set in -lIDL""... $ac_c" 1>&6 -echo "configure:4391: checking for IDL_file_set in -lIDL" >&5 +echo "configure:4401: checking for IDL_file_set in -lIDL" >&5 ac_lib_var=`echo IDL'_'IDL_file_set | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4395,7 +4405,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lIDL $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4431,19 +4441,19 @@ fi # 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:4435: checking for working alloca.h" >&5 +echo "configure:4445: 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 < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:4447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -4464,12 +4474,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:4468: checking for alloca" >&5 +echo "configure:4478: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -4524,12 +4534,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:4528: checking whether alloca needs Cray hooks" >&5 +echo "configure:4538: 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 <&6 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:4558: checking for $ac_func" >&5 +echo "configure:4568: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4609,7 +4619,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:4613: checking stack direction for C alloca" >&5 +echo "configure:4623: 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 @@ -4617,7 +4627,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -4659,13 +4669,13 @@ fi if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:4663: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:4673: 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 < Autoconf TIOCGETP @@ -4683,7 +4693,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -4705,7 +4715,7 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6 fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:4709: checking for 8-bit clean memcmp" >&5 +echo "configure:4719: 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 @@ -4713,7 +4723,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -4744,17 +4754,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4748: checking for $ac_hdr" >&5 +echo "configure:4758: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4758: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4768: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4783,12 +4793,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4787: checking for $ac_func" >&5 +echo "configure:4797: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4836,7 +4846,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:4840: checking for working mmap" >&5 +echo "configure:4850: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4844,7 +4854,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -5007,12 +5017,12 @@ EOF fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:5011: checking return type of signal handlers" >&5 +echo "configure:5021: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5029,7 +5039,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:5033: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5043: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -5048,7 +5058,7 @@ EOF echo $ac_n "checking for working strcoll""... $ac_c" 1>&6 -echo "configure:5052: checking for working strcoll" >&5 +echo "configure:5062: checking for working strcoll" >&5 if eval "test \"`echo '$''{'ac_cv_func_strcoll_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5056,7 +5066,7 @@ else ac_cv_func_strcoll_works=no else cat > conftest.$ac_ext < main () @@ -5066,7 +5076,7 @@ main () strcoll ("123", "456") >= 0); } EOF -if { (eval echo configure:5070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_strcoll_works=yes else @@ -5089,12 +5099,12 @@ EOF fi echo $ac_n "checking for strftime""... $ac_c" 1>&6 -echo "configure:5093: checking for strftime" >&5 +echo "configure:5103: checking for strftime" >&5 if eval "test \"`echo '$''{'ac_cv_func_strftime'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_strftime=yes" else @@ -5139,7 +5149,7 @@ else echo "$ac_t""no" 1>&6 # strftime is in -lintl on SCO UNIX. echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6 -echo "configure:5143: checking for strftime in -lintl" >&5 +echo "configure:5153: checking for strftime in -lintl" >&5 ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5147,7 +5157,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5185,7 +5195,7 @@ fi fi echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6 -echo "configure:5189: checking whether utime accepts a null argument" >&5 +echo "configure:5199: checking whether utime accepts a null argument" >&5 if eval "test \"`echo '$''{'ac_cv_func_utime_null'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5195,7 +5205,7 @@ if test "$cross_compiling" = yes; then ac_cv_func_utime_null=no else cat > conftest.$ac_ext < #include @@ -5206,7 +5216,7 @@ exit(!(stat ("conftestdata", &s) == 0 && utime("conftestdata", (long *)0) == 0 && t.st_mtime - s.st_mtime < 120)); } EOF -if { (eval echo configure:5210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_utime_null=yes else @@ -5231,17 +5241,17 @@ fi ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:5235: checking for vfork.h" >&5 +echo "configure:5245: checking for vfork.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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5245: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5255: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5266,18 +5276,18 @@ else fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:5270: checking for working vfork" >&5 +echo "configure:5280: checking for working vfork" >&5 if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then echo $ac_n "checking for vfork""... $ac_c" 1>&6 -echo "configure:5276: checking for vfork" >&5 +echo "configure:5286: checking for vfork" >&5 if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_vfork=yes" else @@ -5321,7 +5331,7 @@ fi else cat > conftest.$ac_ext < @@ -5416,7 +5426,7 @@ main() { } } EOF -if { (eval echo configure:5420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_vfork_works=yes else @@ -5439,12 +5449,12 @@ EOF fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:5443: checking for vprintf" >&5 +echo "configure:5453: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -5491,12 +5501,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:5495: checking for _doprnt" >&5 +echo "configure:5505: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -5546,12 +5556,12 @@ fi for ac_func in ftime getcwd gethostname getwd mkdir mktime putenv rmdir select do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5550: checking for $ac_func" >&5 +echo "configure:5560: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5601,12 +5611,12 @@ done for ac_func in socket strcspn strdup strerror strspn strstr strtol strtoul do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5605: checking for $ac_func" >&5 +echo "configure:5615: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5656,12 +5666,12 @@ done for ac_func in uname qsort snprintf waitid fork1 remainder lchown do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5660: checking for $ac_func" >&5 +echo "configure:5670: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5711,12 +5721,12 @@ done for ac_func in localtime_r do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5715: checking for $ac_func" >&5 +echo "configure:5725: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5765,12 +5775,12 @@ done echo $ac_n "checking how to call gettimeofday""... $ac_c" 1>&6 -echo "configure:5769: checking how to call gettimeofday" >&5 +echo "configure:5779: checking how to call gettimeofday" >&5 if eval "test \"`echo '$''{'ac_cv_gettimeofday_args'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5779,15 +5789,15 @@ struct timeval tv; struct timezone tzp; gettimeofday(&tv, &tzp); ; return 0; } EOF -if { (eval echo configure:5783: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5793: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - ac_gettimeofday_args=2 + ac_cv_gettimeofday_args=2 else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < #include @@ -5795,29 +5805,27 @@ int main() { struct timeval tv; gettimeofday(&tv); ; return 0; } EOF -if { (eval echo configure:5799: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5809: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - ac_gettimeofday_args=1 + ac_cv_gettimeofday_args=1 else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - ac_gettimeofday_args=0 + ac_cv_gettimeofday_args=0 fi rm -f conftest* fi rm -f conftest* - ac_cv_gettimeofday_args=$ac_gettimeofday_args fi -ac_gettimeofday_args=$ac_cv_gettimeofday_args -if test $ac_gettimeofday_args = 1 ; then +if test "$ac_cv_gettimeofday_args" = 1 ; then cat >> confdefs.h <<\EOF #define HAVE_GETTIMEOFDAY 1 EOF echo "$ac_t""one argument" 1>&6 -elif test $ac_gettimeofday_args = 2 ; then +elif test "$ac_cv_gettimeofday_args" = 2 ; then cat >> confdefs.h <<\EOF #define HAVE_GETTIMEOFDAY 1 EOF @@ -5832,12 +5840,12 @@ else fi echo $ac_n "checking for sys_errlist/sys_nerr""... $ac_c" 1>&6 -echo "configure:5836: checking for sys_errlist/sys_nerr" >&5 +echo "configure:5844: checking for sys_errlist/sys_nerr" >&5 if eval "test \"`echo '$''{'ac_cv_syserrlist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5845,21 +5853,19 @@ int main() { char *foo = sys_errlist[sys_nerr-1]; ; return 0; } EOF -if { (eval echo configure:5849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - ac_syserrlist=true + ac_cv_syserrlist=true else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - ac_syserrlist=false + ac_cv_syserrlist=false fi rm -f conftest* - ac_cv_syserrlist=$ac_syserrlist fi -ac_syserrlist=$ac_cv_syserrlist -if test $ac_syserrlist = true ; then +if test "$ac_cv_syserrlist" = true ; then cat >> confdefs.h <<\EOF #define HAVE_SYSERRLIST 1 EOF @@ -5869,23 +5875,23 @@ else echo "$ac_t""no" 1>&6 fi -if test -n "$GNU_CXX" ; then +if test "$GNU_CXX"; then _MOZ_RTTI_FLAGS=-fno-rtti echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6 -echo "configure:5878: checking for C++ exceptions flag" >&5 +echo "configure:5884: checking for C++ exceptions flag" >&5 - if eval "test \"`echo '$''{'ac_cv_cxx_exceptions_flags'+set}'`\" = set"; then + if eval "test \"`echo '$''{'ac_cv_cxx_exceptions_flags'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo "int main() { return 0; }" | cat > conftest.C - _tmp_output="g++-output-$$" + _tmp_output="conftest.out" ${CXX-g++} -fno-handle-exceptions conftest.C > $_tmp_output 2>&1 - if egrep "warning.*renamed" $_tmp_output >/dev/null 2>&1; then + if egrep "warning.*renamed" $_tmp_output >/dev/null; then ac_cv_cxx_exceptions_flags=-fno-exceptions else ac_cv_cxx_exceptions_flags=-fno-handle-exceptions @@ -5903,12 +5909,12 @@ _SAVE_CC=$CC CC=$CXX ac_ext=C echo $ac_n "checking for ios::binary""... $ac_c" 1>&6 -echo "configure:5907: checking for ios::binary" >&5 +echo "configure:5913: checking for ios::binary" >&5 if eval "test \"`echo '$''{'ac_cv_ios_binary'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5917,21 +5923,19 @@ char *buffer = "config.log"; fstream *mFileStream=new fstream(buffer, ios::binary); ; return 0; } EOF -if { (eval echo configure:5921: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5927: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - ac_ios_binary=true + ac_cv_ios_binary=true else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - ac_ios_binary=false + ac_cv_ios_binary=false fi rm -f conftest* - ac_cv_ios_binary=$ac_ios_binary fi -ac_ios_binary=$ac_cv_ios_binary -if test $ac_ios_binary = true ; then +if test "$ac_cv_ios_binary" = true ; then cat >> confdefs.h <<\EOF #define HAVE_IOS_BINARY 1 EOF @@ -5943,12 +5947,12 @@ fi echo $ac_n "checking for ios::bin""... $ac_c" 1>&6 -echo "configure:5947: checking for ios::bin" >&5 +echo "configure:5951: checking for ios::bin" >&5 if eval "test \"`echo '$''{'ac_cv_ios_bin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5957,21 +5961,19 @@ char *buffer = "config.log"; fstream *mFileStream=new fstream(buffer, ios::bin); ; return 0; } EOF -if { (eval echo configure:5961: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - ac_ios_bin=true + ac_cv_ios_bin=true else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - ac_ios_bin=false + ac_cv_ios_bin=false fi rm -f conftest* - ac_cv_ios_bin=$ac_ios_bin fi -ac_ios_bin=$ac_cv_ios_bin -if test $ac_ios_bin = true ; then +if test "$ac_cv_ios_bin" = true ; then cat >> confdefs.h <<\EOF #define HAVE_IOS_BIN 1 EOF @@ -5982,19 +5984,19 @@ else fi echo $ac_n "checking for namespaces""... $ac_c" 1>&6 -echo "configure:5986: checking for namespaces" >&5 +echo "configure:5988: checking for namespaces" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_namespaces'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6000: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_namespaces=yes else @@ -6007,7 +6009,7 @@ rm -f conftest* fi echo "$ac_t""$ac_cv_cpp_namespaces" 1>&6 -if test $ac_cv_cpp_namespaces = yes ; then +if test "$ac_cv_cpp_namespaces" = yes ; then cat >> confdefs.h <<\EOF #define HAVE_CPP_NAMESPACES 1 EOF @@ -6016,19 +6018,19 @@ fi echo $ac_n "checking for C++ \"bool\" keyword""... $ac_c" 1>&6 -echo "configure:6020: checking for C++ \"bool\" keyword" >&5 +echo "configure:6022: checking for C++ \"bool\" keyword" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_bool'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6034: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_bool=yes else @@ -6041,7 +6043,7 @@ rm -f conftest* fi echo "$ac_t""$ac_cv_cpp_bool" 1>&6 -if test $ac_cv_cpp_bool = no ; then +if test "$ac_cv_cpp_bool" = no ; then cat >> confdefs.h <<\EOF #define NEEDS_bool 1 EOF @@ -6050,12 +6052,12 @@ fi echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6 -echo "configure:6054: checking for C++ \"explicit\" keyword" >&5 +echo "configure:6056: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6071: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_explicit=yes else @@ -6078,7 +6080,7 @@ rm -f conftest* fi echo "$ac_t""$ac_cv_cpp_explicit" 1>&6 -if test $ac_cv_cpp_explicit = yes ; then +if test "$ac_cv_cpp_explicit" = yes ; then cat >> confdefs.h <<\EOF #define HAVE_CPP_EXPLICIT 1 EOF @@ -6087,12 +6089,12 @@ fi echo $ac_n "checking for C++ \"using\" keyword""... $ac_c" 1>&6 -echo "configure:6091: checking for C++ \"using\" keyword" >&5 +echo "configure:6093: checking for C++ \"using\" keyword" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_using'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6108: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_using=yes else @@ -6115,7 +6117,7 @@ rm -f conftest* fi echo "$ac_t""$ac_cv_cpp_using" 1>&6 -if test $ac_cv_cpp_using = yes ; then +if test "$ac_cv_cpp_using" = yes ; then cat >> confdefs.h <<\EOF #define HAVE_CPP_USING 1 EOF @@ -6123,12 +6125,12 @@ EOF fi echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6 -echo "configure:6127: checking for C++ reinterpret_cast" >&5 +echo "configure:6129: 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 <(z); ; return 0; } EOF -if { (eval echo configure:6140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_reinterpret_cast=yes else @@ -6149,7 +6151,7 @@ rm -f conftest* fi echo "$ac_t""$ac_cv_cpp_reinterpret_cast" 1>&6 -if test $ac_cv_cpp_reinterpret_cast = yes ; then +if test "$ac_cv_cpp_reinterpret_cast" = yes ; then cat >> confdefs.h <<\EOF #define HAVE_CPP_NEW_CASTS 1 EOF @@ -6157,19 +6159,19 @@ EOF fi echo $ac_n "checking if C++ requires implementation of unused methods""... $ac_c" 1>&6 -echo "configure:6161: checking if C++ requires implementation of unused methods" >&5 +echo "configure:6163: checking if C++ requires implementation of unused 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6175: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_unused_required=no else @@ -6182,7 +6184,7 @@ rm -f conftest* fi echo "$ac_t""$ac_cv_cpp_unused_required" 1>&6 -if test $ac_cv_cpp_unused_required = yes ; then +if test "$ac_cv_cpp_unused_required" = yes ; then cat >> confdefs.h <<\EOF #define NEED_CPP_UNUSED_IMPLEMENTATIONS 1 EOF @@ -6194,95 +6196,6 @@ ac_ext=c -if test "$GNU_CC" = 1; then - echo $ac_n "checking $CC for \"-include \" option""... $ac_c" 1>&6 -echo "configure:6200: checking $CC for \"-include \" option" >&5 - - if eval "test \"`echo '$''{'ac_cv_cc_include_flag'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - _SAVE_CFLAGS=$CFLAGS ; CFLAGS="$CFLAGS -include conftest.h" - echo "#define HELLO 01134;" > conftest.h - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cc_include_flag=true -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_cc_include_flag=false -fi -rm -f conftest*; - rm -f conftest.h - CFLAGS=$_SAVE_CFLAGS -fi - - - if test "$ac_cv_cc_include_flag" = true ; then - echo "$ac_t""yes" 1>&6 - _DEFINES_CFLAGS='-include $(DEPTH)/config-defs.h' - _USE_CPP_INCLUDE_FLAG=1 - else - echo "$ac_t""no" 1>&6 - _DEFINES_CFLAGS='$(ACDEFINES)' - fi -fi -if test "$GNU_CXX" = 1; then - echo $ac_n "checking $CXX for \"-include \" option""... $ac_c" 1>&6 -echo "configure:6241: checking $CXX for \"-include \" option" >&5 - - if test "$CC" = "$CXX"; then - ac_cv_cxx_include_flag=$ac_cv_cc_include_flag; - else - if eval "test \"`echo '$''{'ac_cv_cxx_include_flag'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - _SAVE_CFLAGS=$CFLAGS ; CFLAGS="$CFLAGS -include conftest.h" - _SAVE_CC=$CC ; CC=$CXX - echo "#define FAST 299792458" > conftest.h - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cxx_include_flag=true -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_cxx_include_flag=false -fi -rm -f conftest*; - rm -f conftest.h - CC=$_SAVE_CC - CFLAGS=$_SAVE_CFLAGS -fi - - fi - if test "$ac_cv_cxx_include_flag" = true ; then - echo "$ac_t""yes" 1>&6 - _DEFINES_CXXFLAGS='-include $(DEPTH)/config-defs.h' - _USE_CPP_INCLUDE_FLAG=1 - else - echo "$ac_t""no" 1>&6 - _DEFINES_CXXFLAGS='$(ACDEFINES)' - fi -fi - - # Components and Features # Check whether --enable-async-dns or --disable-async-dns was given. @@ -6394,30 +6307,26 @@ if test "${enable_tests+set}" = set; then fi +useRhapsody=`echo $target_os | egrep "^Rhapsody"` # Check whether --enable-toolkit or --disable-toolkit was given. if test "${enable_toolkit+set}" = set; then enableval="$enable_toolkit" - - res=`echo $target_os| grep -c "^Rhapsody"`; - if test "$enableval" != "motif" && test "$enableval" != "gtk" && test $res = 0; then - { echo "configure: error: Toolkit must be either gtk or motif." 1>&2; exit 1; } - else - MOZ_TOOLKIT=`echo "$enableval" | sed -e "s/,.*//g" ` - fi + if test "$enableval" = "motif" \ + -o "$enableval" = "gtk" \ + -o "$useRhapsody" ; then + MOZ_TOOLKIT=`echo "$enableval" | sed -e "s/,.*$//"` + else + { echo "configure: error: Toolkit must be either gtk or motif." 1>&2; exit 1; } + fi else - MOZ_TOOLKIT=USE_DEFAULT + if test "$useRhapsody" ; then + MOZ_TOOLKIT="rhapsody" + else + MOZ_TOOLKIT="gtk" + fi fi -if test "$MOZ_TOOLKIT" = "USE_DEFAULT"; then - res=`echo $target_os| grep -c "^Rhapsody"` - if test $res != 0; then - MOZ_TOOLKIT="rhapsody" - else - MOZ_TOOLKIT="gtk" - fi -fi - # Compiler Options # Check whether --enable-asserts or --disable-asserts was given. @@ -6446,19 +6355,27 @@ if test "${enable_debug+set}" = set; then fi +_cpp_md_flag= # Check whether --enable-md or --disable-md was given. if test "${enable_md+set}" = set; then enableval="$enable_md" - if test "$enableval" = "yes"; then - COMPILER_DEPEND=1 - MDDEPDIR='.deps' - _DEPEND_CFLAGS='$(filter-out %/.pp,-Wp,-MD,$(MDDEPDIR)/$(*F).pp)' - - elif test "$enableval" = "no"; then + if test "$enableval" = "no"; then : + elif test "$enableval" = "yes"; then + _cpp_md_flag=1 else { echo "configure: error: Option, md, does not take an argument ($enableval)." 1>&2; exit 1; } fi +else + if test "$GNU_CC" -a "$GNU_CXX"; then + _cpp_md_flag=1 + fi +fi + +if test "$_cpp_md_flag"; then + COMPILER_DEPEND=1 + MDDEPDIR='.deps' + _DEPEND_CFLAGS='$(filter-out %/.pp,-Wp,-MD,$(MDDEPDIR)/$(*F).pp)' fi @@ -6577,7 +6494,7 @@ fi if test "${enable_wrap_malloc+set}" = set; then enableval="$enable_wrap_malloc" if test "$enableval" = "yes"; then - if test "$GNU_CC" = 1; then + if test "$GNU_CC"; then WRAP_MALLOC_CFLAGS="${LDFLAGS} -Wl,--wrap -Wl,malloc -Wl,--wrap -Wl,free -Wl,--wrap -Wl,realloc -Wl,--wrap -Wl,__builtin_new -Wl,--wrap -Wl,__builtin_vec_new -Wl,--wrap -Wl,__builtin_delete -Wl,--wrap -Wl,__builtin_vec_delete -Wl,--wrap -Wl,PR_Free -Wl,--wrap -Wl,PR_Malloc -Wl,--wrap -Wl,PR_Calloc -Wl,--wrap -Wl,PR_Realloc" MKSHLIB='$(CXX) $(DSO_LDOPTS) $(WRAP_MALLOC_CFLAGS)' fi @@ -6602,8 +6519,7 @@ fi # Check whether --enable-homedir or --disable-homedir was given. if test "${enable_homedir+set}" = set; then enableval="$enable_homedir" - res=`echo $enableval | grep -c "\/"` - if test $res != 0 ; then + if echo "$enableval" | grep "\/" >/dev/null; then { echo "configure: error: "Homedir must be single relative path."" 1>&2; exit 1; } else cat >> confdefs.h <<\EOF @@ -6755,12 +6671,11 @@ fi - -if test "$no_x" != "yes" ; then +if test "$no_x" != "yes"; then _SAVE_LDFLAGS="$LDFLAGS" LDFLAGS="$XLDFLAGS $LDFLAGS" echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6 -echo "configure:6764: checking for XDrawLines in -lX11" >&5 +echo "configure:6679: 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 @@ -6768,7 +6683,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11 $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6801,7 +6716,7 @@ MISSING_X="$MISSING_X -lX11" fi echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6 -echo "configure:6805: checking for XextAddDisplay in -lXext" >&5 +echo "configure:6720: 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 @@ -6809,7 +6724,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXext $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6842,7 +6757,7 @@ MISSING_X="$MISSING_X -lXext" fi echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6 -echo "configure:6846: checking for IceFlush in -lICE" >&5 +echo "configure:6761: 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 @@ -6850,7 +6765,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6882,7 +6797,7 @@ else fi echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6 -echo "configure:6886: checking for SmcCloseConnection in -lSM" >&5 +echo "configure:6801: 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 @@ -6890,7 +6805,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lSM $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6922,7 +6837,7 @@ else fi echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 -echo "configure:6926: checking for XtFree in -lXt" >&5 +echo "configure:6841: 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 @@ -6930,7 +6845,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXt $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6963,7 +6878,7 @@ MISSING_X="$MISSING_X -lXt" fi echo $ac_n "checking for XmuLookupString in -lXmu""... $ac_c" 1>&6 -echo "configure:6967: checking for XmuLookupString in -lXmu" >&5 +echo "configure:6882: checking for XmuLookupString in -lXmu" >&5 ac_lib_var=`echo Xmu'_'XmuLookupString | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6971,7 +6886,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXmu $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7005,29 +6920,29 @@ fi LDFLAGS="$_SAVE_LDFLAGS" -res=`echo :$MOZ_TOOLKIT | grep -c "motif"` -if test $res != 0 ; then -if test "$no_x" != "yes" ; then - if test ! -z "$x_includes" ; then +if echo ":$MOZ_TOOLKIT" | grep "motif" >/dev/null; then +if test "$no_x" != "yes"; then + if test "$x_includes"; then MOTIF_XINCS="-xif -I$x_includes" fi - MOTIF_VERSION=`${srcdir}/config/mkdetect/detect_motif.sh -cc "$CC" $MOTIF_XINCS` - MOTIF_INCLUDES=`${srcdir}/config/mkdetect/detect_motif.sh -cc "$CC" $MOTIF_XINCS -if` - MOTIF_STATIC_FLAGS=`${srcdir}/config/mkdetect/detect_motif.sh -cc "$CC" $MOTIF_XINCS -sf` - MOTIF_DYNAMIC_FLAGS=`${srcdir}/config/mkdetect/detect_motif.sh -cc "$CC" $MOTIF_XINCS -df` - MOTIF_DYNAMIC_PATHS=`${srcdir}/config/mkdetect/detect_motif.sh -cc "$CC" $MOTIF_XINCS -dp` - MOTIF_REQUIRES_XPM=`${srcdir}/config/mkdetect/detect_motif.sh -cc "$CC" $MOTIF_XINCS -xpm` + $_detect_motif="${srcdir}/config/mkdetect/detect_motif.sh -cc '$CC' $MOTIF_XINCS" + MOTIF_VERSION=` $_detect_motif` + MOTIF_INCLUDES=` $_detect_motif -if` + MOTIF_STATIC_FLAGS=` $_detect_motif -sf` + MOTIF_DYNAMIC_FLAGS=`$_detect_motif -df` + MOTIF_DYNAMIC_PATHS=`$_detect_motif -dp` + MOTIF_REQUIRES_XPM=` $_detect_motif -xpm` ${srcdir}/config/mkdetect/detect_motif.sh --cleanup fi - if test "$MOTIF_REQUIRES_XPM" = "True" || test "$MOTIF_VERSION" = "2.1" ; then + if test "$MOTIF_REQUIRES_XPM" = "True" -o "$MOTIF_VERSION" = "2.1"; then _SAVE_LDFLAGS="$LDFLAGS" LDFLAGS="$XLDFLAGS $LDFLAGS" - if test "$MOTIF_REQUIRES_XPM" = "True" ; then + if test "$MOTIF_REQUIRES_XPM" = "True"; then echo $ac_n "checking for XpmWriteFileFromImage in -lXpm""... $ac_c" 1>&6 -echo "configure:7031: checking for XpmWriteFileFromImage in -lXpm" >&5 +echo "configure:6946: checking for XpmWriteFileFromImage in -lXpm" >&5 ac_lib_var=`echo Xpm'_'XpmWriteFileFromImage | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7035,7 +6950,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXpm $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7068,9 +6983,9 @@ MISSING_MOTIF="-lXpm $MISSING_MOTIF" fi fi - if test "$MOTIF_VERSION" = "2.1" ; then + if test "$MOTIF_VERSION" = "2.1"; then echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6 -echo "configure:7074: checking for XpGetPrinterList in -lXp" >&5 +echo "configure:6989: 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 @@ -7078,7 +6993,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXp $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7115,7 +7030,8 @@ fi LDFLAGS="$_SAVE_LDFLAGS" fi - if test "$MOTIF_STATIC_LIB" = "unknown" && test "$MOTIF_DYNAMIC_LIB" = "unknown" ; then + if test "$MOTIF_STATIC_LIB" = "unknown" \ + -a "$MOTIF_DYNAMIC_LIB" = "unknown"; then { echo "configure: error: "Cannot find neither dynamic nor static motif libraries."" 1>&2; exit 1; } fi @@ -7143,11 +7059,11 @@ if test "${with_static_motif+set}" = set; then fi - if test "$sysstaticmotif" != "yes" ; then + if test "$sysstaticmotif" != "yes"; then _SAVE_LDFLAGS="$LDFLAGS" LDFLAGS="$MOTIF_DYNAMIC_PATHS $XLDFLAGS $LDFLAGS" echo $ac_n "checking for XmStringCreate in -lXm""... $ac_c" 1>&6 -echo "configure:7151: checking for XmStringCreate in -lXm" >&5 +echo "configure:7067: checking for XmStringCreate in -lXm" >&5 ac_lib_var=`echo Xm'_'XmStringCreate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7155,7 +7071,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXm $MOTIF_DYNAMIC_PATHS $TK_LIBS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7190,7 +7106,7 @@ fi LDFLAGS="$_SAVE_LDFLAGS" else echo $ac_n "checking for XmStringCreate in -lXm""... $ac_c" 1>&6 -echo "configure:7194: checking for XmStringCreate in -lXm" >&5 +echo "configure:7110: checking for XmStringCreate in -lXm" >&5 ac_lib_var=`echo Xm'_'XmStringCreate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7198,7 +7114,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXm $TK_LIBS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7235,8 +7151,7 @@ fi TK_CFLAGS="$MOTIF_INCLUDES" fi -res=`echo :$MOZ_TOOLKIT | grep -c "gtk"` -if test $res != 0 ; then +if echo ":$MOZ_TOOLKIT" | grep "gtk" >/dev/null; then # Check whether --with-gtk-prefix or --without-gtk-prefix was given. if test "${with_gtk_prefix+set}" = set; then withval="$with_gtk_prefix" @@ -7278,7 +7193,7 @@ fi # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7282: checking for $ac_word" >&5 +echo "configure:7197: 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 @@ -7309,7 +7224,7 @@ fi min_gtk_version=$GTK_VERSION echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:7313: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:7228: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes @@ -7332,7 +7247,7 @@ echo "configure:7313: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -7410,7 +7325,7 @@ main () } EOF -if { (eval echo configure:7414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -7444,7 +7359,7 @@ fi CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -7454,7 +7369,7 @@ int main() { return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:7458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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" @@ -7500,7 +7415,7 @@ if test "${with_static_gtk+set}" = set; then fi - if test "$sysstaticgtk" != "yes" ; then + if test "$sysstaticgtk" != "yes"; then TK_LIBS=$GTK_LIBS else @@ -7512,7 +7427,7 @@ fi GDK_STATIC=`echo $GTK_LIBS | sed 's/^.*-l\(gdk[^ ]*\) .*/\1/'` GLIB_STATIC_LOC=`echo $GTK_LIBS | sed -e 's/^.*-lgdk[^ ]* *-L\([^ ]*\).*$/\1/' -e 's/^.* -lgdk[^ ]* .*$//'` - if test -z "$GLIB_STATIC_LOC" ; then + if test ! "$GLIB_STATIC_LOC" ; then GLIB_STATIC_LOC=$GTK_STATIC_LOC fi GMODULE_STATIC=`echo $GTK_LIBS | sed 's/^.*-l\(gmodule[^ ]*\) .*/\1/'` @@ -7559,7 +7474,7 @@ if test "$JPEG_DIR" = no; then SYSTEM_JPEG= else echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6 -echo "configure:7563: checking for jpeg_destroy_compress in -ljpeg" >&5 +echo "configure:7478: 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 @@ -7567,7 +7482,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ljpeg $JPEG_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7601,13 +7516,13 @@ fi fi -if test "$SYSTEM_JPEG" = 1 ; then +if test "$SYSTEM_JPEG" = 1; then LIBS="$JPEG_LIBS $LIBS" if test "$cross_compiling" = yes; then SYSTEM_JPEG= else cat > conftest.$ac_ext < #include @@ -7621,7 +7536,7 @@ else } EOF -if { (eval echo configure:7625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then SYSTEM_JPEG=1 else @@ -7639,7 +7554,7 @@ CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS -if test -n "${JPEG_DIR}" && test -d "${JPEG_DIR}" && test "$SYSTEM_JPEG" = 1; then +if test -n "${JPEG_DIR}" -a -d "${JPEG_DIR}" -a "$SYSTEM_JPEG" = 1; then JPEG_CFLAGS="-I${JPEG_DIR}/include" JPEG_LIBS="-L${JPEG_DIR}/lib ${JPEG_LIBS}" fi @@ -7659,16 +7574,16 @@ if test "$ZLIB_DIR" = no; then SYSTEM_ZLIB= else echo $ac_n "checking "for zlib.h"""... $ac_c" 1>&6 -echo "configure:7663: checking "for zlib.h"" >&5 +echo "configure:7578: checking "for zlib.h"" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7587: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* result="yes" SYSTEM_ZLIB=1 else @@ -7680,9 +7595,9 @@ fi rm -f conftest* echo "$ac_t"""$result"" 1>&6 fi -if test "$SYSTEM_ZLIB" = 1 ; then +if test "$SYSTEM_ZLIB" = 1; then echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6 -echo "configure:7686: checking for gzread in -lz" >&5 +echo "configure:7601: 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 @@ -7690,7 +7605,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $ZLIB_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7726,7 +7641,7 @@ fi CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS -if test -n "${ZLIB_DIR}" && test -d "${ZLIB_DIR}" && test "$SYSTEM_ZLIB" = 1 ; then +if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then ZLIB_CFLAGS="-I${ZLIB_DIR}/include" ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" fi @@ -7747,7 +7662,7 @@ if test "$PNG_DIR" = no; then SYSTEM_PNG= else echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6 -echo "configure:7751: checking for png_get_valid in -lpng" >&5 +echo "configure:7666: 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 @@ -7755,7 +7670,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpng $PNG_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7788,13 +7703,13 @@ SYSTEM_PNG= fi fi -if test "$SYSTEM_PNG" = 1 ; then +if test "$SYSTEM_PNG" = 1; then LIBS="$PNG_LIBS $LIBS" if test "$cross_compiling" = yes; then SYSTEM_PNG= else cat > conftest.$ac_ext < #include @@ -7808,7 +7723,7 @@ else } EOF -if { (eval echo configure:7812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then SYSTEM_PNG=1 else @@ -7826,7 +7741,7 @@ CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS -if test -n "${PNG_DIR}" && test -d "${PNG_DIR}" && test "$SYSTEM_PNG" = 1 ; then +if test "${PNG_DIR}" -a -d "${PNG_DIR}" -a "$SYSTEM_PNG" = 1; then PNG_CFLAGS="-I${PNG_DIR}/include" PNG_LIBS="-L${PNG_DIR}/lib ${PNG_LIBS}" fi @@ -7852,10 +7767,10 @@ CFLAGS="$CFLAGS -I${FULLCIRCLE_DIR}" LDFLAGS="$LDFLAGS -L${FULLCIRCLE_DIR}" echo $ac_n "checking "for FC_Initialize in -ltalkback"""... $ac_c" 1>&6 -echo "configure:7856: checking "for FC_Initialize in -ltalkback"" >&5; +echo "configure:7771: checking "for FC_Initialize in -ltalkback"" >&5; LIBS="-ltalkback $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* FULLCIRCLE_LIB="-ltalkback $FULLCIRCLE_LIB" result="yes" else @@ -7883,7 +7798,7 @@ CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS -if test -n "$MISSING_FULLCIRCLE" ; then +if test "$MISSING_FULLCIRCLE"; then { echo "configure: error: Could not find FullCircle Library" 1>&2; exit 1; }; fi @@ -7894,7 +7809,7 @@ if test "${with_pthreads+set}" = set; then withval="$with_pthreads" if test "$withval" = "yes"; then echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6 -echo "configure:7898: checking for pthread_attr_init in -lpthread" >&5 +echo "configure:7813: checking for pthread_attr_init in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_attr_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7902,7 +7817,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7945,7 +7860,7 @@ EOF EOF ;; alpha*-*-osf*) - if test "$GNU_CC" = 1 ; then + if test "$GNU_CC"; then cat >> confdefs.h <<\EOF #define _REENTRANT 1 EOF @@ -7977,20 +7892,20 @@ _SAVE_CFLAGS=$CFLAGS _SAVE_LDFLAGS=$LDFLAGS _SAVE_LIBS=$LIBS CFLAGS="$CFLAGS -I${NSPR_DIR}/include" -if test "$NSPR_LIBDIR"x = "x" ; then +if test "$NSPR_LIBDIR"x = x; then LDFLAGS="$LDFLAGS -L${NSPR_DIR}/lib $NSPR_LIBS" else LDFLAGS="$LDFLAGS -L${NSPR_LIBDIR} $NSPR_LIBS" fi echo $ac_n "checking "for PR_GetCurrentThread in -lnspr3"""... $ac_c" 1>&6 -echo "configure:7988: checking "for PR_GetCurrentThread in -lnspr3"" >&5 +echo "configure:7903: checking "for PR_GetCurrentThread in -lnspr3"" >&5 LIBS="-lnspr3 $NSPR_LIBS $LIBS" if test "$cross_compiling" = yes; then _NSPR_NEEDS_THREAD_LIB=1 result="no" else cat > conftest.$ac_ext < #include @@ -8000,7 +7915,7 @@ else } EOF -if { (eval echo configure:8004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then NSPR_LIBS="-lnspr3 $NSPR_LIBS" result="yes" else @@ -8015,13 +7930,13 @@ fi rm -f core echo "$ac_t"""$result"" 1>&6 -if test "$_NSPR_NEEDS_THREAD_LIB" = 1 ; then +if test "$_NSPR_NEEDS_THREAD_LIB" = 1; then LIBS=$_SAVE_LIBS case "$target" in *-*-solaris*) echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6 -echo "configure:8025: checking for pthread_attr_init in -lpthread" >&5 +echo "configure:7940: checking for pthread_attr_init in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_attr_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8029,7 +7944,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8062,7 +7977,7 @@ fi ;; *-*-linux*) echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6 -echo "configure:8066: checking for pthread_attr_init in -lpthread" >&5 +echo "configure:7981: checking for pthread_attr_init in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_attr_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8070,7 +7985,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8104,13 +8019,13 @@ fi esac echo $ac_n "checking "for PR_GetCurrentThread in -lnspr3 with thread lib"""... $ac_c" 1>&6 -echo "configure:8108: checking "for PR_GetCurrentThread in -lnspr3 with thread lib"" >&5 +echo "configure:8023: checking "for PR_GetCurrentThread in -lnspr3 with thread lib"" >&5 LIBS="-lnspr3 $NSPR_LIBS $LIBS" if test "$cross_compiling" = yes; then MISSING_NSPR="$MISSING_NSPR -lnspr3" result="no" else cat > conftest.$ac_ext < #include @@ -8120,7 +8035,7 @@ else } EOF -if { (eval echo configure:8124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then NSPR_LIBS="-lnspr3 $NSPR_LIBS" result="yes" else @@ -8138,7 +8053,7 @@ fi echo $ac_n "checking for PL_CreateOptState in -lplc3""... $ac_c" 1>&6 -echo "configure:8142: checking for PL_CreateOptState in -lplc3" >&5 +echo "configure:8057: checking for PL_CreateOptState in -lplc3" >&5 ac_lib_var=`echo plc3'_'PL_CreateOptState | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8146,7 +8061,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lplc3 $NSPR_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8179,7 +8094,7 @@ MISSING_NSPR="$MISSING_NSPR -lplc3" fi echo $ac_n "checking for PL_GetEvent in -lplds3""... $ac_c" 1>&6 -echo "configure:8183: checking for PL_GetEvent in -lplds3" >&5 +echo "configure:8098: checking for PL_GetEvent in -lplds3" >&5 ac_lib_var=`echo plds3'_'PL_GetEvent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8187,7 +8102,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lplds3 $NSPR_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8223,9 +8138,9 @@ fi CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS -if test -n "${NSPR_DIR}" && test -d "${NSPR_DIR}" ; then +if test "${NSPR_DIR}" -a -d "${NSPR_DIR}"; then NSPR_CFLAGS="-I${NSPR_DIR}/include" - if test "$NSPR_LIBDIR"x != "x" ; then + if test "$NSPR_LIBDIR"x != x; then NSPR_LIBS="-L${NSPR_LIBDIR} ${NSPR_LIBS}" else NSPR_LIBS="-L${NSPR_DIR}/lib ${NSPR_LIBS}" @@ -8264,7 +8179,7 @@ then # 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:8268: checking for $ac_word" >&5 +echo "configure:8183: 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 @@ -8336,20 +8251,20 @@ if test "$USING_HCC"; then fi if test "$no_x" != "yes"; then -if test -n "$MISSING_X"; then +if test "$MISSING_X"; then { echo "configure: error: Could not find the following X libraries: $MISSING_X " 1>&2; exit 1; }; fi -if test -n "$MISSING_GTK"; then +if test "$MISSING_GTK"; then { echo "configure: error: Could not link sample program with the following gtk libraries: $MISSING_GTK " 1>&2; exit 1; } fi -if test -n "$MISSING_MOTIF"; then +if test "$MISSING_MOTIF"; then { echo "configure: error: Could not find the following motif libraries: $MISSING_MOTIF " 1>&2; exit 1; }; fi fi # $no_x -if test -n "$MISSING_NSPR"; then +if test "$MISSING_NSPR"; then { echo "configure: error: Could not find the following nspr libraries or could not run sample program: $MISSING_NSPR" 1>&2; exit 1; }; fi @@ -8468,8 +8383,8 @@ EOF fi fi -for d in lib modules modules/security; do - if test ! -d $d ; then rm -f $d; mkdir $d; fi +for dir in lib modules modules/security; do + if test ! -d $dir; then rm -f $dir; mkdir $dir; fi done # Load the list of Makefiles to generate. @@ -8657,6 +8572,7 @@ s%@GNU_CC@%$GNU_CC%g s%@GNU_CXX@%$GNU_CXX%g s%@ALLOCA@%$ALLOCA%g s%@LIBOBJS@%$LIBOBJS%g +s%@COMPILER_DEPEND@%$COMPILER_DEPEND%g s%@MDDEPDIR@%$MDDEPDIR%g s%@AS@%$AS%g s%@ASFLAGS@%$ASFLAGS%g @@ -8689,7 +8605,6 @@ s%@MOZ_DOM@%$MOZ_DOM%g s%@MOZ_MAIL_COMPOSE@%$MOZ_MAIL_COMPOSE%g s%@FULL_STATIC_BUILD@%$FULL_STATIC_BUILD%g s%@NO_UNIX_LDAP@%$NO_UNIX_LDAP%g -s%@COMPILER_DEPEND@%$COMPILER_DEPEND%g s%@BUILD_XPIDL@%$BUILD_XPIDL%g s%@BUILD_IDLC@%$BUILD_IDLC%g s%@GTK_CONFIG@%$GTK_CONFIG%g