Vanilla Development Maling List Archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
CVS update: Vanilla
Date: Wednesday March 17, 1999 @ 20:25
Author: tanner
Update of /home/netrek/cvsroot/Vanilla
In directory cvs.castle.real-time.com:/var/tmp/cvs-serv1346
Modified Files:
Makefile config.h.in configure configure.in system.mk.in
Log Message:
Changes to makefiles and configure.in to compile under solaris.
****************************************
Index: Vanilla/Makefile
diff -u Vanilla/Makefile:1.7 Vanilla/Makefile:1.8
--- Vanilla/Makefile:1.7 Wed Mar 17 18:26:21 1999
+++ Vanilla/Makefile Wed Mar 17 20:25:40 1999
@@ -61,8 +61,8 @@
rsalib: $(DEP_INCS)
- -@if [ -f res-rsa/configure ]; then \
- $(MAKE) -C res-rsa; \
+ @if [ -f res-rsa/rsa_util.c ]; then \
+ $(MAKE) -C res-rsa ;\
fi
utils: $(DEP_INCS) rsalib
Index: Vanilla/config.h.in
diff -u Vanilla/config.h.in:1.11 Vanilla/config.h.in:1.12
--- Vanilla/config.h.in:1.11 Mon Mar 15 21:15:50 1999
+++ Vanilla/config.h.in Wed Mar 17 20:25:41 1999
@@ -407,6 +407,7 @@
#undef HAVE_MATH_H
#undef HAVE_STDLIB_H
#undef _ALL_SOURCES
+#undef HAVE_SYS_SIGNAL_H
#undef BSD_SIGNALS
#undef SYSV_SIGNALS
#undef POSIX_SIGNALS
@@ -670,6 +671,12 @@
#define INC_UNISTD <unistd.h>
#else
#define INC_UNISTD NULLFILE
+#endif
+
+#ifdef HAVE_SYS_SIGNAL_H
+#define INC_SYS_SIGNAL <sys/signal.h>
+#else
+#define INC_SYS_SIGNAL NULLFILE
#endif
#ifdef HAVE_SYS_FCNTL_H
Index: Vanilla/configure
diff -u Vanilla/configure:1.16 Vanilla/configure:1.17
--- Vanilla/configure:1.16 Tue Mar 16 02:53:19 1999
+++ Vanilla/configure Wed Mar 17 20:25:41 1999
@@ -2397,27 +2397,9 @@
echo $ac_n "checking for gmp.h""... $ac_c" 1>&6
echo "configure:2400: checking for gmp.h" >&5
- if test "$MPINC" = nope; then
- cat > conftest.$ac_ext <<EOF
-#line 2403 "configure"
-#include "confdefs.h"
-#include <gmp.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2408: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
- rm -rf conftest*
- MPINC="-I/usr/include" search=false
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- MPINC=nope
-fi
-rm -f conftest*
- fi
+# if test "$MPINC" = nope; then
+# AC_TRY_CPP([#include <gmp.h>], [MPINC="-I/usr/include" search=false], MPINC=nope)
+# fi
if test "$MPINC" = nope; then
dirs="$srcdir/gmp-2.0.2 /usr/unsupported/include /usr/local/include \
@@ -2435,12 +2417,12 @@
if test "$code" = cow; then
# mp not supported with new mkkey.
cat > conftest.$ac_ext <<EOF
-#line 2439 "configure"
+#line 2421 "configure"
#include "confdefs.h"
#include <mp.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2444: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2426: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2455,12 +2437,12 @@
rm -f conftest*
else
cat > conftest.$ac_ext <<EOF
-#line 2459 "configure"
+#line 2441 "configure"
#include "confdefs.h"
#include <mp.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2464: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2446: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2492,7 +2474,7 @@
SAVEINCS="$INCS"
INCS="$INCS $XINCLUDES"
cat > conftest.$ac_ext <<EOF
-#line 2496 "configure"
+#line 2478 "configure"
#include "confdefs.h"
#include <gmp.h>
@@ -2524,7 +2506,7 @@
MPLIB=nope
else
echo $ac_n "checking for main in -lmp""... $ac_c" 1>&6
-echo "configure:2528: checking for main in -lmp" >&5
+echo "configure:2510: 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
@@ -2532,14 +2514,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lmp $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2536 "configure"
+#line 2518 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2561,7 +2543,7 @@
fi
echo $ac_n "checking for main in -lgmp""... $ac_c" 1>&6
-echo "configure:2565: checking for main in -lgmp" >&5
+echo "configure:2547: 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
@@ -2569,14 +2551,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lgmp $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2573 "configure"
+#line 2555 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2615,7 +2597,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:2619: checking for main in -lmp" >&5
+echo "configure:2601: 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
@@ -2623,14 +2605,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lmp $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2627 "configure"
+#line 2609 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2653,7 +2635,7 @@
else
echo $ac_n "checking for main in -lmp""... $ac_c" 1>&6
-echo "configure:2657: 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
@@ -2661,14 +2643,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lmp $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2665 "configure"
+#line 2647 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2716,12 +2698,12 @@
fi
fi
if test "$code" = server; then
-echo $ac_n "checking res-rsa/rsa_utilmp.c""... $ac_c" 1>&6
-echo "configure:2721: checking res-rsa/rsa_utilmp.c" >&5
- if test -r "$srcdir/res-rsa/rsa_utilmp.c"; then
+echo $ac_n "checking res-rsa/rsa_util.c""... $ac_c" 1>&6
+echo "configure:2703: checking res-rsa/rsa_util.c" >&5
+ if test -r "$srcdir/res-rsa/rsa_util.c"; then
echo "$ac_t""RSA utilities found" 1>&6
RSAINC="-I`pwd`/res-rsa"
- RSALIB="-L`pwd`/res-rsa -lRSA"
+ RSALIB="-L`pwd`/res-rsa -lrsa"
else
echo "$ac_t""Warning RSA utilities for server build not found" 1>&6
NORSA="#"
@@ -2740,7 +2722,7 @@
#--------------------------------------------------------------------
echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-echo "configure:2744: checking for main in -lXbsd" >&5
+echo "configure:2726: 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
@@ -2748,14 +2730,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lXbsd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2752 "configure"
+#line 2734 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2778,7 +2760,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:2782: checking for main in -lsocket" >&5
+echo "configure:2764: 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
@@ -2786,14 +2768,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2790 "configure"
+#line 2772 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2814,7 +2796,7 @@
fi
echo $ac_n "checking for main in -linet""... $ac_c" 1>&6
-echo "configure:2818: checking for main in -linet" >&5
+echo "configure:2800: 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
@@ -2822,14 +2804,14 @@
ac_save_LIBS="$LIBS"
LIBS="-linet $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2826 "configure"
+#line 2808 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2850,7 +2832,7 @@
fi
echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
-echo "configure:2854: checking for main in -lnsl" >&5
+echo "configure:2836: 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
@@ -2858,14 +2840,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2862 "configure"
+#line 2844 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2886,7 +2868,7 @@
fi
echo $ac_n "checking for main in -lseq""... $ac_c" 1>&6
-echo "configure:2890: checking for main in -lseq" >&5
+echo "configure:2872: 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
@@ -2894,14 +2876,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lseq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2898 "configure"
+#line 2880 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2922,7 +2904,7 @@
fi
echo $ac_n "checking for main in -lsun""... $ac_c" 1>&6
-echo "configure:2926: checking for main in -lsun" >&5
+echo "configure:2908: 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
@@ -2930,14 +2912,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lsun $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2934 "configure"
+#line 2916 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2960,7 +2942,7 @@
if test "$code" = server; then
echo $ac_n "checking for main in -lipc""... $ac_c" 1>&6
-echo "configure:2964: checking for main in -lipc" >&5
+echo "configure:2946: 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
@@ -2968,14 +2950,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lipc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2972 "configure"
+#line 2954 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2996,7 +2978,7 @@
fi
echo $ac_n "checking for main in -lshm""... $ac_c" 1>&6
-echo "configure:3000: checking for main in -lshm" >&5
+echo "configure:2982: 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
@@ -3004,14 +2986,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lshm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3008 "configure"
+#line 2990 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3032,7 +3014,7 @@
fi
echo $ac_n "checking for main in -lstuff""... $ac_c" 1>&6
-echo "configure:3036: checking for main in -lstuff" >&5
+echo "configure:3018: 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
@@ -3040,14 +3022,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lstuff $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3044 "configure"
+#line 3026 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3069,7 +3051,7 @@
echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:3073: checking for crypt in -lcrypt" >&5
+echo "configure:3055: 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
@@ -3077,7 +3059,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lcrypt $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3081 "configure"
+#line 3063 "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
@@ -3088,7 +3070,7 @@
crypt()
; return 0; }
EOF
-if { (eval echo configure:3092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3111,7 +3093,7 @@
echo $ac_n "checking for main in -ltermcap""... $ac_c" 1>&6
-echo "configure:3115: checking for main in -ltermcap" >&5
+echo "configure:3097: 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
@@ -3119,14 +3101,14 @@
ac_save_LIBS="$LIBS"
LIBS="-ltermcap $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3123 "configure"
+#line 3105 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3149,7 +3131,7 @@
echo $ac_n "checking for newwin in -lcurses""... $ac_c" 1>&6
-echo "configure:3153: checking for newwin in -lcurses" >&5
+echo "configure:3135: 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
@@ -3157,7 +3139,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lcurses $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3161 "configure"
+#line 3143 "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
@@ -3168,7 +3150,7 @@
newwin()
; return 0; }
EOF
-if { (eval echo configure:3172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3197,12 +3179,12 @@
#--------------------------------------------------------------------
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:3201: checking return type of signal handlers" >&5
+echo "configure:3183: 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 3206 "configure"
+#line 3188 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -3219,7 +3201,7 @@
int i;
; return 0; }
EOF
-if { (eval echo configure:3223: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3205: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
@@ -3238,7 +3220,7 @@
echo $ac_n "checking for restartable system calls""... $ac_c" 1>&6
-echo "configure:3242: checking for restartable system calls" >&5
+echo "configure:3224: 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
@@ -3246,7 +3228,7 @@
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 3250 "configure"
+#line 3232 "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
@@ -3264,7 +3246,7 @@
}
EOF
-if { (eval echo configure:3268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
ac_cv_sys_restartable_syscalls=yes
else
@@ -3295,7 +3277,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 3299 "configure"
+#line 3281 "configure"
#include "confdefs.h"
#include <signal.h>
@@ -3315,7 +3297,7 @@
exit(0);}
EOF
-if { (eval echo configure:3319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
cat >> confdefs.h <<\EOF
#define BSD_SIGNALS 1
@@ -3326,12 +3308,12 @@
cat conftest.$ac_ext >&5
rm -fr conftest*
echo $ac_n "checking for sigset""... $ac_c" 1>&6
-echo "configure:3330: checking for sigset" >&5
+echo "configure:3312: 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 3335 "configure"
+#line 3317 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char sigset(); below. */
@@ -3354,7 +3336,7 @@
; return 0; }
EOF
-if { (eval echo configure:3358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_sigset=yes"
else
@@ -3391,12 +3373,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:3395: checking for $ac_func" >&5
+echo "configure:3377: 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 3400 "configure"
+#line 3382 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3419,7 +3401,7 @@
; return 0; }
EOF
-if { (eval echo configure:3423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3445,7 +3427,7 @@
echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-echo "configure:3449: checking for main in -lm" >&5
+echo "configure:3431: 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
@@ -3453,14 +3435,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3457 "configure"
+#line 3439 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3483,12 +3465,12 @@
for ac_func in nint
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3487: checking for $ac_func" >&5
+echo "configure:3469: 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 3492 "configure"
+#line 3474 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3511,7 +3493,7 @@
; return 0; }
EOF
-if { (eval echo configure:3515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3536,7 +3518,7 @@
done
cat > conftest.$ac_ext <<EOF
-#line 3540 "configure"
+#line 3522 "configure"
#include "confdefs.h"
#include <math.h>
EOF
@@ -3557,12 +3539,12 @@
for ac_func in setstate strdup rint
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3561: checking for $ac_func" >&5
+echo "configure:3543: 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 3566 "configure"
+#line 3548 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3585,7 +3567,7 @@
; return 0; }
EOF
-if { (eval echo configure:3589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3616,12 +3598,12 @@
for ac_func in random strdup rint
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3620: checking for $ac_func" >&5
+echo "configure:3602: 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 3625 "configure"
+#line 3607 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3644,7 +3626,7 @@
; return 0; }
EOF
-if { (eval echo configure:3648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3679,7 +3661,7 @@
if test "$code" = server; then
echo $ac_n "checking for netstat""... $ac_c" 1>&6
-echo "configure:3683: checking for netstat" >&5
+echo "configure:3665: 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
@@ -3695,7 +3677,7 @@
done
echo $ac_n "checking for uptime""... $ac_c" 1>&6
-echo "configure:3699: checking for uptime" >&5
+echo "configure:3681: 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
Index: Vanilla/configure.in
diff -u Vanilla/configure.in:1.16 Vanilla/configure.in:1.17
--- Vanilla/configure.in:1.16 Tue Mar 16 02:53:20 1999
+++ Vanilla/configure.in Wed Mar 17 20:25:41 1999
@@ -226,9 +226,9 @@
fi
AC_MSG_CHECKING(for gmp.h)
- if test "$MPINC" = nope; then
- AC_TRY_CPP([#include <gmp.h>], [MPINC="-I/usr/include" search=false], MPINC=nope)
- fi
+# if test "$MPINC" = nope; then
+# AC_TRY_CPP([#include <gmp.h>], [MPINC="-I/usr/include" search=false], MPINC=nope)
+# fi
if test "$MPINC" = nope; then
dirs="$srcdir/gmp-2.0.2 /usr/unsupported/include /usr/local/include \
@@ -326,11 +326,11 @@
fi
fi
if test "$code" = server; then
-AC_MSG_CHECKING(res-rsa/rsa_utilmp.c)
- if test -r "$srcdir/res-rsa/rsa_utilmp.c"; then
+AC_MSG_CHECKING(res-rsa/rsa_util.c)
+ if test -r "$srcdir/res-rsa/rsa_util.c"; then
AC_MSG_RESULT(RSA utilities found)
RSAINC="-I`pwd`/res-rsa"
- RSALIB="-L`pwd`/res-rsa -lRSA"
+ RSALIB="-L`pwd`/res-rsa -lrsa"
else
AC_MSG_RESULT(Warning RSA utilities for server build not found, turning RSA off)
NORSA="#"
Index: Vanilla/system.mk.in
diff -u Vanilla/system.mk.in:1.6 Vanilla/system.mk.in:1.7
--- Vanilla/system.mk.in:1.6 Mon Mar 15 21:15:51 1999
+++ Vanilla/system.mk.in Wed Mar 17 20:25:41 1999
@@ -79,10 +79,11 @@
# Put -L<path> before library if non-standard location.
X11LIB = @XLIBSW@
+# GNU MP stuff
+GNUMP_INC = @GNUMPINC@
+GNUMP_LIB = @GNUMPLIB@
-
# RSA stuff
-
RSA_FLAGS = @NORSA@ -DRSA
RSA_OBJS = @NORSA@ rsa_key.o rsa_utilmp.o
RSA_SRC = @NORSA@ rsa_key.c rsa_utilmp.c