Vanilla Development Maling List Archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
CVS update: Vanilla
Date: Tuesday March 16, 1999 @ 2:53
Author: tanner
Update of /home/netrek/cvsroot/Vanilla
In directory cvs.castle.real-time.com:/var/tmp/cvs-serv998
Modified Files:
Makefile configure configure.in
Log Message:
Successful compile using the GNU mp US-RSA library on Linux.
That darn cambot error showed up again. I think James took care of it.
****************************************
Index: Vanilla/Makefile
diff -u Vanilla/Makefile:1.5 Vanilla/Makefile:1.6
--- Vanilla/Makefile:1.5 Mon Mar 15 21:15:49 1999
+++ Vanilla/Makefile Tue Mar 16 02:53:19 1999
@@ -65,7 +65,7 @@
$(MAKE) -C res-rsa; \
fi
-utils: $(DEP_INCS)
+utils: $(DEP_INCS) rsalib
cd tools; $(MAKE)
cd sequencer; $(MAKE)
Index: Vanilla/configure
diff -u Vanilla/configure:1.15 Vanilla/configure:1.16
--- Vanilla/configure:1.15 Mon Mar 15 21:15:50 1999
+++ Vanilla/configure Tue Mar 16 02:53:19 1999
@@ -2364,8 +2364,8 @@
# Check for gmp and mp
#--------------------------------------------------------------------
-echo $ac_n "checking for mp.h or gmp.h""... $ac_c" 1>&6
-echo "configure:2369: checking for mp.h or gmp.h" >&5
+echo $ac_n "checking for mp.h""... $ac_c" 1>&6
+echo "configure:2369: 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"
@@ -2386,33 +2386,35 @@
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "GNU_MP" >/dev/null 2>&1; then
rm -rf conftest*
- MPINC=nope search=true
+ MPINC=nope search=true echo "$ac_t""no" 1>&6
else
rm -rf conftest*
- MPINC="" search=false
+ MPINC="" search=false echo "$ac_t""no" 1>&6
fi
rm -f conftest*
fi
-# Checking for GMP
+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 2402 "configure"
+#line 2403 "configure"
#include "confdefs.h"
-#include <gmp.h>,
- MPINC="" search=false
+#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=nope
+ 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
@@ -2433,12 +2435,12 @@
if test "$code" = cow; then
# mp not supported with new mkkey.
cat > conftest.$ac_ext <<EOF
-#line 2437 "configure"
+#line 2439 "configure"
#include "confdefs.h"
#include <mp.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2442: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2444: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2453,12 +2455,12 @@
rm -f conftest*
else
cat > conftest.$ac_ext <<EOF
-#line 2457 "configure"
+#line 2459 "configure"
#include "confdefs.h"
#include <mp.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2462: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2464: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2490,7 +2492,7 @@
SAVEINCS="$INCS"
INCS="$INCS $XINCLUDES"
cat > conftest.$ac_ext <<EOF
-#line 2494 "configure"
+#line 2496 "configure"
#include "confdefs.h"
#include <gmp.h>
@@ -2509,8 +2511,6 @@
INCS="$SAVEINCS"
-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"
Index: Vanilla/configure.in
diff -u Vanilla/configure.in:1.15 Vanilla/configure.in:1.16
--- Vanilla/configure.in:1.15 Mon Mar 15 21:15:51 1999
+++ Vanilla/configure.in Tue Mar 16 02:53:20 1999
@@ -216,20 +216,18 @@
# Check for gmp and mp
#--------------------------------------------------------------------
-AC_MSG_CHECKING(for mp.h or gmp.h)
+AC_MSG_CHECKING(for mp.h)
AC_ARG_WITH(gmp-incdir,[ --with-gmp-incdir GMP Include Dir], MPINC="-I$withval" search=false, MPINC=nope)
if test "$MPINC" = nope; then
AC_EGREP_CPP( GNU_MP,[
#include <mp.h>
__GNU_MP__
-], MPINC=nope search=true, MPINC="" search=false )
+], [MPINC=nope search=true AC_MSG_RESULT(no)], [MPINC="" search=false AC_MSG_RESULT(no)] )
fi
-# Checking for GMP
+AC_MSG_CHECKING(for gmp.h)
if test "$MPINC" = nope; then
- AC_TRY_CPP(#include <gmp.h>,
- MPINC="" search=false,
- MPINC=nope)
+ AC_TRY_CPP([#include <gmp.h>], [MPINC="-I/usr/include" search=false], MPINC=nope)
fi
if test "$MPINC" = nope; then
@@ -274,7 +272,6 @@
],AC_DEFINE(HAVE_GMP2_H))
INCS="$SAVEINCS"
-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