Date: Thursday April 26, 2001 @ 19:45 Author: cameron Update of /home/netrek/cvsroot/Vanilla In directory swashbuckler.fortress.real-time.com:/var/tmp/cvs-serv18519 Modified Files: ChangeLog INSTALL.INL PROJECTS config.h.in configure configure.in system.mk.in Added Files: Makefile.in Removed Files: Makefile Log Message: Significant build environment changes from Benjamin `Quisar' Lerman which do the following; - permit compilation with CWD outside source tree, - include robotd in server build, - add configure --with-gum flag, - add configure --with-inl flag, (still needs to adjust .sysdef) - change configure detection of signal style, - allow environment variables CFLAGS and LDFLAGS to be set before configure, - fix a pledit core dump, - change robotd to use limits.h instead of values.h All Makefiles are now removed, replaced by Makefile.in files, which configure uses to generate the Makefiles. Also includes some minor fixes by James Cameron. See ChangeLog **************************************** Index: Vanilla/ChangeLog diff -u Vanilla/ChangeLog:1.113 Vanilla/ChangeLog:1.114 --- Vanilla/ChangeLog:1.113 Thu Apr 26 18:41:50 2001 +++ Vanilla/ChangeLog Thu Apr 26 19:45:18 2001 @@ -1,3 +1,32 @@ +Fri Apr 27 10:17:04 2001 James Cameron <quozl at us.netrek.org> + + * configure.in: changed the warning for RSA utilities not found so + that it looks "right" on the output of configure. + +Fri Apr 27 10:14:40 2001 James Cameron <quozl at us.netrek.org> + + * robotd/Makefile.in (robot): target tried to save old robot + binary to robot.old, changed to avoid this, as it breaks + compilation after make distclean and is non-intuitive. + +Fri Apr 27 10:04:23 2001 James Cameron <quozl at us.netrek.org> + + * robotd/input.c (process_stdin): change gets() to fgets(). + +Fri Apr 27 10:02:22 2001 James Cameron <quozl at us.netrek.org> + + * xsg/x11window.c: remove strdup() declaration. + +Fri Apr 27 09:43:02 2001 Benjamin `Quisar' Lerman <quisar at quisar.ambre.net> + + * configure.in, config.h.in, system.mk.in, gum/Makefile.am: permit + compilation outside source tree, tested on Linux, Solaris and + OpenBSD. Include robotd in package make. Add --with-gum to + configure. Add --with-inl to configure. Testing of BSD signals + in configure shows yes/no answer and is now cached. Environement + variables CFLAGS and LDFLAGS are taken into account by configure. + Change to use Makefile.in per directory. + Fri Apr 27 09:33:55 2001 Benjamin `Quisar' Lerman <quisar at quisar.ambre.net> * robotd: Changed in robotd values.h to limits.h and MAXINT to @@ -1175,4 +1204,4 @@ update_sys_defaults in updateMessages to a more appropriate location - updateClient in socket.c. - $Id: ChangeLog,v 1.113 2001/04/26 23:41:50 cameron Exp $ + $Id: ChangeLog,v 1.114 2001/04/27 00:45:18 cameron Exp $ Index: Vanilla/INSTALL.INL diff -u Vanilla/INSTALL.INL:1.3 Vanilla/INSTALL.INL:1.4 --- Vanilla/INSTALL.INL:1.3 Thu Feb 24 21:11:43 2000 +++ Vanilla/INSTALL.INL Thu Apr 26 19:45:18 2001 @@ -1,4 +1,4 @@ -# $Id: INSTALL.INL,v 1.3 2000/02/25 03:11:43 cameron Exp $ +# $Id: INSTALL.INL,v 1.4 2001/04/27 00:45:18 cameron Exp $ Instructions for installing the Vanilla Netrek Server as an INL Server Summary @@ -7,7 +7,7 @@ 0) choose a place to put the server (e.g. /usr/local/games/netrek) 1) change PKEY in ntserv/defs.h if you have a pickup server too 2) enable LTD_STATS and LTD_PER_RACE in config.h.in - 3) type "./configure --prefix=dir" where dir is from step 0 + 3) type "./configure --prefix=dir --with-inl" where dir is from step 0 4) type "make install" 5) "cd /usr/local/games/netrek" (or whatever dir was) 6) "vi .sysdef" and set INL=1 Index: Vanilla/PROJECTS diff -u Vanilla/PROJECTS:1.84 Vanilla/PROJECTS:1.85 --- Vanilla/PROJECTS:1.84 Wed Jan 3 03:15:19 2001 +++ Vanilla/PROJECTS Thu Apr 26 19:45:18 2001 @@ -1,5 +1,5 @@ -$Id: PROJECTS,v 1.84 2001/01/03 09:15:19 unbelver Exp $ +$Id: PROJECTS,v 1.85 2001/04/27 00:45:18 cameron Exp $ List of things to do in the future @@ -114,6 +114,7 @@ - INL robot entry voted in from pickup, do not do odds/evens swapping, keep old teams if possible, the league does not need 0-7 pre-allocation of slots to teams, + INL robot problems reported by d4sand, Index: Vanilla/config.h.in diff -u Vanilla/config.h.in:1.25 Vanilla/config.h.in:1.26 --- Vanilla/config.h.in:1.25 Sun Feb 11 17:58:34 2001 +++ Vanilla/config.h.in Thu Apr 26 19:45:18 2001 @@ -207,6 +207,10 @@ README.LTD for details. THIS BREAKS PLAYERDB COMPATIBILITY!! */ +#undef INL + /* INL - Compile a server + with INL mode */ + #undef LTD_STATS /* LTD_PER_RACE - LTD stats are normally Index: Vanilla/configure diff -u Vanilla/configure:1.18 Vanilla/configure:1.19 --- Vanilla/configure:1.18 Fri Mar 19 22:09:35 1999 +++ Vanilla/configure Thu Apr 26 19:45:18 2001 @@ -12,6 +12,10 @@ ac_default_prefix=/usr/local # Any additions from configure.in: ac_help="$ac_help + --with-inl INL Mode " +ac_help="$ac_help + --with-gum Compile and install gum " +ac_help="$ac_help --with-x use the X Window System" ac_help="$ac_help --with-gmp-incdir GMP Include Dir" @@ -534,7 +538,7 @@ #---------------------------------------------------- echo $ac_n "checking for used sources""... $ac_c" 1>&6 -echo "configure:538: checking for used sources" >&5 +echo "configure:542: checking for used sources" >&5 if test -f "$srcdir/playerlist.c"; then code=cow echo "$ac_t""COW" 1>&6 @@ -565,8 +569,37 @@ EOF + + # Check whether --with-inl or --without-inl was given. +if test "${with_inl+set}" = set; then + withval="$with_inl" + INL=yes fi + if test "x$INL" = xyes ; then + cat >> confdefs.h <<\EOF +#define INL 1 +EOF + + cat >> confdefs.h <<\EOF +#define LTD_STATS 1 +EOF + + cat >> confdefs.h <<\EOF +#define LTD_PER_RACE 1 +EOF + + fi + + # Check whether --with-gum or --without-gum was given. +if test "${with_gum+set}" = set; then + withval="$with_gum" + GUM=do_gum +fi + + +fi + if test "$code" = cow; then echo "Produce a stable release (y/n)?" read stable @@ -614,7 +647,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:618: checking for a BSD compatible install" >&5 +echo "configure:651: 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 @@ -683,7 +716,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:687: checking for $ac_word" >&5 +echo "configure:720: 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 @@ -713,7 +746,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:717: checking for $ac_word" >&5 +echo "configure:750: 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 @@ -764,7 +797,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:768: checking for $ac_word" >&5 +echo "configure:801: 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 @@ -796,7 +829,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:800: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:833: 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. @@ -807,12 +840,12 @@ cat > conftest.$ac_ext << EOF -#line 811 "configure" +#line 844 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:849: \"$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 @@ -838,12 +871,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:842: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:875: 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:847: checking whether we are using GNU C" >&5 +echo "configure:880: 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 @@ -852,7 +885,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:856: \"$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:889: \"$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 @@ -871,7 +904,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:875: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:908: 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 @@ -903,7 +936,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:907: checking how to run the C preprocessor" >&5 +echo "configure:940: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -918,13 +951,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 922 "configure" +#line 955 "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:928: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:961: \"$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 : @@ -935,13 +968,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 939 "configure" +#line 972 "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:945: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:978: \"$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 : @@ -952,13 +985,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 956 "configure" +#line 989 "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:962: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:995: \"$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 : @@ -983,7 +1016,7 @@ echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:987: checking whether ln -s works" >&5 +echo "configure:1020: 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 @@ -1003,11 +1036,38 @@ echo "$ac_t""no" 1>&6 fi +echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 +echo "configure:1041: 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 +else + cat > conftestmake <<\EOF +all: + @echo 'ac_maketemp="${MAKE}"' +EOF +# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=` +if test -n "$ac_maketemp"; then + eval ac_cv_prog_make_${ac_make}_set=yes +else + eval ac_cv_prog_make_${ac_make}_set=no +fi +rm -f conftestmake +fi +if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then + echo "$ac_t""yes" 1>&6 + SET_MAKE= +else + echo "$ac_t""no" 1>&6 + SET_MAKE="MAKE=${MAKE-make}" +fi + echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:1009: checking for AIX" >&5 +echo "configure:1069: checking for AIX" >&5 cat > conftest.$ac_ext <<EOF -#line 1011 "configure" +#line 1071 "configure" #include "confdefs.h" #ifdef _AIX yes @@ -1030,21 +1090,21 @@ echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:1034: checking for inline" >&5 +echo "configure:1094: 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 1041 "configure" +#line 1101 "configure" #include "confdefs.h" int main() { -} $ac_kw foo() { +} int $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:1048: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1108: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1081,16 +1141,16 @@ #-------------------------------------------------------------------- echo $ac_n "checking if fd_set requires sys/select.h""... $ac_c" 1>&6 -echo "configure:1085: checking if fd_set requires sys/select.h" >&5 +echo "configure:1145: checking if fd_set requires sys/select.h" >&5 cat > conftest.$ac_ext <<EOF -#line 1087 "configure" +#line 1147 "configure" #include "confdefs.h" #include <sys/types.h> int main() { fd_set readMask, writeMask; ; return 0; } EOF -if { (eval echo configure:1094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1154: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""no" 1>&6 else @@ -1098,7 +1158,7 @@ cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 1102 "configure" +#line 1162 "configure" #include "confdefs.h" #include <sys/select.h> EOF @@ -1127,12 +1187,12 @@ #-------------------------------------------------------------------- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1131: checking for ANSI C header files" >&5 +echo "configure:1191: 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 1136 "configure" +#line 1196 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -1140,7 +1200,7 @@ #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1144: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1204: \"$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* @@ -1157,7 +1217,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 1161 "configure" +#line 1221 "configure" #include "confdefs.h" #include <string.h> EOF @@ -1175,7 +1235,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 1179 "configure" +#line 1239 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -1196,7 +1256,7 @@ : else cat > conftest.$ac_ext <<EOF -#line 1200 "configure" +#line 1260 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1207,7 +1267,7 @@ exit (0); } EOF -if { (eval echo configure:1211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1234,17 +1294,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1238: checking for $ac_hdr" >&5 +echo "configure:1298: 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 1243 "configure" +#line 1303 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1248: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1308: \"$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* @@ -1274,17 +1334,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1278: checking for $ac_hdr" >&5 +echo "configure:1338: 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 1283 "configure" +#line 1343 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1288: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1348: \"$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* @@ -1314,17 +1374,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1318: checking for $ac_hdr" >&5 +echo "configure:1378: 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 1323 "configure" +#line 1383 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1328: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1388: \"$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* @@ -1354,17 +1414,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1358: checking for $ac_hdr" >&5 +echo "configure:1418: 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 1363 "configure" +#line 1423 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1368: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1428: \"$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* @@ -1392,7 +1452,7 @@ echo $ac_n "checking for wait3 that fills in rusage""... $ac_c" 1>&6 -echo "configure:1396: checking for wait3 that fills in rusage" >&5 +echo "configure:1456: 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 @@ -1400,7 +1460,7 @@ ac_cv_func_wait3_rusage=no else cat > conftest.$ac_ext <<EOF -#line 1404 "configure" +#line 1464 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -1431,7 +1491,7 @@ } } EOF -if { (eval echo configure:1435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1495: \"$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 @@ -1454,12 +1514,12 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:1458: checking for pid_t" >&5 +echo "configure:1518: 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 1463 "configure" +#line 1523 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -1487,12 +1547,12 @@ fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:1491: checking for uid_t in sys/types.h" >&5 +echo "configure:1551: 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 1496 "configure" +#line 1556 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -1521,12 +1581,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1525: checking for size_t" >&5 +echo "configure:1585: 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 1530 "configure" +#line 1590 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -1555,17 +1615,17 @@ ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:1559: checking for vfork.h" >&5 +echo "configure:1619: 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 1564 "configure" +#line 1624 "configure" #include "confdefs.h" #include <vfork.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1569: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1629: \"$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* @@ -1590,18 +1650,18 @@ fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:1594: checking for working vfork" >&5 +echo "configure:1654: 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:1600: checking for vfork" >&5 +echo "configure:1660: 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 1605 "configure" +#line 1665 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vfork(); below. */ @@ -1624,7 +1684,7 @@ ; return 0; } EOF -if { (eval echo configure:1628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1688: \"$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 @@ -1646,7 +1706,7 @@ ac_cv_func_vfork_works=$ac_cv_func_vfork else cat > conftest.$ac_ext <<EOF -#line 1650 "configure" +#line 1710 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include <stdio.h> @@ -1741,7 +1801,7 @@ } } EOF -if { (eval echo configure:1745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1805: \"$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 @@ -1764,12 +1824,12 @@ fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:1768: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:1828: 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 1773 "configure" +#line 1833 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> @@ -1777,7 +1837,7 @@ struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:1781: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1841: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -1799,9 +1859,9 @@ echo $ac_n "checking for itimer in time.h""... $ac_c" 1>&6 -echo "configure:1803: checking for itimer in time.h" >&5 +echo "configure:1863: checking for itimer in time.h" >&5 cat > conftest.$ac_ext <<EOF -#line 1805 "configure" +#line 1865 "configure" #include "confdefs.h" #include <time.h> EOF @@ -1820,7 +1880,7 @@ echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:1824: checking size of long" >&5 +echo "configure:1884: 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 @@ -1828,7 +1888,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 1832 "configure" +#line 1892 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1839,7 +1899,7 @@ exit(0); } EOF -if { (eval echo configure:1843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1903: \"$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 @@ -1860,9 +1920,9 @@ echo $ac_n "checking for u_int in sys/types.h""... $ac_c" 1>&6 -echo "configure:1864: checking for u_int in sys/types.h" >&5 +echo "configure:1924: checking for u_int in sys/types.h" >&5 cat > conftest.$ac_ext <<EOF -#line 1866 "configure" +#line 1926 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -1881,9 +1941,9 @@ echo $ac_n "checking for PATH_MAX in limits.h""... $ac_c" 1>&6 -echo "configure:1885: checking for PATH_MAX in limits.h" >&5 +echo "configure:1945: checking for PATH_MAX in limits.h" >&5 cat > conftest.$ac_ext <<EOF -#line 1887 "configure" +#line 1947 "configure" #include "confdefs.h" #include <limits.h> @@ -1908,7 +1968,7 @@ # Checking for gnu-win32 Windows libraries echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6 -echo "configure:1912: checking for main in -lgdi32" >&5 +echo "configure:1972: 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 @@ -1916,14 +1976,14 @@ ac_save_LIBS="$LIBS" LIBS="-lgdi32 $LIBS" cat > conftest.$ac_ext <<EOF -#line 1920 "configure" +#line 1980 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:1927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1987: \"$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 @@ -1962,7 +2022,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:1966: checking for X" >&5 +echo "configure:2026: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -2024,12 +2084,12 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext <<EOF -#line 2028 "configure" +#line 2088 "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:2033: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2093: \"$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* @@ -2098,14 +2158,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <<EOF -#line 2102 "configure" +#line 2162 "configure" #include "confdefs.h" int main() { ${x_direct_test_function}() ; return 0; } EOF -if { (eval echo configure:2109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2169: \"$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. @@ -2196,12 +2256,12 @@ echo checking for X11 header files XINCLUDES="" cat > conftest.$ac_ext <<EOF -#line 2200 "configure" +#line 2260 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2265: \"$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 : @@ -2233,7 +2293,7 @@ echo "checking for X11 library archive" echo $ac_n "checking for main in -lX11""... $ac_c" 1>&6 -echo "configure:2237: checking for main in -lX11" >&5 +echo "configure:2297: 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 @@ -2241,14 +2301,14 @@ ac_save_LIBS="$LIBS" LIBS="-lX11 $LIBS" cat > conftest.$ac_ext <<EOF -#line 2245 "configure" +#line 2305 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2312: \"$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 @@ -2284,7 +2344,7 @@ fi if test "$XLIBSWLIB" = nope ; then echo $ac_n "checking for main in -lXwindow""... $ac_c" 1>&6 -echo "configure:2288: checking for main in -lXwindow" >&5 +echo "configure:2348: 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 @@ -2292,14 +2352,14 @@ ac_save_LIBS="$LIBS" LIBS="-lXwindow $LIBS" cat > conftest.$ac_ext <<EOF -#line 2296 "configure" +#line 2356 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2363: \"$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 @@ -2342,7 +2402,7 @@ SAVEINCS="$INCS" INCS="$INCS $XINCLUDES" echo $ac_n "checking for main in -lXpm""... $ac_c" 1>&6 -echo "configure:2346: checking for main in -lXpm" >&5 +echo "configure:2406: 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 @@ -2350,14 +2410,14 @@ ac_save_LIBS="$LIBS" LIBS="-lXpm $LIBS" cat > conftest.$ac_ext <<EOF -#line 2354 "configure" +#line 2414 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2421: \"$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 @@ -2384,17 +2444,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2388: checking for $ac_hdr" >&5 +echo "configure:2448: 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 2393 "configure" +#line 2453 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2398: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2458: \"$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* @@ -2444,7 +2504,7 @@ #-------------------------------------------------------------------- echo $ac_n "checking for mp.h""... $ac_c" 1>&6 -echo "configure:2448: checking for mp.h" >&5 +echo "configure:2508: 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" @@ -2455,7 +2515,7 @@ if test "$MPINC" = nope; then cat > conftest.$ac_ext <<EOF -#line 2459 "configure" +#line 2519 "configure" #include "confdefs.h" #include <mp.h> @@ -2475,7 +2535,7 @@ fi echo $ac_n "checking for gmp.h""... $ac_c" 1>&6 -echo "configure:2479: checking for gmp.h" >&5 +echo "configure:2539: 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 @@ -2496,12 +2556,12 @@ if test "$code" = cow; then # mp not supported with new mkkey. cat > conftest.$ac_ext <<EOF -#line 2500 "configure" +#line 2560 "configure" #include "confdefs.h" #include <mp.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2505: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2565: \"$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* @@ -2516,12 +2576,12 @@ rm -f conftest* else cat > conftest.$ac_ext <<EOF -#line 2520 "configure" +#line 2580 "configure" #include "confdefs.h" #include <mp.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2585: \"$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* @@ -2553,7 +2613,7 @@ SAVEINCS="$INCS" INCS="$INCS $XINCLUDES" cat > conftest.$ac_ext <<EOF -#line 2557 "configure" +#line 2617 "configure" #include "confdefs.h" #include <gmp.h> @@ -2585,7 +2645,7 @@ MPLIB=nope else echo $ac_n "checking for main in -lmp""... $ac_c" 1>&6 -echo "configure:2589: checking for main in -lmp" >&5 +echo "configure:2649: 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 @@ -2593,14 +2653,14 @@ ac_save_LIBS="$LIBS" LIBS="-lmp $LIBS" cat > conftest.$ac_ext <<EOF -#line 2597 "configure" +#line 2657 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2664: \"$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 @@ -2622,7 +2682,7 @@ fi echo $ac_n "checking for main in -lgmp""... $ac_c" 1>&6 -echo "configure:2626: checking for main in -lgmp" >&5 +echo "configure:2686: 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 @@ -2630,14 +2690,14 @@ ac_save_LIBS="$LIBS" LIBS="-lgmp $LIBS" cat > conftest.$ac_ext <<EOF -#line 2634 "configure" +#line 2694 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2701: \"$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 @@ -2676,7 +2736,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:2680: checking for main in -lmp" >&5 +echo "configure:2740: 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 @@ -2684,14 +2744,14 @@ ac_save_LIBS="$LIBS" LIBS="-lmp $LIBS" cat > conftest.$ac_ext <<EOF -#line 2688 "configure" +#line 2748 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2755: \"$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 @@ -2714,7 +2774,7 @@ else echo $ac_n "checking for main in -lmp""... $ac_c" 1>&6 -echo "configure:2718: checking for main in -lmp" >&5 +echo "configure:2778: 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 @@ -2722,14 +2782,14 @@ ac_save_LIBS="$LIBS" LIBS="-lmp $LIBS" cat > conftest.$ac_ext <<EOF -#line 2726 "configure" +#line 2786 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2793: \"$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 @@ -2778,7 +2838,7 @@ fi if test "$code" = server; then echo $ac_n "checking res-rsa/configure""... $ac_c" 1>&6 -echo "configure:2782: checking res-rsa/configure" >&5 +echo "configure:2842: checking res-rsa/configure" >&5 if test -r "$srcdir/res-rsa/configure"; then subdirs="$srcdir/res-rsa" @@ -2787,9 +2847,9 @@ RSALIB="-L`pwd`/res-rsa -lrsa" NORSA="" else - echo "$ac_t""Warning RSA utilities for server build not found" 1>&6 + echo no + echo "$ac_t""Warning: RSA utilities for server build not found" 1>&6 NORSA="#" - echo fi fi @@ -2804,7 +2864,7 @@ #-------------------------------------------------------------------- echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6 -echo "configure:2808: checking for main in -lXbsd" >&5 +echo "configure:2868: 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 @@ -2812,14 +2872,14 @@ ac_save_LIBS="$LIBS" LIBS="-lXbsd $LIBS" cat > conftest.$ac_ext <<EOF -#line 2816 "configure" +#line 2876 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2883: \"$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 @@ -2842,7 +2902,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:2846: checking for main in -lsocket" >&5 +echo "configure:2906: 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 @@ -2850,14 +2910,14 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 2854 "configure" +#line 2914 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2921: \"$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 @@ -2878,7 +2938,7 @@ fi echo $ac_n "checking for main in -linet""... $ac_c" 1>&6 -echo "configure:2882: checking for main in -linet" >&5 +echo "configure:2942: 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 @@ -2886,14 +2946,14 @@ ac_save_LIBS="$LIBS" LIBS="-linet $LIBS" cat > conftest.$ac_ext <<EOF -#line 2890 "configure" +#line 2950 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2957: \"$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 @@ -2914,7 +2974,7 @@ fi echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:2918: checking for main in -lnsl" >&5 +echo "configure:2978: 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 @@ -2922,14 +2982,14 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 2926 "configure" +#line 2986 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2993: \"$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 @@ -2950,7 +3010,7 @@ fi echo $ac_n "checking for main in -lseq""... $ac_c" 1>&6 -echo "configure:2954: checking for main in -lseq" >&5 +echo "configure:3014: 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 @@ -2958,14 +3018,14 @@ ac_save_LIBS="$LIBS" LIBS="-lseq $LIBS" cat > conftest.$ac_ext <<EOF -#line 2962 "configure" +#line 3022 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3029: \"$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 @@ -2986,7 +3046,7 @@ fi echo $ac_n "checking for main in -lsun""... $ac_c" 1>&6 -echo "configure:2990: checking for main in -lsun" >&5 +echo "configure:3050: 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 @@ -2994,14 +3054,14 @@ ac_save_LIBS="$LIBS" LIBS="-lsun $LIBS" cat > conftest.$ac_ext <<EOF -#line 2998 "configure" +#line 3058 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3065: \"$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 @@ -3024,7 +3084,7 @@ if test "$code" = server; then echo $ac_n "checking for main in -lipc""... $ac_c" 1>&6 -echo "configure:3028: checking for main in -lipc" >&5 +echo "configure:3088: 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 @@ -3032,14 +3092,14 @@ ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <<EOF -#line 3036 "configure" +#line 3096 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3103: \"$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 @@ -3060,7 +3120,7 @@ fi echo $ac_n "checking for main in -lshm""... $ac_c" 1>&6 -echo "configure:3064: checking for main in -lshm" >&5 +echo "configure:3124: 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 @@ -3068,14 +3128,14 @@ ac_save_LIBS="$LIBS" LIBS="-lshm $LIBS" cat > conftest.$ac_ext <<EOF -#line 3072 "configure" +#line 3132 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3139: \"$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 @@ -3096,7 +3156,7 @@ fi echo $ac_n "checking for main in -lstuff""... $ac_c" 1>&6 -echo "configure:3100: checking for main in -lstuff" >&5 +echo "configure:3160: 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 @@ -3104,14 +3164,14 @@ ac_save_LIBS="$LIBS" LIBS="-lstuff $LIBS" cat > conftest.$ac_ext <<EOF -#line 3108 "configure" +#line 3168 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3175: \"$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 @@ -3133,7 +3193,7 @@ echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:3137: checking for crypt in -lcrypt" >&5 +echo "configure:3197: 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 @@ -3141,7 +3201,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcrypt $LIBS" cat > conftest.$ac_ext <<EOF -#line 3145 "configure" +#line 3205 "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 @@ -3152,7 +3212,7 @@ crypt() ; return 0; } EOF -if { (eval echo configure:3156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3216: \"$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 @@ -3175,7 +3235,7 @@ echo $ac_n "checking for main in -ltermcap""... $ac_c" 1>&6 -echo "configure:3179: checking for main in -ltermcap" >&5 +echo "configure:3239: 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 @@ -3183,14 +3243,14 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <<EOF -#line 3187 "configure" +#line 3247 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3254: \"$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 @@ -3212,8 +3272,46 @@ +echo $ac_n "checking for newwin in -lncurses""... $ac_c" 1>&6 +echo "configure:3277: 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 +else + ac_save_LIBS="$LIBS" +LIBS="-lncurses $LIBS" +cat > conftest.$ac_ext <<EOF +#line 3285 "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 + builtin and then its argument prototype would still apply. */ +char newwin(); + +int main() { +newwin() +; return 0; } +EOF +if { (eval echo configure:3296: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + LIBCURSES="-lncurses" +else + echo "$ac_t""no" 1>&6 echo $ac_n "checking for newwin in -lcurses""... $ac_c" 1>&6 -echo "configure:3217: checking for newwin in -lcurses" >&5 +echo "configure:3315: 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 @@ -3221,7 +3319,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 3225 "configure" +#line 3323 "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 @@ -3232,7 +3330,7 @@ newwin() ; return 0; } EOF -if { (eval echo configure:3236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3334: \"$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 @@ -3251,6 +3349,9 @@ else echo "$ac_t""no" 1>&6 fi + + +fi @@ -3261,12 +3362,12 @@ #-------------------------------------------------------------------- echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:3265: checking return type of signal handlers" >&5 +echo "configure:3366: 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 3270 "configure" +#line 3371 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -3283,7 +3384,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:3287: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3388: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -3302,7 +3403,7 @@ echo $ac_n "checking for restartable system calls""... $ac_c" 1>&6 -echo "configure:3306: checking for restartable system calls" >&5 +echo "configure:3407: 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 @@ -3310,7 +3411,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 3314 "configure" +#line 3415 "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 @@ -3328,7 +3429,7 @@ } EOF -if { (eval echo configure:3332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3433: \"$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 @@ -3349,17 +3450,18 @@ EOF fi - -echo checking for BSD style signals -if test "$cross_compiling" = yes; then - cat >> confdefs.h <<\EOF -#define POSIX_SIGNALS 1 -EOF +echo $ac_n "checking for signals style""... $ac_c" 1>&6 +echo "configure:3456: 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 + if test "$cross_compiling" = yes; then + vanilla_cv_signals_type=POSIX else cat > conftest.$ac_ext <<EOF -#line 3363 "configure" +#line 3465 "configure" #include "confdefs.h" #include <signal.h> @@ -3379,23 +3481,36 @@ exit(0);} EOF -if { (eval echo configure:3383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then - cat >> confdefs.h <<\EOF -#define BSD_SIGNALS 1 -EOF - + vanilla_cv_signals_type=BSD else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -fr conftest* - echo $ac_n "checking for sigset""... $ac_c" 1>&6 -echo "configure:3394: checking for sigset" >&5 + vanilla_cv_signals_type=SYSV_or_POSIX +fi +rm -fr conftest* +fi + +fi + +echo "$ac_t""$vanilla_cv_signals_type" 1>&6 + +if test "x$vanilla_cv_signals_type" = xBSD; then + cat >> confdefs.h <<\EOF +#define BSD_SIGNALS 1 +EOF + +else + if test "x$vanilla_cv_signals_type" = xSYSV_or_POSIX; then + echo $ac_n "checking for sigset""... $ac_c" 1>&6 +echo "configure:3509: 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 3399 "configure" +#line 3514 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char sigset(); below. */ @@ -3418,7 +3533,7 @@ ; return 0; } EOF -if { (eval echo configure:3422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3537: \"$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 @@ -3444,8 +3559,12 @@ fi -fi -rm -fr conftest* + else + cat >> confdefs.h <<\EOF +#define POSIX_SIGNALS 1 +EOF + + fi fi @@ -3455,12 +3574,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:3459: checking for $ac_func" >&5 +echo "configure:3578: 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 3464 "configure" +#line 3583 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3483,7 +3602,7 @@ ; return 0; } EOF -if { (eval echo configure:3487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3606: \"$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 @@ -3509,7 +3628,7 @@ echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:3513: checking for main in -lm" >&5 +echo "configure:3632: 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 @@ -3517,14 +3636,14 @@ ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 3521 "configure" +#line 3640 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3647: \"$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 @@ -3547,12 +3666,12 @@ for ac_func in nint do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3551: checking for $ac_func" >&5 +echo "configure:3670: 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 3556 "configure" +#line 3675 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3575,7 +3694,7 @@ ; return 0; } EOF -if { (eval echo configure:3579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3698: \"$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 @@ -3593,14 +3712,71 @@ cat >> confdefs.h <<EOF #define $ac_tr_func 1 EOF - + HAVE_NINT="yes" +else + echo "$ac_t""no" 1>&6 +echo $ac_n "checking for nint in -lsunmath""... $ac_c" 1>&6 +echo "configure:3720: 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 +else + ac_save_LIBS="$LIBS" +LIBS="-lsunmath $LIBS" +cat > conftest.$ac_ext <<EOF +#line 3728 "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 + builtin and then its argument prototype would still apply. */ +char nint(); + +int main() { +nint() +; return 0; } +EOF +if { (eval echo configure:3739: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + HAVE_NINT="-lsunmath" else echo "$ac_t""no" 1>&6 +HAVE_NINT="no" fi + + +fi done + +NINT_LIBS=""; +if test "x$HAVE_NINT" = "xno"; then + HAVE_NINT="0" + +else + if test "x$HAVE_NINT" = "xyes"; then + NINT_LIBS=${HAVE_NINT} + fi + HAVE_NINT="1" + +fi + + + cat > conftest.$ac_ext <<EOF -#line 3604 "configure" +#line 3780 "configure" #include "confdefs.h" #include <math.h> EOF @@ -3621,12 +3797,12 @@ for ac_func in setstate strdup rint do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3625: checking for $ac_func" >&5 +echo "configure:3801: 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 3630 "configure" +#line 3806 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3649,7 +3825,7 @@ ; return 0; } EOF -if { (eval echo configure:3653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3829: \"$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 @@ -3680,12 +3856,12 @@ for ac_func in random strdup rint do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3684: checking for $ac_func" >&5 +echo "configure:3860: 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 3689 "configure" +#line 3865 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3708,7 +3884,7 @@ ; return 0; } EOF -if { (eval echo configure:3712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3888: \"$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 @@ -3743,7 +3919,7 @@ if test "$code" = server; then echo $ac_n "checking for netstat""... $ac_c" 1>&6 -echo "configure:3747: checking for netstat" >&5 +echo "configure:3923: 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 @@ -3759,7 +3935,7 @@ done echo $ac_n "checking for uptime""... $ac_c" 1>&6 -echo "configure:3763: checking for uptime" >&5 +echo "configure:3939: 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 @@ -3772,6 +3948,107 @@ 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 @@ -3875,7 +4152,11 @@ ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" -trap 'rm -fr `echo "system.mk tools/no_geno_timer tools/geno_timer docs/sample_geno_timer_crontab config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "system.mk Makefile ntserv/defs.h ntserv/Makefile tools/Makefile + sequencer/Makefile newstartd/Makefile robots/Makefile + keycomp/Makefile xsg/Makefile pledit/Makefile robotd/Makefile + docs/Makefile tools/no_geno_timer tools/geno_timer + docs/sample_geno_timer_crontab config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <<EOF @@ -3908,6 +4189,7 @@ s%@infodir@%$infodir%g s%@mandir@%$mandir%g s%@LOGNAME@%$LOGNAME%g +s%@GUM@%$GUM%g s%@stable@%$stable%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g @@ -3915,6 +4197,7 @@ s%@CC@%$CC%g s%@CPP@%$CPP%g s%@LN_S@%$LN_S%g +s%@SET_MAKE@%$SET_MAKE%g s%@NOX11@%$NOX11%g s%@NOWIN32@%$NOWIN32%g s%@XINCLUDES@%$XINCLUDES%g @@ -3929,6 +4212,8 @@ s%@LIBCRYPT@%$LIBCRYPT%g s%@LIBTERMCAP@%$LIBTERMCAP%g s%@LIBCURSES@%$LIBCURSES%g +s%@HAVE_NINT@%$HAVE_NINT%g +s%@NINT_LIBS@%$NINT_LIBS%g s%@LIBOBJS@%$LIBOBJS%g CEOF @@ -3971,7 +4256,11 @@ cat >> $CONFIG_STATUS <<EOF -CONFIG_FILES=\${CONFIG_FILES-"system.mk tools/no_geno_timer tools/geno_timer docs/sample_geno_timer_crontab"} +CONFIG_FILES=\${CONFIG_FILES-"system.mk Makefile ntserv/defs.h ntserv/Makefile tools/Makefile + sequencer/Makefile newstartd/Makefile robots/Makefile + keycomp/Makefile xsg/Makefile pledit/Makefile robotd/Makefile + docs/Makefile tools/no_geno_timer tools/geno_timer + docs/sample_geno_timer_crontab"} EOF cat >> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then Index: Vanilla/configure.in diff -u Vanilla/configure.in:1.19 Vanilla/configure.in:1.20 --- Vanilla/configure.in:1.19 Mon Apr 23 18:39:41 2001 +++ Vanilla/configure.in Thu Apr 26 19:45:18 2001 @@ -30,6 +30,17 @@ AC_SUBST(prefix) AC_DEFINE_UNQUOTED(LIBDIR,"$prefix") AC_SUBST(LOGNAME) + + AC_ARG_WITH(inl, [ --with-inl INL Mode ], INL=yes) + if test "x$INL" = xyes ; then + AC_DEFINE(INL) + AC_DEFINE(LTD_STATS) + AC_DEFINE(LTD_PER_RACE) + fi + + AC_ARG_WITH(gum, [ --with-gum Compile and install gum ], + GUM=do_gum) + AC_SUBST(GUM) fi if test "$code" = cow; then @@ -63,6 +74,7 @@ AC_PROG_CC AC_PROG_CPP AC_PROG_LN_S +AC_PROG_MAKE_SET AC_AIX @@ -334,9 +346,9 @@ RSALIB="-L`pwd`/res-rsa -lrsa" NORSA="" else - AC_MSG_RESULT(Warning RSA utilities for server build not found, turning RSA off) + echo no + AC_MSG_RESULT(Warning: RSA utilities for server build not found, turning RSA off) NORSA="#" - echo fi fi @@ -383,7 +395,7 @@ AC_TYPE_SIGNAL AC_SYS_RESTARTABLE_SYSCALLS -echo checking for BSD style signals +AC_CACHE_CHECK(for signals style,vanilla_cv_signals_type, AC_TRY_RUN([ #include <signal.h> #include <sys/time.h> @@ -400,18 +412,48 @@ for (c=0; c<5; c++) pause(); exit(0);} -], AC_DEFINE(BSD_SIGNALS), - AC_CHECK_FUNC(sigset, AC_DEFINE(SYSV_SIGNALS), AC_DEFINE(POSIX_SIGNALS)), - AC_DEFINE(POSIX_SIGNALS) -) +], vanilla_cv_signals_type=BSD, + vanilla_cv_signals_type=SYSV_or_POSIX, + vanilla_cv_signals_type=POSIX +)) + +if test "x$vanilla_cv_signals_type" = xBSD; then + AC_DEFINE(BSD_SIGNALS) +else + if test "x$vanilla_cv_signals_type" = xSYSV_or_POSIX; then + AC_CHECK_FUNC(sigset, AC_DEFINE(SYSV_SIGNALS), + AC_DEFINE(POSIX_SIGNALS)) + else + AC_DEFINE(POSIX_SIGNALS) + fi +fi + # AC_CHECK_LIB(BSD, main, [LIBS="$LIBS -lBSD"]) # AC_CHECK_LIB(bsd, main, [LIBS="$LIBS -lbsd"]) AC_CHECK_FUNCS(usleep random setstate strftime ftime strcmpi strncmpi) AC_CHECK_LIB(m, main, [LIBS="$LIBS -lm"]) -AC_CHECK_FUNCS(nint) +AC_CHECK_FUNCS(nint,HAVE_NINT="yes", + AC_CHECK_LIB(sunmath,nint,HAVE_NINT="-lsunmath", + HAVE_NINT="no") + ) + +NINT_LIBS=""; +if test "x$HAVE_NINT" = "xno"; then + HAVE_NINT="0" + AC_SUBST(HAVE_NINT) +else + if test "x$HAVE_NINT" = "xyes"; then + NINT_LIBS=${HAVE_NINT} + fi + HAVE_NINT="1" + AC_SUBST(HAVE_NINT) +fi + +AC_SUBST(NINT_LIBS) + AC_EGREP_HEADER(rint, math.h, , AC_DEFINE(NEED_RINT_DEC)) if test "$code" = cow; then @@ -449,6 +491,14 @@ fi done +if test "x$GUM" = xdo_gum; then + AC_OUTPUT_SUBDIRS(gum) +fi + fi -AC_OUTPUT(system.mk tools/no_geno_timer tools/geno_timer docs/sample_geno_timer_crontab) +AC_OUTPUT(system.mk Makefile ntserv/defs.h ntserv/Makefile tools/Makefile + sequencer/Makefile newstartd/Makefile robots/Makefile + keycomp/Makefile xsg/Makefile pledit/Makefile robotd/Makefile + docs/Makefile tools/no_geno_timer tools/geno_timer + docs/sample_geno_timer_crontab) Index: Vanilla/system.mk.in diff -u Vanilla/system.mk.in:1.8 Vanilla/system.mk.in:1.9 --- Vanilla/system.mk.in:1.8 Fri Mar 19 22:09:36 1999 +++ Vanilla/system.mk.in Thu Apr 26 19:45:18 2001 @@ -37,6 +37,7 @@ # -O -g is useful to help debugging while still optimized OPT = -g +LDFLAGS = @LDFLAGS@ #OPT = -O6 -fomit-frame-pointer #OPT = -O @@ -47,7 +48,7 @@ # compile in parallel with gnu's parallel make! # MAKE = gmake -j 8 -MAKE = make + at SET_MAKE@ # SysV defines: # Use only -lm (EXTRALIBS) if you're not on SysV @@ -62,12 +63,12 @@ EXTRAINCS = # -I/usr/local/X11R5/include -NETREK_INCLUDES = -I../ntserv +NETREK_INCLUDES = -I../ntserv -I at srcdir@/../ntserv # Some systems don't have strdup() or random() # Comment out if you have strdup() and random() -#STRDUPC = strdup.c random.c +#STRDUPC = @srcdir@/strdup.c @srcdir@/random.c #STRDUPO = strdup.o random.o RANDOMO = @LIBOBJS@ @@ -90,7 +91,7 @@ RSA_INCS = @NORSA@ @MPINC@ RSA_LIB = @NORSA@ @RSALIB@ @MPLIB@ -FLAGS = $(EXTRAFLAGS) $(NETREK_INCLUDES) $(RSA_FLAGS) +FLAGS = @CFLAGS@ $(EXTRAFLAGS) $(NETREK_INCLUDES) $(RSA_FLAGS) # In config.h now DIRS = # -DLIBDIR=\"$(LIBDIR)\"