Minor fixes for W32

12 files changed, 34 insertions, 22 deletions

diff --git a/ChangeLog b/ChangeLog
index 42b2b704..20ccfb84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-03  Werner Koch  <wk@g10code.com>
+
+	* configure.ac: Fix detection of GPLed random modules.
+
 2007-05-02  Werner Koch  <wk@g10code.com>
 
 	* configure.ac (LIBGCRYPT_DIGESTS, LIBGCRYPT_CIPHERS) 
diff --git a/NEWS b/NEWS
index 86f42ecf..949693cb 100644
--- a/NEWS
+++ b/NEWS
@@ -469,7 +469,7 @@ Noteworthy changes in version 1.1.3 (2001-05-31)
     into into libgcrypt and GnuPG.
 
 
-Copyright 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2007 Free Software Foundation, Inc.
 
 This file is free software; as a special exception the author gives
 unlimited permission to copy and/or distribute it, with or without
diff --git a/autogen.sh b/autogen.sh
index 395c9bd9..c79253e2 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -181,7 +181,7 @@ if test "$DIE" = "yes"; then
     cat <<EOF
 
 Note that you may use alternative versions of the tools by setting 
-the corresponding environment variables; see README.CVS for details.
+the corresponding environment variables; see README.SVN for details.
                    
 EOF
     exit 1
diff --git a/configure.ac b/configure.ac
index 6663705b..bddb164d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -888,7 +888,8 @@ AC_DEFINE_UNQUOTED(USE_RNDLINUX, $found,
 
 
 LIST_MEMBER(unix, $random_modules)
-test "$found" = "1" && GCRYPT_RANDOM="$GCRYPT_RANDOM rndunix.lo"
+test "$found" = "1" && GCRYPT_RANDOM="$GCRYPT_RANDOM rndunix.lo" \
+                    && gpl="$gpl rndunix"
 AC_DEFINE_UNQUOTED(USE_RNDUNIX, $found,
                   [Defined if the default Unix RNG should be used.])
 if test "$found" = "1"; then
@@ -901,7 +902,8 @@ AC_DEFINE_UNQUOTED(USE_RNDEGD, $found,
                   [Defined if the EGD based RNG should be used.])
 
 LIST_MEMBER(w32, $random_modules)
-test "$found" = "1" && GCRYPT_RANDOM="$GCRYPT_RANDOM rndw32.lo"
+test "$found" = "1" && GCRYPT_RANDOM="$GCRYPT_RANDOM rndw32.lo" \
+                    && gpl="$gpl rndw32"
 AC_DEFINE_UNQUOTED(USE_RNDW32, $found,
                   [Defined if the Windows specific RNG should be used.])
 
@@ -982,9 +984,6 @@ cat <<G10EOF
 G10EOF
 fi
 
-for file in "random_modules"; do
-  case "$file" in rndunix | rndw32) gpl="$gpl $file";; esac
-done
 if test -n "$gpl"; then
   echo "Please note that you are building a version of Libgcrypt with"
   echo "  $gpl"
diff --git a/mpi/ChangeLog b/mpi/ChangeLog
index fdf63520..e0bbb128 100644
--- a/mpi/ChangeLog
+++ b/mpi/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-03  Werner Koch  <wk@g10code.com>
+
+	* pentium4/distfiles: Fixed.
+
 2007-04-30  Werner Koch  <wk@g10code.com>
 
 	* config.links: Create a file mod-source-info.h.
diff --git a/mpi/pentium4/distfiles b/mpi/pentium4/distfiles
index 11789023..b419f85a 100644
--- a/mpi/pentium4/distfiles
+++ b/mpi/pentium4/distfiles
@@ -1,12 +1,3 @@
 README
 
-mmx:
-mpih-lshift.S
-mpih-rshift.S
 
-sse2:
-mpih-add1.S
-mpih-mul1.S
-mpih-mul2.S
-mpih-mul3.S
-mpih-sub1.S
diff --git a/src/ChangeLog b/src/ChangeLog
index 96770971..701972df 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-03  Werner Koch  <wk@g10code.com>
+
+	* libgcrypt.def (gcry_sexp_nth_string): New.
+	* Makefile.am (EXTRA_DIST): Add libgcrypt.def.
+
 2007-05-02  Werner Koch  <wk@g10code.com>
 
 	* global.c (print_config): Print ciphers, digests and pubkeys.
diff --git a/src/Makefile.am b/src/Makefile.am
index 09aeff1d..28e1f4d2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,7 @@
 ## Process this file with automake to produce Makefile.in
 
 EXTRA_DIST = Manifest libgcrypt-config.in libgcrypt.m4 libgcrypt.vers \
-	gcrypt.h.in
+             gcrypt.h.in libgcrypt.def
 bin_SCRIPTS = libgcrypt-config
 m4datadir = $(datadir)/aclocal
 m4data_DATA = libgcrypt.m4
diff --git a/src/libgcrypt.def b/src/libgcrypt.def
index 7c2adcee..12dc5b19 100644
--- a/src/libgcrypt.def
+++ b/src/libgcrypt.def
@@ -224,3 +224,6 @@ EXPORTS
       gcry_ac_data_decrypt_scheme  @184
       gcry_ac_data_sign_scheme  @185
       gcry_ac_data_verify_scheme  @186
+
+      gcry_sexp_nth_string  @187
+
diff --git a/src/versioninfo.rc.in b/src/versioninfo.rc.in
index da86b97b..7a6d82ca 100644
--- a/src/versioninfo.rc.in
+++ b/src/versioninfo.rc.in
@@ -34,7 +34,7 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            /* Note that the Windows versioin falls under the GPL. */
+            /* Note that the Windows version falls under the GPL. */
             VALUE "Comments", "Provided under the terms of the GNU General Public License.\0"
             VALUE "CompanyName", "g10 Code GmbH\0"
             VALUE "FileDescription", "Libgcrypt - The GNU Crypto Library\0"
diff --git a/tests/ChangeLog b/tests/ChangeLog
index bb5329a5..525f66f7 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-03  Werner Koch  <wk@g10code.com>
+
+	* Makefile.am (EXTRA_DIST): Do not build pkbench.c
+
 2007-05-02  David Shaw  <dshaw@jabberwocky.com>
 
 	* basic.c (check_ciphers): Add Camellia.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2c006792..2af4dbdc 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -21,7 +21,8 @@
 TESTS = version t-mpi-bit prime register ac ac-schemes ac-data basic \
         mpitests tsexp keygen pubkey hmac keygrip
 
-# random tests forking thus no a test for W32 does not make any sense.
+
+# random.c uses fork() thus a test for W32 does not make any sense.
 if !HAVE_W32_SYSTEM
 TESTS += random
 endif
@@ -37,8 +38,9 @@ AM_CFLAGS = $(GPG_ERROR_CFLAGS)
 
 LDADD = ../src/libgcrypt.la
 
-# pkbench uses mmap for no good reason.  Needs to be fixed.  Code for
-# this can be found in libksba/tests. 
 EXTRA_PROGRAMS = testapi
-noinst_PROGRAMS = $(TESTS) pkbench
+noinst_PROGRAMS = $(TESTS)
 
+# pkbench uses mmap for no good reason.  Needs to be fixed.  Code for
+# this can be found in libksba/tests. 
+EXTRA_DIST = pkbench.c