Vanilla Development Maling List Archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
CVS update: Vanilla
Date: Monday March 15, 1999 @ 21:15
Author: tanner
Update of /home/netrek/cvsroot/Vanilla
In directory cvs.castle.real-time.com:/var/tmp/cvs-serv915
Modified Files:
Makefile config.h.in configure configure.in system.mk.in
Log Message:
WARNING!!
The changes in this commit will break RSA under linux. I will work on it
tonight to fix the problem.
Ugh! I started to make the changes to use GNU mp lib with RSA before Dave's
email came across. Anyway...
Make GNU mp RSA utils as the default in the US version of RSA.
I have changed the US RSA lib stuff to generate a libRSA.a, I do not know
how much this will break ntserv when you link against the PGP version
of RSA.
Made some changes to the autoconf stuff and system.mk to use look for the
US RSA libRSA.a library. I am very certain this will break the PGP version
of the code unless the PGP version of the library is named libRSA.
****************************************
Index: Vanilla/Makefile
diff -u Vanilla/Makefile:1.4 Vanilla/Makefile:1.5
--- Vanilla/Makefile:1.4 Tue Feb 2 18:14:09 1999
+++ Vanilla/Makefile Mon Mar 15 21:15:49 1999
@@ -13,7 +13,7 @@
DEP_INCS = cflags.h ntserv/data.c ntserv/data.h ntserv/defs.h \
config.h system.mk null
-all: $(PMAKE) server startup utils rsa_utils do_xsg do_pledit do_robots
+all: $(PMAKE) server utils startup rsa_utils do_xsg do_pledit do_robots
depend: system.mk
cd ntserv; make depend
@@ -23,9 +23,9 @@
cd tools; make depend
cd pledit; make depend
cd keycomp; make depend
- cd sequencer; make depend
+ $(MAKE) -C sequencer depend
-@if [ -f res-rsa/Makefile ]; then \
- cd res-rsa; echo " cd res-rsa; make depend"; make depend; \
+ make -C res-rsa depend; \
fi
-@if [ -f xsg/Makefile ]; then \
cd xsg; echo " cd xsg; make depend"; make depend; \
@@ -45,8 +45,8 @@
touch config.h
# make the server binaries and such
-server: $(DEP_INCS)
- cd ntserv; $(MAKE)
+server: $(DEP_INCS) rsalib
+ $(MAKE) -C ntserv
do_robots: $(DEP_INCS)
cd robots; $(MAKE)
@@ -60,10 +60,12 @@
cd pledit; $(MAKE)
-utils: $(DEP_INCS)
+rsalib: $(DEP_INCS)
-@if [ -f res-rsa/Makefile ]; then \
- cd res-rsa; echo " cd res-rsa; $(MAKE)"; $(MAKE); \
+ $(MAKE) -C res-rsa; \
fi
+
+utils: $(DEP_INCS)
cd tools; $(MAKE)
cd sequencer; $(MAKE)
Index: Vanilla/config.h.in
diff -u Vanilla/config.h.in:1.10 Vanilla/config.h.in:1.11
--- Vanilla/config.h.in:1.10 Mon Mar 15 01:43:40 1999
+++ Vanilla/config.h.in Mon Mar 15 21:15:50 1999
@@ -1,35 +1,6 @@
/* Netrek Configuration file - by Kurt Siegl
- *
- * $Log: config.h.in,v $
- * Revision 1.10 1999/03/15 07:43:40 tanner
- * Couple of changed to config.h.in and configure.in to set somethings up for
- * res-rsa US stuff.
- *
- * Revision 1.9 1999/03/15 01:38:04 tanner
- * Reversed all previous changes to the Makefiles regarding the includes of
- * specific files.
- *
- * Changed all includes into Kurt's #define, #include method.
- *
- * Revision 1.8 1999/03/14 07:39:16 tanner
- * Changed the Solaris specific stuff so that the includes are in the .c files
- * instead of config.h
- *
- * Revision 1.7 1999/03/13 01:08:37 tanner
- * Changes to get the server to -compile- on Solaris 2.5.1.
- *
- * There are lots of program files that #include #defined macro. I started
- * to move all this stuff into config.h, where I think it should be located.
- *
- * Revision 1.6 1999/03/12 17:40:24 siegl
- * COW autoconfig code with GMP 2 support
- *
- * Revision 1.2 1999/02/17 19:37:48 siegl
- * merging autoconf files with Vanilla Server
- *
- * Revision 1.1.1.1 1998/11/01 17:24:13 siegl
- * COW 3.0 initial revision
- * */
+ *
+ */
#ifndef __CONFIG_H
#define __CONFIG_H
@@ -685,13 +656,13 @@
#endif
#ifdef NEED_SYS_SELECT_H
-#define INC_SYS_SELECT <sys/select.h>
+#define INC_SYS_SELECT <sys/select.h>
#ifdef SERVER
/* fd_set is used in data.h of the server */
#include <sys/select.h>
#endif
#else
-#define INC_SYS_SELECT NULLFILE
+#define INC_SYS_SELECT NULLFILE
#endif
#define SELECT select
@@ -720,15 +691,15 @@
/* Some systems don't include <sys/time.h> in <time.h> */
#if defined(TM_IN_SYS_TIME) || defined(NEED_SYS_TIME_H)
-#define INC_SYS_TIME <sys/time.h>
+#define INC_SYS_TIME <sys/time.h>
#else
-#define INC_SYS_TIME NULLFILE
+#define INC_SYS_TIME NULLFILE
#endif
#ifdef HAVE_SYS_PTYIO_H
-#define INC_SYS_PTYIO <sys/ptyio.h>
+#define INC_SYS_PTYIO <sys/ptyio.h>
#else
-#define INC_SYS_PTYIO NULLFILE
+#define INC_SYS_PTYIO NULLFILE
#endif
#ifdef HAVE_CTYPE_H
@@ -903,9 +874,9 @@
/* Solaris specific stuff */
#if defined(HAVE_SYS_FILIO_H)
-#define INC_SYS_FILIO <sys/filio.h>
+#define INC_SYS_FILIO <sys/filio.h>
#else
-#define INC_SYS_FILIO NULLFILE
+#define INC_SYS_FILIO NULLFILE
#endif
#endif /* __CONFIG_H */
Index: Vanilla/configure
diff -u Vanilla/configure:1.14 Vanilla/configure:1.15
--- Vanilla/configure:1.14 Mon Mar 15 01:43:40 1999
+++ Vanilla/configure Mon Mar 15 21:15:50 1999
@@ -1312,43 +1312,9 @@
fi
done
-ac_safe=`echo "mp.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for mp.h""... $ac_c" 1>&6
-echo "configure:1318: checking for mp.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 1323 "configure"
-#include "confdefs.h"
-#include <mp.h>
-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; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- :
-else
- echo "$ac_t""no" 1>&6
-echo "configure: warning: If you are running Linux and RSA make sure to get our gmp package. See http://vanilla.us.netrek.org" 1>&2
-fi
-
echo $ac_n "checking for wait3 that fills in rusage""... $ac_c" 1>&6
-echo "configure:1352: checking for wait3 that fills in rusage" >&5
+echo "configure:1318: 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
@@ -1356,7 +1322,7 @@
ac_cv_func_wait3_rusage=no
else
cat > conftest.$ac_ext <<EOF
-#line 1360 "configure"
+#line 1326 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -1387,7 +1353,7 @@
}
}
EOF
-if { (eval echo configure:1391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
ac_cv_func_wait3_rusage=yes
else
@@ -1410,12 +1376,12 @@
fi
echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:1414: checking for pid_t" >&5
+echo "configure:1380: 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 1419 "configure"
+#line 1385 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -1443,12 +1409,12 @@
fi
echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:1447: checking for uid_t in sys/types.h" >&5
+echo "configure:1413: 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 1452 "configure"
+#line 1418 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
@@ -1477,12 +1443,12 @@
fi
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:1481: checking for size_t" >&5
+echo "configure:1447: 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 1486 "configure"
+#line 1452 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -1511,17 +1477,17 @@
ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:1515: checking for vfork.h" >&5
+echo "configure:1481: 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 1520 "configure"
+#line 1486 "configure"
#include "confdefs.h"
#include <vfork.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1491: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1546,18 +1512,18 @@
fi
echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:1550: checking for working vfork" >&5
+echo "configure:1516: 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:1556: checking for vfork" >&5
+echo "configure:1522: 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 1561 "configure"
+#line 1527 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vfork(); below. */
@@ -1580,7 +1546,7 @@
; return 0; }
EOF
-if { (eval echo configure:1584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_vfork=yes"
else
@@ -1601,7 +1567,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 1605 "configure"
+#line 1571 "configure"
#include "confdefs.h"
/* Thanks to Paul Eggert for this test. */
#include <stdio.h>
@@ -1696,7 +1662,7 @@
}
}
EOF
-if { (eval echo configure:1700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
ac_cv_func_vfork_works=yes
else
@@ -1719,12 +1685,12 @@
fi
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:1723: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:1689: 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 1728 "configure"
+#line 1694 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <time.h>
@@ -1732,7 +1698,7 @@
struct tm *tp; tp->tm_sec;
; return 0; }
EOF
-if { (eval echo configure:1736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1702: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm=time.h
else
@@ -1754,9 +1720,9 @@
echo $ac_n "checking for itimer in time.h""... $ac_c" 1>&6
-echo "configure:1758: checking for itimer in time.h" >&5
+echo "configure:1724: checking for itimer in time.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 1760 "configure"
+#line 1726 "configure"
#include "confdefs.h"
#include <time.h>
EOF
@@ -1775,7 +1741,7 @@
echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:1779: checking size of long" >&5
+echo "configure:1745: 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
@@ -1783,7 +1749,7 @@
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 1787 "configure"
+#line 1753 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -1794,7 +1760,7 @@
exit(0);
}
EOF
-if { (eval echo configure:1798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long=`cat conftestval`
else
@@ -1815,9 +1781,9 @@
echo $ac_n "checking for u_int in sys/types.h""... $ac_c" 1>&6
-echo "configure:1819: checking for u_int in sys/types.h" >&5
+echo "configure:1785: checking for u_int in sys/types.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 1821 "configure"
+#line 1787 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
@@ -1836,9 +1802,9 @@
echo $ac_n "checking for PATH_MAX in limits.h""... $ac_c" 1>&6
-echo "configure:1840: checking for PATH_MAX in limits.h" >&5
+echo "configure:1806: checking for PATH_MAX in limits.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 1842 "configure"
+#line 1808 "configure"
#include "confdefs.h"
#include <limits.h>
@@ -1863,7 +1829,7 @@
# Checking for gnu-win32 Windows libraries
echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6
-echo "configure:1867: checking for main in -lgdi32" >&5
+echo "configure:1833: 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
@@ -1871,14 +1837,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lgdi32 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1875 "configure"
+#line 1841 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:1882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1917,7 +1883,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:1921: checking for X" >&5
+echo "configure:1887: checking for X" >&5
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
@@ -1979,12 +1945,12 @@
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
-#line 1983 "configure"
+#line 1949 "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:1988: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1954: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2053,14 +2019,14 @@
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2057 "configure"
+#line 2023 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:2064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
LIBS="$ac_save_LIBS"
# We can link X programs with no special library path.
@@ -2151,12 +2117,12 @@
echo checking for X11 header files
XINCLUDES=""
cat > conftest.$ac_ext <<EOF
-#line 2155 "configure"
+#line 2121 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2160: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2126: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
@@ -2188,7 +2154,7 @@
echo "checking for X11 library archive"
echo $ac_n "checking for main in -lX11""... $ac_c" 1>&6
-echo "configure:2192: checking for main in -lX11" >&5
+echo "configure:2158: 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
@@ -2196,14 +2162,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lX11 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2200 "configure"
+#line 2166 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2173: \"$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
@@ -2239,7 +2205,7 @@
fi
if test "$XLIBSWLIB" = nope ; then
echo $ac_n "checking for main in -lXwindow""... $ac_c" 1>&6
-echo "configure:2243: checking for main in -lXwindow" >&5
+echo "configure:2209: 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
@@ -2247,14 +2213,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lXwindow $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2251 "configure"
+#line 2217 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2224: \"$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
@@ -2297,7 +2263,7 @@
SAVEINCS="$INCS"
INCS="$INCS $XINCLUDES"
echo $ac_n "checking for main in -lXpm""... $ac_c" 1>&6
-echo "configure:2301: checking for main in -lXpm" >&5
+echo "configure:2267: 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
@@ -2305,14 +2271,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lXpm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2309 "configure"
+#line 2275 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2282: \"$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
@@ -2339,17 +2305,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2343: checking for $ac_hdr" >&5
+echo "configure:2309: 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 2348 "configure"
+#line 2314 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2353: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2319: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2399,7 +2365,7 @@
#--------------------------------------------------------------------
echo $ac_n "checking for mp.h or gmp.h""... $ac_c" 1>&6
-echo "configure:2403: checking for mp.h or gmp.h" >&5
+echo "configure:2369: checking for mp.h or gmp.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"
@@ -2410,7 +2376,7 @@
if test "$MPINC" = nope; then
cat > conftest.$ac_ext <<EOF
-#line 2414 "configure"
+#line 2380 "configure"
#include "confdefs.h"
#include <mp.h>
@@ -2432,22 +2398,21 @@
# Checking for GMP
if test "$MPINC" = nope; then
cat > conftest.$ac_ext <<EOF
-#line 2436 "configure"
+#line 2402 "configure"
#include "confdefs.h"
-#include <gmp.h>
+#include <gmp.h>,
+ MPINC="" search=false
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2441: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (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="" search=false
+ MPINC=nope
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
@@ -2468,12 +2433,12 @@
if test "$code" = cow; then
# mp not supported with new mkkey.
cat > conftest.$ac_ext <<EOF
-#line 2472 "configure"
+#line 2437 "configure"
#include "confdefs.h"
#include <mp.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2477: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2442: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2488,12 +2453,12 @@
rm -f conftest*
else
cat > conftest.$ac_ext <<EOF
-#line 2492 "configure"
+#line 2457 "configure"
#include "confdefs.h"
#include <mp.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2462: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2525,7 +2490,7 @@
SAVEINCS="$INCS"
INCS="$INCS $XINCLUDES"
cat > conftest.$ac_ext <<EOF
-#line 2529 "configure"
+#line 2494 "configure"
#include "confdefs.h"
#include <gmp.h>
@@ -2544,8 +2509,8 @@
INCS="$SAVEINCS"
-
-# AC_MSG_CHECKING(for libgmp.a)
+echo $ac_n "checking for libgmp.a""... $ac_c" 1>&6
+echo "configure:2514: checking for libgmp.a" >&5
# Check whether --with-gmp-libdir or --without-gmp-libdir was given.
if test "${with_gmp_libdir+set}" = set; then
withval="$with_gmp_libdir"
@@ -2559,7 +2524,7 @@
MPLIB=nope
else
echo $ac_n "checking for main in -lmp""... $ac_c" 1>&6
-echo "configure:2563: checking for main in -lmp" >&5
+echo "configure:2528: 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
@@ -2567,14 +2532,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lmp $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2571 "configure"
+#line 2536 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2543: \"$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
@@ -2595,45 +2560,8 @@
MPLIB=" "
fi
- echo $ac_n "checking for main in -lmpbsd""... $ac_c" 1>&6
-echo "configure:2600: checking for main in -lmpbsd" >&5
-ac_lib_var=`echo mpbsd'_'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
-else
- ac_save_LIBS="$LIBS"
-LIBS="-lmpbsd $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2608 "configure"
-#include "confdefs.h"
-
-int main() {
-main()
-; return 0; }
-EOF
-if { (eval echo configure:2615: \"$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
- 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
- MPLIB="$MPLIB -lmpbsd"
-else
- echo "$ac_t""no" 1>&6
-MPLIB=" "
-fi
-
echo $ac_n "checking for main in -lgmp""... $ac_c" 1>&6
-echo "configure:2637: checking for main in -lgmp" >&5
+echo "configure:2565: 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
@@ -2641,14 +2569,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lgmp $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2645 "configure"
+#line 2573 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2580: \"$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
@@ -2687,7 +2615,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:2691: checking for main in -lmp" >&5
+echo "configure:2619: 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
@@ -2695,14 +2623,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lmp $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2699 "configure"
+#line 2627 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2634: \"$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
@@ -2725,7 +2653,7 @@
else
echo $ac_n "checking for main in -lmp""... $ac_c" 1>&6
-echo "configure:2729: checking for main in -lmp" >&5
+echo "configure:2657: 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
@@ -2733,14 +2661,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lmp $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2737 "configure"
+#line 2665 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2672: \"$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
@@ -2788,11 +2716,12 @@
fi
fi
if test "$code" = server; then
-echo $ac_n "checking res-rsa/rsa_util.c""... $ac_c" 1>&6
-echo "configure:2793: checking res-rsa/rsa_util.c" >&5
- if test -r "$srcdir/res-rsa/rsa_util.c"; 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_t""RSA utilities found" 1>&6
RSAINC="-I`pwd`/res-rsa"
+ RSALIB="-L`pwd`/res-rsa -lRSA"
else
echo "$ac_t""Warning RSA utilities for server build not found" 1>&6
NORSA="#"
@@ -2811,7 +2740,7 @@
#--------------------------------------------------------------------
echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-echo "configure:2815: checking for main in -lXbsd" >&5
+echo "configure:2744: 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
@@ -2819,14 +2748,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lXbsd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2823 "configure"
+#line 2752 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2759: \"$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
@@ -2849,7 +2778,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:2853: checking for main in -lsocket" >&5
+echo "configure:2782: 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
@@ -2857,14 +2786,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2861 "configure"
+#line 2790 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2797: \"$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
@@ -2885,7 +2814,7 @@
fi
echo $ac_n "checking for main in -linet""... $ac_c" 1>&6
-echo "configure:2889: checking for main in -linet" >&5
+echo "configure:2818: 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
@@ -2893,14 +2822,14 @@
ac_save_LIBS="$LIBS"
LIBS="-linet $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2897 "configure"
+#line 2826 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2833: \"$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
@@ -2921,7 +2850,7 @@
fi
echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
-echo "configure:2925: checking for main in -lnsl" >&5
+echo "configure:2854: 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
@@ -2929,14 +2858,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2933 "configure"
+#line 2862 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2869: \"$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
@@ -2957,7 +2886,7 @@
fi
echo $ac_n "checking for main in -lseq""... $ac_c" 1>&6
-echo "configure:2961: checking for main in -lseq" >&5
+echo "configure:2890: 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
@@ -2965,14 +2894,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lseq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2969 "configure"
+#line 2898 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2905: \"$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
@@ -2993,7 +2922,7 @@
fi
echo $ac_n "checking for main in -lsun""... $ac_c" 1>&6
-echo "configure:2997: checking for main in -lsun" >&5
+echo "configure:2926: 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
@@ -3001,14 +2930,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lsun $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3005 "configure"
+#line 2934 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2941: \"$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
@@ -3031,7 +2960,7 @@
if test "$code" = server; then
echo $ac_n "checking for main in -lipc""... $ac_c" 1>&6
-echo "configure:3035: checking for main in -lipc" >&5
+echo "configure:2964: 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
@@ -3039,14 +2968,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lipc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3043 "configure"
+#line 2972 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2979: \"$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
@@ -3067,7 +2996,7 @@
fi
echo $ac_n "checking for main in -lshm""... $ac_c" 1>&6
-echo "configure:3071: checking for main in -lshm" >&5
+echo "configure:3000: 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
@@ -3075,14 +3004,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lshm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3079 "configure"
+#line 3008 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3015: \"$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
@@ -3103,7 +3032,7 @@
fi
echo $ac_n "checking for main in -lstuff""... $ac_c" 1>&6
-echo "configure:3107: checking for main in -lstuff" >&5
+echo "configure:3036: 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
@@ -3111,14 +3040,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lstuff $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3115 "configure"
+#line 3044 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3051: \"$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
@@ -3140,7 +3069,7 @@
echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:3144: checking for crypt in -lcrypt" >&5
+echo "configure:3073: 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
@@ -3148,7 +3077,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lcrypt $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3152 "configure"
+#line 3081 "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
@@ -3159,7 +3088,7 @@
crypt()
; return 0; }
EOF
-if { (eval echo configure:3163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3092: \"$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
@@ -3182,7 +3111,7 @@
echo $ac_n "checking for main in -ltermcap""... $ac_c" 1>&6
-echo "configure:3186: checking for main in -ltermcap" >&5
+echo "configure:3115: 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
@@ -3190,14 +3119,14 @@
ac_save_LIBS="$LIBS"
LIBS="-ltermcap $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3194 "configure"
+#line 3123 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3130: \"$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
@@ -3220,7 +3149,7 @@
echo $ac_n "checking for newwin in -lcurses""... $ac_c" 1>&6
-echo "configure:3224: checking for newwin in -lcurses" >&5
+echo "configure:3153: 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
@@ -3228,7 +3157,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lcurses $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3232 "configure"
+#line 3161 "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
@@ -3239,7 +3168,7 @@
newwin()
; return 0; }
EOF
-if { (eval echo configure:3243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3172: \"$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
@@ -3268,12 +3197,12 @@
#--------------------------------------------------------------------
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:3272: checking return type of signal handlers" >&5
+echo "configure:3201: 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 3277 "configure"
+#line 3206 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -3290,7 +3219,7 @@
int i;
; return 0; }
EOF
-if { (eval echo configure:3294: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3223: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
@@ -3309,7 +3238,7 @@
echo $ac_n "checking for restartable system calls""... $ac_c" 1>&6
-echo "configure:3313: checking for restartable system calls" >&5
+echo "configure:3242: 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
@@ -3317,7 +3246,7 @@
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 3321 "configure"
+#line 3250 "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
@@ -3335,7 +3264,7 @@
}
EOF
-if { (eval echo configure:3339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3268: \"$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
@@ -3366,7 +3295,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 3370 "configure"
+#line 3299 "configure"
#include "confdefs.h"
#include <signal.h>
@@ -3386,7 +3315,7 @@
exit(0);}
EOF
-if { (eval echo configure:3390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3319: \"$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
@@ -3397,12 +3326,12 @@
cat conftest.$ac_ext >&5
rm -fr conftest*
echo $ac_n "checking for sigset""... $ac_c" 1>&6
-echo "configure:3401: checking for sigset" >&5
+echo "configure:3330: 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 3406 "configure"
+#line 3335 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char sigset(); below. */
@@ -3425,7 +3354,7 @@
; return 0; }
EOF
-if { (eval echo configure:3429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_sigset=yes"
else
@@ -3462,12 +3391,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:3466: checking for $ac_func" >&5
+echo "configure:3395: 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 3471 "configure"
+#line 3400 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3490,7 +3419,7 @@
; return 0; }
EOF
-if { (eval echo configure:3494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3516,7 +3445,7 @@
echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-echo "configure:3520: checking for main in -lm" >&5
+echo "configure:3449: 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
@@ -3524,14 +3453,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3528 "configure"
+#line 3457 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3464: \"$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
@@ -3554,12 +3483,12 @@
for ac_func in nint
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3558: checking for $ac_func" >&5
+echo "configure:3487: 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 3563 "configure"
+#line 3492 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3582,7 +3511,7 @@
; return 0; }
EOF
-if { (eval echo configure:3586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3607,7 +3536,7 @@
done
cat > conftest.$ac_ext <<EOF
-#line 3611 "configure"
+#line 3540 "configure"
#include "confdefs.h"
#include <math.h>
EOF
@@ -3628,12 +3557,12 @@
for ac_func in setstate strdup rint
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3632: checking for $ac_func" >&5
+echo "configure:3561: 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 3637 "configure"
+#line 3566 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3656,7 +3585,7 @@
; return 0; }
EOF
-if { (eval echo configure:3660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3687,12 +3616,12 @@
for ac_func in random strdup rint
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3691: checking for $ac_func" >&5
+echo "configure:3620: 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 3696 "configure"
+#line 3625 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3715,7 +3644,7 @@
; return 0; }
EOF
-if { (eval echo configure:3719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3750,7 +3679,7 @@
if test "$code" = server; then
echo $ac_n "checking for netstat""... $ac_c" 1>&6
-echo "configure:3754: checking for netstat" >&5
+echo "configure:3683: 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
@@ -3766,7 +3695,7 @@
done
echo $ac_n "checking for uptime""... $ac_c" 1>&6
-echo "configure:3770: checking for uptime" >&5
+echo "configure:3699: 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
@@ -3927,6 +3856,7 @@
s%@MPINC@%$MPINC%g
s%@MPLIB@%$MPLIB%g
s%@RSAINC@%$RSAINC%g
+s%@RSALIB@%$RSALIB%g
s%@NORSA@%$NORSA%g
s%@LIBCRYPT@%$LIBCRYPT%g
s%@LIBTERMCAP@%$LIBTERMCAP%g
Index: Vanilla/configure.in
diff -u Vanilla/configure.in:1.14 Vanilla/configure.in:1.15
--- Vanilla/configure.in:1.14 Mon Mar 15 01:43:40 1999
+++ Vanilla/configure.in Mon Mar 15 21:15:51 1999
@@ -95,7 +95,6 @@
AC_CHECK_HEADERS(sys/timeb.h sys/ptyio.h sys/fcntl.h fcntl.h)
AC_CHECK_HEADERS(ctype.h machine/endian.h sys/resource.h)
AC_CHECK_HEADERS(sys/wait.h netinet/in.h sys/filio.h)
-AC_CHECK_HEADER(mp.h, , AC_MSG_WARN(If you are running Linux and RSA make sure to get our gmp package. See http://vanilla.us.netrek.org))
AC_FUNC_WAIT3
AC_TYPE_PID_T
@@ -228,7 +227,9 @@
# Checking for GMP
if test "$MPINC" = nope; then
- AC_TRY_CPP([#include <gmp.h>], [MPINC="" search=false], MPINC=nope)
+ AC_TRY_CPP(#include <gmp.h>,
+ MPINC="" search=false,
+ MPINC=nope)
fi
if test "$MPINC" = nope; then
@@ -273,15 +274,13 @@
],AC_DEFINE(HAVE_GMP2_H))
INCS="$SAVEINCS"
-
-# AC_MSG_CHECKING(for libgmp.a)
+AC_MSG_CHECKING(for libgmp.a)
AC_ARG_WITH(gmp-libdir,[ --with-gmp-libdir GMP Library Dir], MPLIB="-L$withval -lgmp" search=false, MPLIB=nope)
if test "$MPLIB" = nope; then
if test "$search" = true; then
MPLIB=nope
else
AC_CHECK_LIB(mp, main, MPLIB="-lmp", MPLIB=" ")
- AC_CHECK_LIB(mpbsd, main, MPLIB="$MPLIB -lmpbsd", MPLIB=" ")
AC_CHECK_LIB(gmp, main, MPLIB="$MPLIB -lgmp", MPLIB=nope)
fi
if test "$MPLIB" = nope; then
@@ -330,10 +329,11 @@
fi
fi
if test "$code" = server; then
-AC_MSG_CHECKING(res-rsa/rsa_util.c)
- if test -r "$srcdir/res-rsa/rsa_util.c"; then
+AC_MSG_CHECKING(res-rsa/rsa_utilmp.c)
+ if test -r "$srcdir/res-rsa/rsa_utilmp.c"; then
AC_MSG_RESULT(RSA utilities found)
RSAINC="-I`pwd`/res-rsa"
+ RSALIB="-L`pwd`/res-rsa -lRSA"
else
AC_MSG_RESULT(Warning RSA utilities for server build not found, turning RSA off)
NORSA="#"
@@ -342,7 +342,7 @@
fi
AC_SUBST(RSAINC)
-
+AC_SUBST(RSALIB)
AC_SUBST(NORSA)
#--------------------------------------------------------------------
Index: Vanilla/system.mk.in
diff -u Vanilla/system.mk.in:1.5 Vanilla/system.mk.in:1.6
--- Vanilla/system.mk.in:1.5 Fri Mar 12 11:40:26 1999
+++ Vanilla/system.mk.in Mon Mar 15 21:15:51 1999
@@ -84,10 +84,10 @@
# RSA stuff
RSA_FLAGS = @NORSA@ -DRSA
-RSA_OBJS = @NORSA@ rsa_key.o ../res-rsa/rsa_util.o
-RSA_SRC = @NORSA@ rsa_key.c ../res-rsa/rsa_util.c
-RSA_INCS = @MPINC@ # @RSAINC@
-RSA_LIBS = @MPLIB@
+RSA_OBJS = @NORSA@ rsa_key.o rsa_utilmp.o
+RSA_SRC = @NORSA@ rsa_key.c rsa_utilmp.c
+RSA_INCS = @MPINC@
+RSA_LIB = @RSALIB@ @MPLIB@
FLAGS = $(EXTRAFLAGS) $(NETREK_INCLUDES) $(RSA_FLAGS)