Date: Monday April 30, 2001 @ 4:34 Author: cameron Update of /home/netrek/cvsroot/Vanilla In directory swashbuckler.fortress.real-time.com:/var/tmp/cvs-serv20916 Modified Files: ChangeLog configure configure.in system.mk.in Log Message: Sun Apr 29 16:52:47 2001 Benjamin `Quisar' Lerman <quisar at quisar.ambre.net> * configure.in: put back AC_SUBST(INL) so that sysdef is correct. Remove the hach about INSTALL that is not necessary. Changed a few things about res-rsa so that it work outside the tree source. Move handling of with-gum so that it does not mess with INSTALL * system.mk.in, keycomp/Makefile.in, newstartd/Makefile.in, ntserv/Makefile.in, pledit/Makefile.in, robotd/Makefile.in, robots/Makefile.in, sequencer/Makefile.in, tools/Makefile.in, xsg/Makefile.in: remove OPT (CFLAGS is the way to do it), remove -lm which is already there with configure and remove the double -g. * gum/Makefile.am, gum/Makefile.in, gum/signals.c: gum.xpm is now found by gum. **************************************** Index: Vanilla/ChangeLog diff -u Vanilla/ChangeLog:1.119 Vanilla/ChangeLog:1.120 --- Vanilla/ChangeLog:1.119 Mon Apr 30 04:13:03 2001 +++ Vanilla/ChangeLog Mon Apr 30 04:34:35 2001 @@ -1,3 +1,20 @@ +Sun Apr 29 16:52:47 2001 Benjamin `Quisar' Lerman <quisar at quisar.ambre.net> + + * configure.in: put back AC_SUBST(INL) so that sysdef is correct. + Remove the hach about INSTALL that is not necessary. Changed a few + things about res-rsa so that it work outside the tree source. + Move handling of with-gum so that it does not mess with INSTALL + + * system.mk.in, keycomp/Makefile.in, newstartd/Makefile.in, + ntserv/Makefile.in, pledit/Makefile.in, robotd/Makefile.in, + robots/Makefile.in, sequencer/Makefile.in, tools/Makefile.in, + xsg/Makefile.in: remove OPT (CFLAGS is the way to do it), remove + -lm which is already there with configure and remove the double + -g. + + * gum/Makefile.am, gum/Makefile.in, gum/signals.c: gum.xpm is now + found by gum. + Mon Apr 30 19:06:51 2001 James Cameron <quozl at us.netrek.org> * tools/ltd_dump.c: add ability to query LTD statistics by player @@ -1251,4 +1268,4 @@ update_sys_defaults in updateMessages to a more appropriate location - updateClient in socket.c. - $Id: ChangeLog,v 1.119 2001/04/30 09:13:03 cameron Exp $ + $Id: ChangeLog,v 1.120 2001/04/30 09:34:35 cameron Exp $ Index: Vanilla/configure diff -u Vanilla/configure:1.21 Vanilla/configure:1.22 --- Vanilla/configure:1.21 Sat Apr 28 05:13:34 2001 +++ Vanilla/configure Mon Apr 30 04:34:35 2001 @@ -592,6 +592,7 @@ EOF + fi # Check whether --with-gum or --without-gum was given. @@ -650,7 +651,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:654: checking for a BSD compatible install" >&5 +echo "configure:655: 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 @@ -702,24 +703,10 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# -# autoconf assumes that we never cd to a subdirectory and then use the -# install-sh that it has found in the current directory, so we hack around -# this by testing for the particular case and modifying the variable directly. -# -# this may break with a future version of autoconf. to test this on a Linux -# system, hide your /usr/bin/install, remove config.cache, and re-run the -# autoconf generated configure script. -# cameron at stl.dec.com -# -if test "$INSTALL" = "./install-sh -c"; then - INSTALL="$PWD/install-sh -c" -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:723: checking for $ac_word" >&5 +echo "configure:710: 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 @@ -749,7 +736,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:753: checking for $ac_word" >&5 +echo "configure:740: 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 @@ -800,7 +787,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:804: checking for $ac_word" >&5 +echo "configure:791: 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 @@ -832,7 +819,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:836: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:823: 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. @@ -843,12 +830,12 @@ cat > conftest.$ac_ext << EOF -#line 847 "configure" +#line 834 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -874,12 +861,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:878: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:865: 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:883: checking whether we are using GNU C" >&5 +echo "configure:870: 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 @@ -888,7 +875,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:892: \"$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:879: \"$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 @@ -907,7 +894,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:911: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:898: 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 @@ -939,7 +926,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:943: checking how to run the C preprocessor" >&5 +echo "configure:930: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -954,13 +941,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 958 "configure" +#line 945 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:964: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:951: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -971,13 +958,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 975 "configure" +#line 962 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:981: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:968: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -988,13 +975,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 992 "configure" +#line 979 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:998: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:985: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1019,7 +1006,7 @@ echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1023: checking whether ln -s works" >&5 +echo "configure:1010: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1040,7 +1027,7 @@ fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1044: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1031: 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 @@ -1068,9 +1055,9 @@ echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:1072: checking for AIX" >&5 +echo "configure:1059: checking for AIX" >&5 cat > conftest.$ac_ext <<EOF -#line 1074 "configure" +#line 1061 "configure" #include "confdefs.h" #ifdef _AIX yes @@ -1093,21 +1080,21 @@ echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:1097: checking for inline" >&5 +echo "configure:1084: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 1104 "configure" +#line 1091 "configure" #include "confdefs.h" int main() { } int $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:1111: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1098: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1144,16 +1131,16 @@ #-------------------------------------------------------------------- echo $ac_n "checking if fd_set requires sys/select.h""... $ac_c" 1>&6 -echo "configure:1148: checking if fd_set requires sys/select.h" >&5 +echo "configure:1135: checking if fd_set requires sys/select.h" >&5 cat > conftest.$ac_ext <<EOF -#line 1150 "configure" +#line 1137 "configure" #include "confdefs.h" #include <sys/types.h> int main() { fd_set readMask, writeMask; ; return 0; } EOF -if { (eval echo configure:1157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1144: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""no" 1>&6 else @@ -1161,7 +1148,7 @@ cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 1165 "configure" +#line 1152 "configure" #include "confdefs.h" #include <sys/select.h> EOF @@ -1190,12 +1177,12 @@ #-------------------------------------------------------------------- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1194: checking for ANSI C header files" >&5 +echo "configure:1181: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1199 "configure" +#line 1186 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -1203,7 +1190,7 @@ #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1207: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1194: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1220,7 +1207,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1224 "configure" +#line 1211 "configure" #include "confdefs.h" #include <string.h> EOF @@ -1238,7 +1225,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1242 "configure" +#line 1229 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -1259,7 +1246,7 @@ : else cat > conftest.$ac_ext <<EOF -#line 1263 "configure" +#line 1250 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1270,7 +1257,7 @@ exit (0); } EOF -if { (eval echo configure:1274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1297,17 +1284,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1301: checking for $ac_hdr" >&5 +echo "configure:1288: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1306 "configure" +#line 1293 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1311: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1298: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1337,17 +1324,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1341: checking for $ac_hdr" >&5 +echo "configure:1328: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1346 "configure" +#line 1333 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1351: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1338: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1377,17 +1364,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1381: checking for $ac_hdr" >&5 +echo "configure:1368: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1386 "configure" +#line 1373 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1391: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1378: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1417,17 +1404,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1421: checking for $ac_hdr" >&5 +echo "configure:1408: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1426 "configure" +#line 1413 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1431: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1418: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1455,7 +1442,7 @@ echo $ac_n "checking for wait3 that fills in rusage""... $ac_c" 1>&6 -echo "configure:1459: checking for wait3 that fills in rusage" >&5 +echo "configure:1446: checking for wait3 that fills in rusage" >&5 if eval "test \"`echo '$''{'ac_cv_func_wait3_rusage'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1463,7 +1450,7 @@ ac_cv_func_wait3_rusage=no else cat > conftest.$ac_ext <<EOF -#line 1467 "configure" +#line 1454 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -1494,7 +1481,7 @@ } } EOF -if { (eval echo configure:1498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_wait3_rusage=yes else @@ -1517,12 +1504,12 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:1521: checking for pid_t" >&5 +echo "configure:1508: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1526 "configure" +#line 1513 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -1550,12 +1537,12 @@ fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:1554: checking for uid_t in sys/types.h" >&5 +echo "configure:1541: 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 -#line 1559 "configure" +#line 1546 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -1584,12 +1571,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1588: checking for size_t" >&5 +echo "configure:1575: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1593 "configure" +#line 1580 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -1618,17 +1605,17 @@ ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:1622: checking for vfork.h" >&5 +echo "configure:1609: 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 -#line 1627 "configure" +#line 1614 "configure" #include "confdefs.h" #include <vfork.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1632: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1619: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1653,18 +1640,18 @@ fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:1657: checking for working vfork" >&5 +echo "configure:1644: 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:1663: checking for vfork" >&5 +echo "configure:1650: 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 <<EOF -#line 1668 "configure" +#line 1655 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vfork(); below. */ @@ -1687,7 +1674,7 @@ ; return 0; } EOF -if { (eval echo configure:1691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vfork=yes" else @@ -1709,7 +1696,7 @@ ac_cv_func_vfork_works=$ac_cv_func_vfork else cat > conftest.$ac_ext <<EOF -#line 1713 "configure" +#line 1700 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include <stdio.h> @@ -1804,7 +1791,7 @@ } } EOF -if { (eval echo configure:1808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_vfork_works=yes else @@ -1827,12 +1814,12 @@ fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:1831: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:1818: 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 <<EOF -#line 1836 "configure" +#line 1823 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> @@ -1840,7 +1827,7 @@ struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:1844: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1831: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -1862,9 +1849,9 @@ echo $ac_n "checking for itimer in time.h""... $ac_c" 1>&6 -echo "configure:1866: checking for itimer in time.h" >&5 +echo "configure:1853: checking for itimer in time.h" >&5 cat > conftest.$ac_ext <<EOF -#line 1868 "configure" +#line 1855 "configure" #include "confdefs.h" #include <time.h> EOF @@ -1883,7 +1870,7 @@ echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:1887: checking size of long" >&5 +echo "configure:1874: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1891,7 +1878,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 1895 "configure" +#line 1882 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1902,7 +1889,7 @@ exit(0); } EOF -if { (eval echo configure:1906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -1923,9 +1910,9 @@ echo $ac_n "checking for u_int in sys/types.h""... $ac_c" 1>&6 -echo "configure:1927: checking for u_int in sys/types.h" >&5 +echo "configure:1914: checking for u_int in sys/types.h" >&5 cat > conftest.$ac_ext <<EOF -#line 1929 "configure" +#line 1916 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -1944,9 +1931,9 @@ echo $ac_n "checking for PATH_MAX in limits.h""... $ac_c" 1>&6 -echo "configure:1948: checking for PATH_MAX in limits.h" >&5 +echo "configure:1935: checking for PATH_MAX in limits.h" >&5 cat > conftest.$ac_ext <<EOF -#line 1950 "configure" +#line 1937 "configure" #include "confdefs.h" #include <limits.h> @@ -1971,7 +1958,7 @@ # Checking for gnu-win32 Windows libraries echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6 -echo "configure:1975: checking for main in -lgdi32" >&5 +echo "configure:1962: checking for main in -lgdi32" >&5 ac_lib_var=`echo gdi32'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1979,14 +1966,14 @@ ac_save_LIBS="$LIBS" LIBS="-lgdi32 $LIBS" cat > conftest.$ac_ext <<EOF -#line 1983 "configure" +#line 1970 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:1990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2025,7 +2012,7 @@ # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:2029: checking for X" >&5 +echo "configure:2016: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -2087,12 +2074,12 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext <<EOF -#line 2091 "configure" +#line 2078 "configure" #include "confdefs.h" #include <$x_direct_test_include> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2096: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2083: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2161,14 +2148,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <<EOF -#line 2165 "configure" +#line 2152 "configure" #include "confdefs.h" int main() { ${x_direct_test_function}() ; return 0; } EOF -if { (eval echo configure:2172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -2259,12 +2246,12 @@ echo checking for X11 header files XINCLUDES="" cat > conftest.$ac_ext <<EOF -#line 2263 "configure" +#line 2250 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2268: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2255: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2296,7 +2283,7 @@ echo "checking for X11 library archive" echo $ac_n "checking for main in -lX11""... $ac_c" 1>&6 -echo "configure:2300: checking for main in -lX11" >&5 +echo "configure:2287: checking for main in -lX11" >&5 ac_lib_var=`echo X11'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2304,14 +2291,14 @@ ac_save_LIBS="$LIBS" LIBS="-lX11 $LIBS" cat > conftest.$ac_ext <<EOF -#line 2308 "configure" +#line 2295 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2347,7 +2334,7 @@ fi if test "$XLIBSWLIB" = nope ; then echo $ac_n "checking for main in -lXwindow""... $ac_c" 1>&6 -echo "configure:2351: checking for main in -lXwindow" >&5 +echo "configure:2338: checking for main in -lXwindow" >&5 ac_lib_var=`echo Xwindow'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2355,14 +2342,14 @@ ac_save_LIBS="$LIBS" LIBS="-lXwindow $LIBS" cat > conftest.$ac_ext <<EOF -#line 2359 "configure" +#line 2346 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2405,7 +2392,7 @@ SAVEINCS="$INCS" INCS="$INCS $XINCLUDES" echo $ac_n "checking for main in -lXpm""... $ac_c" 1>&6 -echo "configure:2409: checking for main in -lXpm" >&5 +echo "configure:2396: checking for main in -lXpm" >&5 ac_lib_var=`echo Xpm'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2413,14 +2400,14 @@ ac_save_LIBS="$LIBS" LIBS="-lXpm $LIBS" cat > conftest.$ac_ext <<EOF -#line 2417 "configure" +#line 2404 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2447,17 +2434,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2451: checking for $ac_hdr" >&5 +echo "configure:2438: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2456 "configure" +#line 2443 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2461: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2448: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2507,7 +2494,7 @@ #-------------------------------------------------------------------- echo $ac_n "checking for mp.h""... $ac_c" 1>&6 -echo "configure:2511: checking for mp.h" >&5 +echo "configure:2498: checking for mp.h" >&5 # Check whether --with-gmp-incdir or --without-gmp-incdir was given. if test "${with_gmp_incdir+set}" = set; then withval="$with_gmp_incdir" @@ -2518,7 +2505,7 @@ if test "$MPINC" = nope; then cat > conftest.$ac_ext <<EOF -#line 2522 "configure" +#line 2509 "configure" #include "confdefs.h" #include <mp.h> @@ -2538,7 +2525,7 @@ fi echo $ac_n "checking for gmp.h""... $ac_c" 1>&6 -echo "configure:2542: checking for gmp.h" >&5 +echo "configure:2529: checking for gmp.h" >&5 # if test "$MPINC" = nope; then # AC_TRY_CPP([#include <gmp.h>], [MPINC="-I/usr/include" search=false], MPINC=nope) # fi @@ -2559,12 +2546,12 @@ if test "$code" = cow; then # mp not supported with new mkkey. cat > conftest.$ac_ext <<EOF -#line 2563 "configure" +#line 2550 "configure" #include "confdefs.h" #include <mp.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2568: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2555: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2579,12 +2566,12 @@ rm -f conftest* else cat > conftest.$ac_ext <<EOF -#line 2583 "configure" +#line 2570 "configure" #include "confdefs.h" #include <mp.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2588: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2575: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2616,7 +2603,7 @@ SAVEINCS="$INCS" INCS="$INCS $XINCLUDES" cat > conftest.$ac_ext <<EOF -#line 2620 "configure" +#line 2607 "configure" #include "confdefs.h" #include <gmp.h> @@ -2648,7 +2635,7 @@ MPLIB=nope else echo $ac_n "checking for main in -lmp""... $ac_c" 1>&6 -echo "configure:2652: checking for main in -lmp" >&5 +echo "configure:2639: checking for main in -lmp" >&5 ac_lib_var=`echo mp'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2656,14 +2643,14 @@ ac_save_LIBS="$LIBS" LIBS="-lmp $LIBS" cat > conftest.$ac_ext <<EOF -#line 2660 "configure" +#line 2647 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2685,7 +2672,7 @@ fi echo $ac_n "checking for main in -lgmp""... $ac_c" 1>&6 -echo "configure:2689: checking for main in -lgmp" >&5 +echo "configure:2676: checking for main in -lgmp" >&5 ac_lib_var=`echo gmp'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2693,14 +2680,14 @@ ac_save_LIBS="$LIBS" LIBS="-lgmp $LIBS" cat > conftest.$ac_ext <<EOF -#line 2697 "configure" +#line 2684 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2739,7 +2726,7 @@ if test "$MPLIB" = nope; then if test "$code" = cow; then echo $ac_n "checking for main in -lmp""... $ac_c" 1>&6 -echo "configure:2743: checking for main in -lmp" >&5 +echo "configure:2730: checking for main in -lmp" >&5 ac_lib_var=`echo mp'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2747,14 +2734,14 @@ ac_save_LIBS="$LIBS" LIBS="-lmp $LIBS" cat > conftest.$ac_ext <<EOF -#line 2751 "configure" +#line 2738 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2777,7 +2764,7 @@ else echo $ac_n "checking for main in -lmp""... $ac_c" 1>&6 -echo "configure:2781: checking for main in -lmp" >&5 +echo "configure:2768: checking for main in -lmp" >&5 ac_lib_var=`echo mp'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2785,14 +2772,14 @@ ac_save_LIBS="$LIBS" LIBS="-lmp $LIBS" cat > conftest.$ac_ext <<EOF -#line 2789 "configure" +#line 2776 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2841,12 +2828,12 @@ fi if test "$code" = server; then echo $ac_n "checking res-rsa/configure""... $ac_c" 1>&6 -echo "configure:2845: checking res-rsa/configure" >&5 +echo "configure:2832: checking res-rsa/configure" >&5 if test -r "$srcdir/res-rsa/configure"; then - subdirs="$srcdir/res-rsa" + subdirs="res-rsa" echo "$ac_t""RSA utilities found" 1>&6 - RSAINC="-I`pwd`/res-rsa" + RSAINC="-I${srcdir}/res-rsa" RSALIB="-L`pwd`/res-rsa -lrsa" NORSA="" else @@ -2867,7 +2854,7 @@ #-------------------------------------------------------------------- echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6 -echo "configure:2871: checking for main in -lXbsd" >&5 +echo "configure:2858: checking for main in -lXbsd" >&5 ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2875,14 +2862,14 @@ ac_save_LIBS="$LIBS" LIBS="-lXbsd $LIBS" cat > conftest.$ac_ext <<EOF -#line 2879 "configure" +#line 2866 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2905,7 +2892,7 @@ # AC _CHECK_LIB(V3, main, [LIBS="$LIBS -lV3"]) # AC _CHECK_LIB(PW, main, [LIBS="$LIBS -lPW"]) echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:2909: checking for main in -lsocket" >&5 +echo "configure:2896: checking for main in -lsocket" >&5 ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2913,14 +2900,14 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 2917 "configure" +#line 2904 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2941,7 +2928,7 @@ fi echo $ac_n "checking for main in -linet""... $ac_c" 1>&6 -echo "configure:2945: checking for main in -linet" >&5 +echo "configure:2932: checking for main in -linet" >&5 ac_lib_var=`echo inet'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2949,14 +2936,14 @@ ac_save_LIBS="$LIBS" LIBS="-linet $LIBS" cat > conftest.$ac_ext <<EOF -#line 2953 "configure" +#line 2940 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2977,7 +2964,7 @@ fi echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:2981: checking for main in -lnsl" >&5 +echo "configure:2968: checking for main in -lnsl" >&5 ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2985,14 +2972,14 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 2989 "configure" +#line 2976 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3013,7 +3000,7 @@ fi echo $ac_n "checking for main in -lseq""... $ac_c" 1>&6 -echo "configure:3017: checking for main in -lseq" >&5 +echo "configure:3004: checking for main in -lseq" >&5 ac_lib_var=`echo seq'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3021,14 +3008,14 @@ ac_save_LIBS="$LIBS" LIBS="-lseq $LIBS" cat > conftest.$ac_ext <<EOF -#line 3025 "configure" +#line 3012 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3049,7 +3036,7 @@ fi echo $ac_n "checking for main in -lsun""... $ac_c" 1>&6 -echo "configure:3053: checking for main in -lsun" >&5 +echo "configure:3040: checking for main in -lsun" >&5 ac_lib_var=`echo sun'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3057,14 +3044,14 @@ ac_save_LIBS="$LIBS" LIBS="-lsun $LIBS" cat > conftest.$ac_ext <<EOF -#line 3061 "configure" +#line 3048 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3087,7 +3074,7 @@ if test "$code" = server; then echo $ac_n "checking for main in -lipc""... $ac_c" 1>&6 -echo "configure:3091: checking for main in -lipc" >&5 +echo "configure:3078: checking for main in -lipc" >&5 ac_lib_var=`echo ipc'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3095,14 +3082,14 @@ ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <<EOF -#line 3099 "configure" +#line 3086 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3123,7 +3110,7 @@ fi echo $ac_n "checking for main in -lshm""... $ac_c" 1>&6 -echo "configure:3127: checking for main in -lshm" >&5 +echo "configure:3114: checking for main in -lshm" >&5 ac_lib_var=`echo shm'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3131,14 +3118,14 @@ ac_save_LIBS="$LIBS" LIBS="-lshm $LIBS" cat > conftest.$ac_ext <<EOF -#line 3135 "configure" +#line 3122 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3159,7 +3146,7 @@ fi echo $ac_n "checking for main in -lstuff""... $ac_c" 1>&6 -echo "configure:3163: checking for main in -lstuff" >&5 +echo "configure:3150: checking for main in -lstuff" >&5 ac_lib_var=`echo stuff'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3167,14 +3154,14 @@ ac_save_LIBS="$LIBS" LIBS="-lstuff $LIBS" cat > conftest.$ac_ext <<EOF -#line 3171 "configure" +#line 3158 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3196,7 +3183,7 @@ echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:3200: checking for crypt in -lcrypt" >&5 +echo "configure:3187: checking for crypt in -lcrypt" >&5 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3204,7 +3191,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcrypt $LIBS" cat > conftest.$ac_ext <<EOF -#line 3208 "configure" +#line 3195 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3215,7 +3202,7 @@ crypt() ; return 0; } EOF -if { (eval echo configure:3219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3238,7 +3225,7 @@ echo $ac_n "checking for main in -ltermcap""... $ac_c" 1>&6 -echo "configure:3242: checking for main in -ltermcap" >&5 +echo "configure:3229: checking for main in -ltermcap" >&5 ac_lib_var=`echo termcap'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3246,14 +3233,14 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <<EOF -#line 3250 "configure" +#line 3237 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3276,7 +3263,7 @@ echo $ac_n "checking for newwin in -lncurses""... $ac_c" 1>&6 -echo "configure:3280: checking for newwin in -lncurses" >&5 +echo "configure:3267: checking for newwin in -lncurses" >&5 ac_lib_var=`echo ncurses'_'newwin | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3284,7 +3271,7 @@ ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 3288 "configure" +#line 3275 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3295,7 +3282,7 @@ newwin() ; return 0; } EOF -if { (eval echo configure:3299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3314,7 +3301,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for newwin in -lcurses""... $ac_c" 1>&6 -echo "configure:3318: checking for newwin in -lcurses" >&5 +echo "configure:3305: checking for newwin in -lcurses" >&5 ac_lib_var=`echo curses'_'newwin | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3322,7 +3309,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 3326 "configure" +#line 3313 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3333,7 +3320,7 @@ newwin() ; return 0; } EOF -if { (eval echo configure:3337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3365,12 +3352,12 @@ #-------------------------------------------------------------------- echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:3369: checking return type of signal handlers" >&5 +echo "configure:3356: 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 <<EOF -#line 3374 "configure" +#line 3361 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -3387,7 +3374,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:3391: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3378: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -3406,7 +3393,7 @@ echo $ac_n "checking for restartable system calls""... $ac_c" 1>&6 -echo "configure:3410: checking for restartable system calls" >&5 +echo "configure:3397: checking for restartable system calls" >&5 if eval "test \"`echo '$''{'ac_cv_sys_restartable_syscalls'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3414,7 +3401,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 3418 "configure" +#line 3405 "configure" #include "confdefs.h" /* Exit 0 (true) if wait returns something other than -1, i.e. the pid of the child, which means that wait was restarted @@ -3432,7 +3419,7 @@ } EOF -if { (eval echo configure:3436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sys_restartable_syscalls=yes else @@ -3455,7 +3442,7 @@ fi echo $ac_n "checking for signals style""... $ac_c" 1>&6 -echo "configure:3459: checking for signals style" >&5 +echo "configure:3446: checking for signals style" >&5 if eval "test \"`echo '$''{'vanilla_cv_signals_type'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3464,7 +3451,7 @@ else cat > conftest.$ac_ext <<EOF -#line 3468 "configure" +#line 3455 "configure" #include "confdefs.h" #include <signal.h> @@ -3484,7 +3471,7 @@ exit(0);} EOF -if { (eval echo configure:3488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then vanilla_cv_signals_type=BSD else @@ -3508,12 +3495,12 @@ else if test "x$vanilla_cv_signals_type" = xSYSV_or_POSIX; then echo $ac_n "checking for sigset""... $ac_c" 1>&6 -echo "configure:3512: checking for sigset" >&5 +echo "configure:3499: checking for sigset" >&5 if eval "test \"`echo '$''{'ac_cv_func_sigset'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3517 "configure" +#line 3504 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char sigset(); below. */ @@ -3536,7 +3523,7 @@ ; return 0; } EOF -if { (eval echo configure:3540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_sigset=yes" else @@ -3577,12 +3564,12 @@ for ac_func in usleep random setstate strftime ftime strcmpi strncmpi do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3581: checking for $ac_func" >&5 +echo "configure:3568: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3586 "configure" +#line 3573 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3605,7 +3592,7 @@ ; return 0; } EOF -if { (eval echo configure:3609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3631,7 +3618,7 @@ echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:3635: checking for main in -lm" >&5 +echo "configure:3622: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3639,14 +3626,14 @@ ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 3643 "configure" +#line 3630 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3669,12 +3656,12 @@ for ac_func in nint do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3673: checking for $ac_func" >&5 +echo "configure:3660: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3678 "configure" +#line 3665 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3697,7 +3684,7 @@ ; return 0; } EOF -if { (eval echo configure:3701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3719,7 +3706,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for nint in -lsunmath""... $ac_c" 1>&6 -echo "configure:3723: checking for nint in -lsunmath" >&5 +echo "configure:3710: checking for nint in -lsunmath" >&5 ac_lib_var=`echo sunmath'_'nint | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3727,7 +3714,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsunmath $LIBS" cat > conftest.$ac_ext <<EOF -#line 3731 "configure" +#line 3718 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3738,7 +3725,7 @@ nint() ; return 0; } EOF -if { (eval echo configure:3742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3779,7 +3766,7 @@ cat > conftest.$ac_ext <<EOF -#line 3783 "configure" +#line 3770 "configure" #include "confdefs.h" #include <math.h> EOF @@ -3800,12 +3787,12 @@ for ac_func in setstate strdup rint do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3804: checking for $ac_func" >&5 +echo "configure:3791: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3809 "configure" +#line 3796 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3828,7 +3815,7 @@ ; return 0; } EOF -if { (eval echo configure:3832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3859,12 +3846,12 @@ for ac_func in random strdup rint do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3863: checking for $ac_func" >&5 +echo "configure:3850: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3868 "configure" +#line 3855 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3887,7 +3874,7 @@ ; return 0; } EOF -if { (eval echo configure:3891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3922,7 +3909,7 @@ if test "$code" = server; then echo $ac_n "checking for netstat""... $ac_c" 1>&6 -echo "configure:3926: checking for netstat" >&5 +echo "configure:3913: checking for netstat" >&5 dirs="/bsd /usr/bsd /etc /bin /usr/bin /usr/etc" NETSTAT="nice -20 /usr/ucb/netstat -f inet" for i in $dirs; do @@ -3938,7 +3925,7 @@ done echo $ac_n "checking for uptime""... $ac_c" 1>&6 -echo "configure:3942: checking for uptime" >&5 +echo "configure:3929: checking for uptime" >&5 dirs="/bsd /usr/bsd /etc /bin /usr/bin /usr/etc" for i in $dirs; do if test -x $i/uptime; then @@ -3951,109 +3938,8 @@ fi done -if test "x$GUM" = xdo_gum; then - -if test "$no_recursion" != yes; then - - # Remove --cache-file and --srcdir arguments so they do not pile up. - ac_sub_configure_args= - ac_prev= - for ac_arg in $ac_configure_args; do - if test -n "$ac_prev"; then - ac_prev= - continue - fi - case "$ac_arg" in - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - ;; - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - ;; - *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;; - esac - done - - for ac_config_dir in gum; do - - # Do not complain, so a configure script can configure whichever - # parts of a large source tree are present. - if test ! -d $srcdir/$ac_config_dir; then - continue - fi - - echo configuring in $ac_config_dir - - case "$srcdir" in - .) ;; - *) - if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :; - else - { echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; } - fi - ;; - esac - - ac_popdir=`pwd` - cd $ac_config_dir - - # A "../" for each directory in /$ac_config_dir. - ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'` - - case "$srcdir" in - .) # No --srcdir option. We are building in place. - ac_sub_srcdir=$srcdir ;; - /*) # Absolute path. - ac_sub_srcdir=$srcdir/$ac_config_dir ;; - *) # Relative path. - ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;; - esac - - # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_sub_srcdir/configure; then - ac_sub_configure=$ac_sub_srcdir/configure - elif test -f $ac_sub_srcdir/configure.in; then - ac_sub_configure=$ac_configure - else - echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2 - ac_sub_configure= - fi - - # The recursion is here. - if test -n "$ac_sub_configure"; then - - # Make the cache file name correct relative to the subdirectory. - case "$cache_file" in - /*) ac_sub_cache_file=$cache_file ;; - *) # Relative path. - ac_sub_cache_file="$ac_dots$cache_file" ;; - esac - case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; - *) INSTALL="$ac_dots$ac_given_INSTALL" ;; - esac - - echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" - # The eval makes quoting arguments work. - if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir - then : - else - { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; } - fi - fi - - cd $ac_popdir - done -fi - fi -fi - trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -4193,6 +4079,7 @@ s%@mandir@%$mandir%g s%@LOGNAME@%$LOGNAME%g s%@PKEY@%$PKEY%g +s%@INL@%$INL%g s%@GUM@%$GUM%g s%@stable@%$stable%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g @@ -4466,8 +4353,108 @@ *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;; esac done + + for ac_config_dir in res-rsa; do + + # Do not complain, so a configure script can configure whichever + # parts of a large source tree are present. + if test ! -d $srcdir/$ac_config_dir; then + continue + fi + + echo configuring in $ac_config_dir + + case "$srcdir" in + .) ;; + *) + if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :; + else + { echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; } + fi + ;; + esac + + ac_popdir=`pwd` + cd $ac_config_dir + + # A "../" for each directory in /$ac_config_dir. + ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'` + + case "$srcdir" in + .) # No --srcdir option. We are building in place. + ac_sub_srcdir=$srcdir ;; + /*) # Absolute path. + ac_sub_srcdir=$srcdir/$ac_config_dir ;; + *) # Relative path. + ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;; + esac + + # Check for guested configure; otherwise get Cygnus style configure. + if test -f $ac_sub_srcdir/configure; then + ac_sub_configure=$ac_sub_srcdir/configure + elif test -f $ac_sub_srcdir/configure.in; then + ac_sub_configure=$ac_configure + else + echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2 + ac_sub_configure= + fi + + # The recursion is here. + if test -n "$ac_sub_configure"; then + + # Make the cache file name correct relative to the subdirectory. + case "$cache_file" in + /*) ac_sub_cache_file=$cache_file ;; + *) # Relative path. + ac_sub_cache_file="$ac_dots$cache_file" ;; + esac + case "$ac_given_INSTALL" in + [/$]*) INSTALL="$ac_given_INSTALL" ;; + *) INSTALL="$ac_dots$ac_given_INSTALL" ;; + esac + + echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" + # The eval makes quoting arguments work. + if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir + then : + else + { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; } + fi + fi + + cd $ac_popdir + done +fi + + +if test "x$GUM" = xdo_gum; then + +if test "$no_recursion" != yes; then + + # Remove --cache-file and --srcdir arguments so they do not pile up. + ac_sub_configure_args= + ac_prev= + for ac_arg in $ac_configure_args; do + if test -n "$ac_prev"; then + ac_prev= + continue + fi + case "$ac_arg" in + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) + ;; + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + ;; + *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;; + esac + done - for ac_config_dir in $srcdir/res-rsa; do + for ac_config_dir in gum; do # Do not complain, so a configure script can configure whichever # parts of a large source tree are present. @@ -4537,5 +4524,7 @@ cd $ac_popdir done +fi + fi Index: Vanilla/configure.in diff -u Vanilla/configure.in:1.23 Vanilla/configure.in:1.24 --- Vanilla/configure.in:1.23 Sat Apr 28 05:13:34 2001 +++ Vanilla/configure.in Mon Apr 30 04:34:35 2001 @@ -37,6 +37,7 @@ AC_DEFINE(LTD_STATS) AC_DEFINE(LTD_PER_RACE) AC_SUBST(PKEY) + AC_SUBST(INL) fi AC_ARG_WITH(gum, [ --with-gum Compile and install gum ], @@ -58,20 +59,6 @@ fi AC_PROG_INSTALL -# -# autoconf assumes that we never cd to a subdirectory and then use the -# install-sh that it has found in the current directory, so we hack around -# this by testing for the particular case and modifying the variable directly. -# -# this may break with a future version of autoconf. to test this on a Linux -# system, hide your /usr/bin/install, remove config.cache, and re-run the -# autoconf generated configure script. -# cameron at stl.dec.com -# -if test "$INSTALL" = "./install-sh -c"; then - INSTALL="$PWD/install-sh -c" -fi - AC_PROG_CC AC_PROG_CPP AC_PROG_LN_S @@ -341,9 +328,9 @@ if test "$code" = server; then AC_MSG_CHECKING(res-rsa/configure) if test -r "$srcdir/res-rsa/configure"; then - AC_CONFIG_SUBDIRS($srcdir/res-rsa) + AC_CONFIG_SUBDIRS(res-rsa) AC_MSG_RESULT(RSA utilities found) - RSAINC="-I`pwd`/res-rsa" + RSAINC="-I${srcdir}/res-rsa" RSALIB="-L`pwd`/res-rsa -lrsa" NORSA="" else @@ -492,10 +479,6 @@ fi done -if test "x$GUM" = xdo_gum; then - AC_OUTPUT_SUBDIRS(gum) -fi - fi AC_OUTPUT(system.mk Makefile ntserv/defs.h ntserv/Makefile tools/Makefile @@ -503,3 +486,8 @@ keycomp/Makefile xsg/Makefile pledit/Makefile robotd/Makefile docs/Makefile tools/no_geno_timer tools/geno_timer docs/sample_geno_timer_crontab docs/sample_sysdef) + +if test "x$GUM" = xdo_gum; then + AC_OUTPUT_SUBDIRS(gum) +fi + Index: Vanilla/system.mk.in diff -u Vanilla/system.mk.in:1.9 Vanilla/system.mk.in:1.10 --- Vanilla/system.mk.in:1.9 Thu Apr 26 19:45:18 2001 +++ Vanilla/system.mk.in Mon Apr 30 04:34:35 2001 @@ -29,17 +29,7 @@ CC = @CC@ CPP = @CPP@ LN = @LN_S@ - -# Optimizer flags: -# +O3 - Highest optimization -# -O Normal optimization (+O2) -# -g Debugging (default, due to prevalence of optimizer bugs) -# -O -g is useful to help debugging while still optimized - -OPT = -g LDFLAGS = @LDFLAGS@ -#OPT = -O6 -fomit-frame-pointer -#OPT = -O #LINKFLAGS = -s -N