See ChangeLog: Sun May 23 14:20:22 CEST 1999 Werner KochV0-9-7

7 files changed, 30 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index b7b10bed..27b1b16d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May 23 14:20:22 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
+
+	* acinclude.m4 (GNUPG_SYS_SYMBOL_UNDERSCORE): assume yes when
+	cross-compiling.
+
 Mon May 17 21:54:43 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
 
 	* configure.in (socket): Fix for Unisys by Katsuhiro Kondou.
diff --git a/acinclude.m4 b/acinclude.m4
index 2d2ab4d7..fdb8d147 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -553,9 +553,14 @@ AC_CHECK_TOOL(AS, as, false)
 ])
 
 # GNUPG_SYS_SYMBOL_UNDERSCORE - does the compiler prefix global symbols
-#                            with an underscore?
+#                              with an underscore?
 AC_DEFUN(GNUPG_SYS_SYMBOL_UNDERSCORE,
-[AC_REQUIRE([GNUPG_PROG_NM])dnl
+[if test "$cross_compiling" = yes; then
+    AC_MSG_CHECKING([for _ prefix in compiled symbols])
+    ac_cv_sys_symbol_underscore=yes
+    AC_MSG_RESULT(assume yes)
+else
+AC_REQUIRE([GNUPG_PROG_NM])dnl
 AC_REQUIRE([GNUPG_SYS_NM_PARSE])dnl
 AC_MSG_CHECKING([for _ prefix in compiled symbols])
 AC_CACHE_VAL(ac_cv_sys_symbol_underscore,
@@ -588,6 +593,7 @@ fi
 rm -rf conftest*
 ])
 AC_MSG_RESULT($ac_cv_sys_symbol_underscore)
+fi
 if test x$ac_cv_sys_symbol_underscore = xyes; then
   AC_DEFINE(WITH_SYMBOL_UNDERSCORE,1,
   [define if compiled symbols have a leading underscore])
diff --git a/cipher/ChangeLog b/cipher/ChangeLog
index e755d022..b2fc6401 100644
--- a/cipher/ChangeLog
+++ b/cipher/ChangeLog
@@ -1,3 +1,9 @@
+Sun May 23 14:20:22 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
+
+	* cipher.c (setup_cipher_table): Enable Twofish
+
+	* random.c (fast_random_poll): Disable use of times() for mingw32.
+
 Mon May 17 21:54:43 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
 
 	* dynload.c (register_internal_cipher_extension): Minor init fix.
diff --git a/cipher/cipher.c b/cipher/cipher.c
index c3712f98..a44dcc4a 100644
--- a/cipher/cipher.c
+++ b/cipher/cipher.c
@@ -83,7 +83,6 @@ setup_cipher_table(void)
     int i;
 
     i = 0;
-  if( getenv("GNUPG_ENABLE_TWOFISH") ) {
     cipher_table[i].algo = CIPHER_ALGO_TWOFISH;
     cipher_table[i].name = twofish_get_info( cipher_table[i].algo,
 					 &cipher_table[i].keylen,
@@ -95,7 +94,6 @@ setup_cipher_table(void)
     if( !cipher_table[i].name )
 	BUG();
     i++;
-  }
     cipher_table[i].algo = CIPHER_ALGO_BLOWFISH;
     cipher_table[i].name = blowfish_get_info( cipher_table[i].algo,
 					 &cipher_table[i].keylen,
diff --git a/cipher/random.c b/cipher/random.c
index eb4fdf79..5fa45ea8 100644
--- a/cipher/random.c
+++ b/cipher/random.c
@@ -360,10 +360,12 @@ fast_random_poll()
 	add_randomness( &tv.tv_usec, sizeof(tv.tv_usec), 1 );
     }
   #else /* use times */
+    #ifndef HAVE_DOSISH_SYSTEM
     {	struct tms buf;
 	times( &buf );
 	add_randomness( &buf, sizeof buf, 1 );
     }
+    #endif
   #endif
   #ifdef HAVE_GETRUSAGE
     {	struct rusage buf;
diff --git a/configure.in b/configure.in
index 3d0581ae..dbcffd66 100644
--- a/configure.in
+++ b/configure.in
@@ -217,6 +217,11 @@ dnl Checks for libraries.
 
 if test "$try_gettext" = yes; then
 AM_GNU_GETTEXT
+else
+USE_NLS=no
+USE_INCLUDED_LIBINTL=no
+AC_SUBST(USE_NLS)
+AC_SUBST(USE_INCLUDED_LIBINTL)
 fi
 
 if test "$try_gdbm" = yes; then
diff --git a/mpi/ChangeLog b/mpi/ChangeLog
index 10e3bddd..db2d7025 100644
--- a/mpi/ChangeLog
+++ b/mpi/ChangeLog
@@ -1,3 +1,7 @@
+Sun May 23 14:20:22 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
+
+	* config.links (sysdep.h): Not any more conditionally created.
+
 Tue May  4 15:47:53 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
 
 	* mpiutil.c (mpi_alloc_like): New.