released 1.1.4

12 files changed, 238 insertions, 237 deletions

diff --git a/ChangeLog b/ChangeLog
index df1a6842..6f4559ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2001-08-03  Werner Koch  <wk@gnupg.org>
 
+	Released 1.1.4.
+
+	* acinclude.m4 (GNUPG_CHECK_TYPEDEF): Define GNU Source.
+	
+        Migrated to autoconf 2.52.
+	* acinclude.m4: Removed GNUPG_LINK_FILES and converted.
+	* acconfig.h: Removed
+	* configure.in: Replaced by...
+	* configure.ac: and modified for use with autoconf 2.52.  Replaced
+	GNUPG_LINK_FILES with AC_CONFIG_LINKS and moved some informational
+	messages to the end. Removed --enable-m-debug
+
 	* tests/: New.
 	* Makefile.am: Included tests directory
 	
@@ -8,7 +20,7 @@
 
 2001-05-31  Werner Koch  <wk@gnupg.org>
 
-	Release 1.1.3.
+	Released 1.1.3.
 
 	* configure.in: Use _gcry_ prefix when creating the cipher constructor.
 
diff --git a/NEWS b/NEWS
index dc41db23..2d98e9ad 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,15 @@
+Noteworthy changes in version 1.1.4 (2001-08-03)
+------------------------------------------------
 
   * Arcfour does now work.                   
 
+  * Some minor fixes.
+
+  * Added a first test program
+
+  * Migrated to autoconf 2.52.
+
+
 Noteworthy changes in version 1.1.3 (2001-05-31)
 ------------------------------------------------
 
diff --git a/README b/README
index 5e0d674f..6590e9ee 100644
--- a/README
+++ b/README
@@ -12,6 +12,11 @@ except that new functions may be added in the future.
 
 This is a development version, the first stable version will be 1.2.0.
 
+If you are using the CVS version, make sure that you have the latest
+automake (I am using Debian Sid). Ignore the make warnings about
+overriding old rules. I had to include lsmain.sh two times due to
+autoconf/libtool mismatches.
+
 
 
 
diff --git a/acconfig.h b/acconfig.h
deleted file mode 100644
index 0b7a8365..00000000
--- a/acconfig.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* acconfig.h - used by autoheader to make config.h.in
- *	Copyright (C) 1998 Free Software Foundation, Inc.
- *
- * This file is part of GNUPG.
- *
- * GNUPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * GNUPG is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-#ifndef GCRYPT_CONFIG_H
-#define GCRYPT_CONFIG_H
-
-/* need this, because some autoconf tests rely on this (e.g. stpcpy)
- * and it should be used for new programs
- */
-#define _GNU_SOURCE  1
-
-@TOP@
-
-#undef M_DEBUG
-#undef M_GUARD
-#undef VERSION
-#undef PACKAGE
-#undef PRINTABLE_OS_NAME
-#undef IS_DEVELOPMENT_VERSION
-
-/* Define if your locale.h file contains LC_MESSAGES.  */
-#undef HAVE_LC_MESSAGES
-
-/* Define to 1 if NLS is requested.  */
-#undef ENABLE_NLS
-
-/* Define as 1 if you have catgets and don't want to use GNU gettext.  */
-#undef HAVE_CATGETS
-
-/* Define as 1 if you have gettext and don't want to use GNU gettext.  */
-#undef HAVE_GETTEXT
-
-/* libintl.h is available; this is obsolete because if we don't have
- * this header we use a symlink to the one in intl/ */
-#undef HAVE_LIBINTL_H
-
-
-#undef HAVE_STPCPY
-
-#undef HAVE_MLOCK
-
-
-#undef BIG_ENDIAN_HOST
-#undef LITTLE_ENDIAN_HOST
-
-#undef HAVE_BYTE_TYPEDEF
-#undef HAVE_USHORT_TYPEDEF
-#undef HAVE_ULONG_TYPEDEF
-#undef HAVE_U16_TYPEDEF
-#undef HAVE_U32_TYPEDEF
-
-#undef HAVE_BROKEN_MLOCK
-
-/* defined if we have a /dev/random and /dev/urandom */
-#undef HAVE_DEV_RANDOM
-/* and the real names of the random devices */
-#undef NAME_OF_DEV_RANDOM
-#undef NAME_OF_DEV_URANDOM
-/* Linux has an ioctl */
-#undef HAVE_DEV_RANDOM_IOCTL
-/* see cipher/rndegd.c */
-#undef EGD_SOCKET_NAME
-
-
-#undef USE_DYNAMIC_LINKING
-#undef HAVE_DL_DLOPEN
-#undef HAVE_DL_SHL_LOAD
-#undef HAVE_DLD_DLD_LINK
-
-#undef USE_SHM_COPROCESSING
-
-#undef IPC_HAVE_SHM_LOCK
-#undef IPC_RMID_DEFERRED_RELEASE
-
-/* set this to limit filenames to the 8.3 format */
-#undef USE_ONLY_8DOT3
-/* defined if we must run on a stupid file system */
-#undef HAVE_DRIVE_LETTERS
-/* defined if we run on some of the PCDOS like systems (DOS, Windoze. OS/2)
- * with special properties like no file modes */
-#undef HAVE_DOSISH_SYSTEM
-/* because the Unix gettext has to much overhead on MingW32 systems
- * and these systems lack Posix functions, we use a simplified version
- * of gettext */
-#undef USE_SIMPLE_GETTEXT
-/* At some point in the system we need to know that we use the Windows
- * random module. */
-#undef USE_STATIC_RNDW32
-
-#undef USE_CAPABILITIES
-
-/* Some systems have mkdir that takes a single argument. */
-#undef MKDIR_TAKES_ONE_ARG
-
-
-@BOTTOM@
-
-#include "gcrypt-defs.h"
-
-#define _GCRYPT_IN_LIBGCRYPT 1
-
-
-#endif /*GCRYPT_CONFIG_H*/
diff --git a/acinclude.m4 b/acinclude.m4
index daf6a355..e1d74f52 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,11 +1,28 @@
-dnl macros to configure g10
+dnl macros to configure Libgcrypt
+dnl Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+dnl
+dnl This file is part of Libgcrypt.
+dnl
+dnl Libgcrypt is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl 
+dnl Libgcrypt is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl 
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
 
 dnl GNUPG_MSG_PRINT(STRING)
 dnl print a message
 dnl
 define(GNUPG_MSG_PRINT,
-  [ echo $ac_n "$1"" $ac_c" 1>&AC_FD_MSG
+  [ echo $ac_n "$1"" $ac_c" 1>&AS_MESSAGE_FD([])
   ])
 
 
@@ -15,14 +32,15 @@ dnl
 AC_DEFUN(GNUPG_CHECK_TYPEDEF,
   [ AC_MSG_CHECKING(for $1 typedef)
     AC_CACHE_VAL(gnupg_cv_typedef_$1,
-    [AC_TRY_COMPILE([#include <stdlib.h>
+    [AC_TRY_COMPILE([#define _GNU_SOURCE 1
+    #include <stdlib.h>
     #include <sys/types.h>], [
     #undef $1
     int a = sizeof($1);
     ], gnupg_cv_typedef_$1=yes, gnupg_cv_typedef_$1=no )])
     AC_MSG_RESULT($gnupg_cv_typedef_$1)
     if test "$gnupg_cv_typedef_$1" = yes; then
-        AC_DEFINE($2)
+        AC_DEFINE($2,1,[Defined if a `]$1[' is typedef'd])
     fi
   ])
 
@@ -95,29 +113,6 @@ AC_DEFUN(GNUPG_CHECK_FAQPROG,
 
 
 
-dnl GNUPG_LINK_FILES( SRC, DEST )
-dnl same as AC_LINK_FILES, but collect the files to link in
-dnl some special variables and do the link
-dnl when GNUPG_DO_LINK_FILES is called
-dnl This is a workaround for AC_LINK_FILES, because it does not work
-dnl correct when using a caching scheme
-dnl
-define(GNUPG_LINK_FILES,
-  [ if test "x$wk_link_files_src" = "x"; then
-        wk_link_files_src="$1"
-        wk_link_files_dst="$2"
-    else
-        wk_link_files_src="$wk_link_files_src $1"
-        wk_link_files_dst="$wk_link_files_dst $2"
-    fi
-  ])
-define(GNUPG_DO_LINK_FILES,
-  [ AC_LINK_FILES( $wk_link_files_src, $wk_link_files_dst )
-  ])
-
-
-
-
 dnl GNUPG_CHECK_ENDIAN
 dnl define either LITTLE_ENDIAN_HOST or BIG_ENDIAN_HOST
 dnl
@@ -158,9 +153,11 @@ define(GNUPG_CHECK_ENDIAN,
       ])
     AC_MSG_RESULT([$gnupg_cv_c_endian])
     if test "$gnupg_cv_c_endian" = little; then
-      AC_DEFINE(LITTLE_ENDIAN_HOST)
+      AC_DEFINE(LITTLE_ENDIAN_HOST,1,
+                [Defined if the host has little endian byte ordering])
     else
-      AC_DEFINE(BIG_ENDIAN_HOST)
+      AC_DEFINE(BIG_ENDIAN_HOST,1,
+                [Defined if the host has big endian byte ordering])
     fi
   ])
 
@@ -328,7 +325,8 @@ define(GNUPG_CHECK_IPC,
          gnupg_cv_ipc_rmid_deferred_release="assume-no")
        )
        if test "$gnupg_cv_ipc_rmid_deferred_release" = "yes"; then
-           AC_DEFINE(IPC_RMID_DEFERRED_RELEASE)
+           AC_DEFINE(IPC_RMID_DEFERRED_RELEASE,1,
+                     [Defined if we can do a deferred shm release])
            AC_MSG_RESULT(yes)
        else
           if test "$gnupg_cv_ipc_rmid_deferred_release" = "no"; then
@@ -351,7 +349,8 @@ define(GNUPG_CHECK_IPC,
           )
        )
        if test "$gnupg_cv_ipc_have_shm_lock" = "yes"; then
-         AC_DEFINE(IPC_HAVE_SHM_LOCK)
+         AC_DEFINE(IPC_HAVE_SHM_LOCK,1,
+                   [Defined if a SysV shared memory supports the LOCK flag])
          AC_MSG_RESULT(yes)
        else
          AC_MSG_RESULT(no)
@@ -399,7 +398,8 @@ define(GNUPG_CHECK_MLOCK,
                 gnupg_cv_mlock_is_in_sys_mman=yes,
                 gnupg_cv_mlock_is_in_sys_mman=no)])
             if test "$gnupg_cv_mlock_is_in_sys_mman" = "yes"; then
-                AC_DEFINE(HAVE_MLOCK)
+                AC_DEFINE(HAVE_MLOCK,1,
+                          [Defined if the system supports an mlock() call])
             fi
         fi
     fi
@@ -439,7 +439,8 @@ define(GNUPG_CHECK_MLOCK,
            )
          )
          if test "$gnupg_cv_have_broken_mlock" = "yes"; then
-             AC_DEFINE(HAVE_BROKEN_MLOCK)
+             AC_DEFINE(HAVE_BROKEN_MLOCK,1,
+                       [Defined if the mlock() call does not work])
              AC_MSG_RESULT(yes)
          else
             if test "$gnupg_cv_have_broken_mlock" = "no"; then
@@ -625,23 +626,23 @@ EOF
         if AC_TRY_EVAL(ac_link) && test -s conftest; then
           ac_pipe_works=yes
         else
-          echo "configure: failed program was:" >&AC_FD_CC
-          cat conftest.c >&AC_FD_CC
+          echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD()
+          cat conftest.c >&AS_MESSAGE_LOG_FD()
         fi
         LIBS="$ac_save_LIBS"
         CFLAGS="$ac_save_CFLAGS"
       else
-        echo "cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
+        echo "cannot find nm_test_func in $ac_nlist" >&AS_MESSAGE_LOG_FD()
       fi
     else
-      echo "cannot find nm_test_var in $ac_nlist" >&AC_FD_CC
+      echo "cannot find nm_test_var in $ac_nlist" >&AS_MESSAGE_LOG_FD()
     fi
   else
-    echo "cannot run $ac_cv_sys_global_symbol_pipe" >&AC_FD_CC
+    echo "cannot run $ac_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD()
   fi
 else
-  echo "$progname: failed program was:" >&AC_FD_CC
-  cat conftest.c >&AC_FD_CC
+  echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD()
+  cat conftest.c >&AS_MESSAGE_LOG_FD()
 fi
 rm -rf conftest*
 
@@ -700,15 +701,15 @@ if AC_TRY_EVAL(ac_compile); then
       if egrep '^nm_test_func ' "$ac_nlist" >/dev/null; then
         :
       else
-        echo "configure: cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
+        echo "configure: cannot find nm_test_func in $ac_nlist" >&AS_MESSAGE_LOG_FD()
       fi
     fi
   else
-    echo "configure: cannot run $ac_cv_sys_global_symbol_pipe" >&AC_FD_CC
+    echo "configure: cannot run $ac_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD()
   fi
 else
-  echo "configure: failed program was:" >&AC_FD_CC
-  cat conftest.c >&AC_FD_CC
+  echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD()
+  cat conftest.c >&AS_MESSAGE_LOG_FD()
 fi
 rm -rf conftest*
 ])
@@ -741,7 +742,8 @@ AC_CACHE_CHECK([if mkdir takes one argument], gnupg_cv_mkdir_takes_one_arg,
 #endif], [mkdir ("foo", 0);],
         gnupg_cv_mkdir_takes_one_arg=no, gnupg_cv_mkdir_takes_one_arg=yes)])
 if test $gnupg_cv_mkdir_takes_one_arg = yes ; then
-  AC_DEFINE(MKDIR_TAKES_ONE_ARG)
+  AC_DEFINE(MKDIR_TAKES_ONE_ARG,1,
+            [Defined if mkdir() does not take permission flags])
 fi
 ])
 
diff --git a/cipher/Makefile.am b/cipher/Makefile.am
index 217aa35e..2598359a 100644
--- a/cipher/Makefile.am
+++ b/cipher/Makefile.am
@@ -87,9 +87,11 @@ libcipher_la_LIBADD =	  @STATIC_CIPHER_OBJS@
 # If I remember it correct, automake 1.4 has a feature to set
 # fooFLAGS depending on the program.  So we should check it out.
 
+#if BUILD_MODULE_TIGER
 tiger: $(srcdir)/tiger.c
 	`echo $(COMPILE) $(DYNLINK_MOD_CFLAGS) -o tiger $(srcdir)/tiger.c | \
 	    sed -e 's/-O[2-9s]*/-O/g' `
+#endif
 
 tiger.o: $(srcdir)/tiger.c
 	`echo $(COMPILE) -c $(srcdir)/tiger.c | sed -e 's/-O[2-9s]*/-O1/g' `
@@ -98,19 +100,28 @@ tiger.o: $(srcdir)/tiger.c
 #	 `echo $(COMPILE) $(DYNLINK_MOD_CFLAGS) -o twofish $(srcdir)/twofish.c | \
 #	     sed -e 's/-O[0-9s]*/  /g' `
 
+#if BUILD_MODULE_TWOFISH
 twofish: $(srcdir)/twofish.c
 	$(COMPILE) $(DYNLINK_MOD_CFLAGS) -o twofish $(srcdir)/twofish.c
+#endif
 
 #twofish.o: $(srcdir)/twofish.c
 #	 `echo $(COMPILE) -c $(srcdir)/twofish.c | sed -e 's/-O[0-9s]*/  /g' `
 
-
+#if BUILD_MODULE_RNDUNIX
 rndunix: $(srcdir)/rndunix.c
 	$(COMPILE) $(DYNLINK_MOD_CFLAGS) -o rndunix $(srcdir)/rndunix.c
+#endif
 
+#if BUILD_MODULE_RNDLINUX
 rndlinux: $(srcdir)/rndlinux.c
 	$(COMPILE) $(DYNLINK_MOD_CFLAGS) -o rndlinux $(srcdir)/rndlinux.c
+#endif
 
+#if BUILD_MODULE_RNDEGD
 rndegd: $(srcdir)/rndegd.c
 	$(COMPILE) $(DYNLINK_MOD_CFLAGS) -o rndegd $(srcdir)/rndegd.c
+#endif
+
+
 
diff --git a/configure.in b/configure.ac
index c4526d18..6ec0a9ae 100644
--- a/configure.in
+++ b/configure.ac
@@ -1,17 +1,26 @@
+dnl Configure.ac script for Libgcrypt
+dnl Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 dnl
-dnl Configure template for GNUPG
+dnl This file is part of Libgcrypt.
+dnl
+dnl Libgcrypt is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl 
+dnl Libgcrypt is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl 
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 dnl
 dnl (Process this file with autoconf to produce a configure script.)
 AC_REVISION($Revision$)dnl
 
-dnl Must reset CDPATH so that bash's cd does not print to stdout
-CDPATH=
-
-AC_PREREQ(2.13)
-AC_INIT(src/gcrypt.h)
-AC_CONFIG_AUX_DIR(scripts)
-AM_CONFIG_HEADER(config.h)
-AC_CANONICAL_SYSTEM
+AC_PREREQ(2.52)
 #############################################
 # Version numbers (Rember to change them just before a release)
 # 1. No interfaces changed, only implementations (good): Increment REVISION.
@@ -19,16 +28,27 @@ AC_CANONICAL_SYSTEM
 #    AGE, set REVISION to 0.
 # 3. Interfaces removed (BAD, breaks upward compatibility): Increment
 #    CURRENT, set AGE and REVISION to 0.
-AM_INIT_AUTOMAKE(libgcrypt,1.1.3)
+AC_INIT(libgcrypt,1.1.4)
 LIBGCRYPT_LT_CURRENT=2
 LIBGCRYPT_LT_AGE=1
-LIBGCRYPT_LT_REVISION=0
+LIBGCRYPT_LT_REVISION=1
 ##############################################
+AC_CONFIG_SRCDIR([src/gcrypt.h])
+AC_CONFIG_AUX_DIR(scripts)
+AM_CONFIG_HEADER(config.h)
+AC_CANONICAL_TARGET([])
+
 
 AC_SUBST(LIBGCRYPT_LT_CURRENT)
 AC_SUBST(LIBGCRYPT_LT_AGE)
 AC_SUBST(LIBGCRYPT_LT_REVISION)
 
+PACKAGE="$PACKAGE_NAME"
+VERSION="$PACKAGE_VERSION"
+AC_SUBST(PACKAGE)
+AC_SUBST(VERSION)
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package])
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version of this package])
 
 
 # ALL_LINGUAS="da de eo es_ES fr id it ja nl pl pt_BR pt_PT ru sv"
@@ -68,7 +88,9 @@ esac
 AC_ARG_WITH(egd-socket,
     [  --with-egd-socket=NAME  Use NAME for the EGD socket)],
             egd_socket_name="$withval", egd_socket_name="" )
-AC_DEFINE_UNQUOTED(EGD_SOCKET_NAME, "$egd_socket_name")
+AC_DEFINE_UNQUOTED(EGD_SOCKET_NAME, "$egd_socket_name",
+                   [Define if you don't want the default EGD socket name.
+                    For details see cipher/rndegd.c])
 
 
 
@@ -98,23 +120,13 @@ AC_ARG_ENABLE(asm,
      try_asm_modules=$enableval, try_asm_modules=yes)
 AC_MSG_RESULT($try_asm_modules)
 
-AC_MSG_CHECKING([whether memory debugging is requested])
-AC_ARG_ENABLE(m-debug,
-[  --enable-m-debug        enable debugging of memory allocation],
-use_m_debug=$enableval, use_m_debug=no)
-AC_MSG_RESULT($use_m_debug)
-if test "$use_m_debug" = yes; then
-    AC_DEFINE(M_DEBUG)
-    use_m_guard=yes
-else
-    AC_MSG_CHECKING([whether memory guard is requested])
-    AC_ARG_ENABLE(m-guard,
+AC_MSG_CHECKING([whether memory guard is requested])
+AC_ARG_ENABLE(m-guard,
     [  --enable-m-guard        enable memory guard facility],
     use_m_guard=$enableval, use_m_guard=no)
     AC_MSG_RESULT($use_m_guard)
-fi
 if test "$use_m_guard" = yes ; then
-    AC_DEFINE(M_GUARD)
+    AC_DEFINE(M_GUARD,1,[Define to use the (obsolete) malloc guarding feature])
 fi
 
 dnl
@@ -126,6 +138,16 @@ AC_ARG_WITH(capabilities,
 [use_capabilities="$withval"],[use_capabilities=no])
 AC_MSG_RESULT($use_capabilities)
 
+AH_TOP([
+/* need this, because some autoconf tests rely on this (e.g. stpcpy)
+ * and it should be used for new programs  */
+#define _GNU_SOURCE  1
+])
+
+AH_BOTTOM([
+#include "gcrypt-defs.h"
+#define _GCRYPT_IN_LIBGCRYPT 1
+])
 
 
 AM_MAINTAINER_MODE
@@ -179,9 +201,14 @@ case "${target}" in
     *-*-mingw32*)
         # special stuff for Windoze NT
         ac_cv_have_dev_random=no
-        AC_DEFINE(USE_ONLY_8DOT3)
-        AC_DEFINE(HAVE_DRIVE_LETTERS)
-        AC_DEFINE(HAVE_DOSISH_SYSTEM)
+        AC_DEFINE(USE_ONLY_8DOT3,1,
+                  [set this to limit filenames to the 8.3 format])
+        AC_DEFINE(HAVE_DRIVE_LETTERS,1,
+                  [defined if we must run on a stupid file system])
+        AC_DEFINE(HAVE_DOSISH_SYSTEM,1,
+                  [defined if we run on some of the PCDOS like systems 
+                   (DOS, Windoze. OS/2) with special properties like
+                    no file modes])
         try_gettext="no"
         ;;
     i?86-emx-os2 | i?86-*-os2*emx )
@@ -255,7 +282,8 @@ dnl let that after linux to avoid gnu-linux problems
         PRINTABLE_OS_NAME=`uname -s || echo "Unknown"`
         ;;
 esac
-AC_DEFINE_UNQUOTED(PRINTABLE_OS_NAME, "$PRINTABLE_OS_NAME")
+AC_DEFINE_UNQUOTED(PRINTABLE_OS_NAME, "$PRINTABLE_OS_NAME",
+                   [A human readable text with the name of the OS])
 
 dnl  Fixme: Are these the best flags for OpenBSD????
 case "${target}" in
@@ -282,8 +310,10 @@ case "${target}" in
         fi
         ;;
 esac
-AC_DEFINE_UNQUOTED(NAME_OF_DEV_RANDOM, "$NAME_OF_DEV_RANDOM")
-AC_DEFINE_UNQUOTED(NAME_OF_DEV_URANDOM, "$NAME_OF_DEV_URANDOM")
+AC_DEFINE_UNQUOTED(NAME_OF_DEV_RANDOM, "$NAME_OF_DEV_RANDOM",
+                   [defined to the name of the strong random device])
+AC_DEFINE_UNQUOTED(NAME_OF_DEV_URANDOM, "$NAME_OF_DEV_URANDOM",
+                   [defined to the name of the weaker random device])
 AC_SUBST(MPI_OPT_FLAGS)
 
 
@@ -314,8 +344,10 @@ fi
 if test "$try_dynload" = yes ; then
   AC_CHECK_LIB(dl,dlopen)
   if test "$ac_cv_lib_dl_dlopen" = "yes"; then
-    AC_DEFINE(USE_DYNAMIC_LINKING)
-    AC_DEFINE(HAVE_DL_DLOPEN)
+    AC_DEFINE(USE_DYNAMIC_LINKING,1,
+              [define to enable the use of extensions])
+    AC_DEFINE(HAVE_DL_DLOPEN,1,
+              [Defined when the dlopen function family is available])
     DYNLINK_LDFLAGS="$CFLAGS_EXPORTDYNAMIC"
     use_gnupg_extensions=yes
   else
@@ -329,7 +361,8 @@ if test "$try_dynload" = yes ; then
       AC_CHECK_LIB(dld,shl_load)
       if test "$ac_cv_lib_dld_shl_load" = "yes"; then
         AC_DEFINE(USE_DYNAMIC_LINKING)
-        AC_DEFINE(HAVE_DL_SHL_LOAD)
+        AC_DEFINE(HAVE_DL_SHL_LOAD,1,
+                  [Defined if the shl_load function family is available])
         DYNLINK_LDFLAGS="$CFLAGS_EXPORTDYNAMIC"
         use_gnupg_extensions=yes
 dnl -----------------
@@ -411,7 +444,8 @@ AC_CHECK_HEADERS(sys/capability.h)
 if test "$ac_cv_header_sys_capability_h" = "yes" ; then
   AC_CHECK_LIB(cap, cap_init, ac_need_libcap=1)
   if test "$ac_cv_lib_cap_cap_init" = "yes"; then
-     AC_DEFINE(USE_CAPABILITIES)
+     AC_DEFINE(USE_CAPABILITIES,1,
+               [define if capabilities should be used])
      LIBS="$LIBS -lcap"
      use_capabilities=yes
   fi
@@ -433,7 +467,8 @@ fi
 
 GNUPG_CHECK_IPC
 if test "$ac_cv_header_sys_shm_h" = "yes"; then
-  AC_DEFINE(USE_SHM_COPROCESSING)
+  AC_DEFINE(USE_SHM_COPROCESSING,1,
+            [define if the shared memory interface should be made available])
 fi
 
 dnl
@@ -444,7 +479,8 @@ if test "$try_dev_random" = yes ; then
     [if test -r "$NAME_OF_DEV_RANDOM" && test -r "$NAME_OF_DEV_URANDOM" ; then
       ac_cv_have_dev_random=yes; else ac_cv_have_dev_random=no; fi])
     if test "$ac_cv_have_dev_random" = yes; then
-        AC_DEFINE(HAVE_DEV_RANDOM)
+        AC_DEFINE(HAVE_DEV_RANDOM,1,
+                 [defined if the system supports a random device] )
     fi
 else
     AC_MSG_CHECKING(for random device)
@@ -466,7 +502,8 @@ if test "$ac_cv_have_dev_random" = yes ; then
         fi
       ])
     if test "$ac_cv_have_dev_random_ioctl" = yes; then
-        AC_DEFINE(HAVE_DEV_RANDOM_IOCTL)
+        AC_DEFINE(HAVE_DEV_RANDOM_IOCTL,1,
+                  [defined if the random device supports some IOCTLs])
     fi
 fi
 
@@ -482,7 +519,9 @@ if test "$use_static_rnd" = default; then
       case "${target}" in
           *-*-mingw32*)
               static_random_module="rndw32"
-              AC_DEFINE(USE_STATIC_RNDW32)
+              AC_DEFINE(USE_STATIC_RNDW32,1,
+                       [At a certain point in the code we need to know that
+                        we use the Windows random module.])
               ;;
           i?86-emx-os2|i?86-*-os2*emx)
               static_random_module="rndos2"
@@ -561,6 +600,28 @@ for name in $MODULES_IN_CIPHER; do
             DYNAMIC_CIPHER_MODS="$DYNAMIC_CIPHER_MODS $name"
             GNUPG_MSG_PRINT([$name])
         fi
+
+dnl        dnl Very ugly way to do this, but I don't knwo how to
+dnl        dnl cope with AC_SUBST otherwise
+dnl        case "$name" in
+dnl          tiger)
+dnl            AM_CONDITIONAL(BUILD_MODULE_TIGER,   [test $x = no])
+dnl            ;;                                   
+dnl          twofish)                               
+dnl            AM_CONDITIONAL(BUILD_MODULE_TWOFISH, [test $x = no])
+dnl            ;;                                   
+dnl          rndunix)                               
+dnl            AM_CONDITIONAL(BUILD_MODULE_RNDUNIX, [test $x = no])
+dnl            ;;                                   
+dnl          rndlinux)                              
+dnl            AM_CONDITIONAL(BUILD_MODULE_RNDLINUX,[test $x = no])
+dnl            ;;                                   
+dnl          rndegd)                                
+dnl            AM_CONDITIONAL(BUILD_MODULE_RNDEGD,  [test $x = no])
+dnl            ;;
+dnl          *)
+dnl            ;;
+dnl        esac
     fi
 done
 AC_MSG_RESULT()
@@ -568,6 +629,7 @@ AC_SUBST(STATIC_CIPHER_OBJS)
 AC_SUBST(STATIC_CIPHER_NAMES)
 AC_SUBST(DYNAMIC_CIPHER_MODS)
 
+
 dnl
 dnl And build the constructor file
 dnl
@@ -608,12 +670,13 @@ dnl
 AC_SUBST(STATIC_CIPHER_OBJS)
 AC_SUBST(DYNAMIC_CIPHER_MODS)
 
-
-dnl setup assembler stuff
+#
+# setup assembler stuff
+#
 AC_MSG_CHECKING(for mpi assembler functions)
 if test -f $srcdir/mpi/config.links ; then
     . $srcdir/mpi/config.links
-    GNUPG_LINK_FILES($mpi_ln_src, $mpi_ln_dst)
+    AC_CONFIG_LINKS("$mpi_ln_list")
     ac_cv_mpi_extra_asm_modules="$mpi_extra_modules"
     ac_cv_mpi_sflags="$mpi_sflags"
     ac_cv_mpi_config_done="yes"
@@ -623,13 +686,12 @@ else
     AC_MSG_ERROR([mpi/config.links missing!])
 fi
 MPI_EXTRA_ASM_OBJS=""
+show_extraasm=""
 if test "$ac_cv_mpi_extra_asm_modules" != ""; then
-GNUPG_MSG_PRINT([mpi extra asm functions:])
 for i in $ac_cv_mpi_extra_asm_modules; do
-    GNUPG_MSG_PRINT([$i])
-    MPI_EXTRA_ASM_OBJS="$MPI_EXTRA_ASM_OBJS $i.lo"
+    show_extraasm="$show_extraasm $i"
+    MPI_EXTRA_ASM_OBJS="$MPI_EXTRA_ASM_OBJS $i.o"
 done
-AC_MSG_RESULT()
 fi
 AC_SUBST(MPI_EXTRA_ASM_OBJS)
 MPI_SFLAGS="$ac_cv_mpi_sflags"
@@ -643,13 +705,12 @@ changequote(,)dnl
 tmp_pat='[a-zA-Z]'
 changequote([,])dnl
 if echo "$VERSION" | sed 's/-.*//' | grep "$tmp_pat" >/dev/null ; then
-    AC_DEFINE(IS_DEVELOPMENT_VERSION)
+    AC_DEFINE(IS_DEVELOPMENT_VERSION,1,
+              [Defined if this is not a regular release])
 fi
 
 AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes)
 
-GNUPG_DO_LINK_FILES
-
 GNUPG_CHECK_GNUMAKE
 
 if test "$GCC" = yes; then
@@ -664,14 +725,14 @@ dnl
 dnl Make the version number in src/gcrypt.h the same as the one here.
 dnl (this is easier than to have a *.in file just for one substitution)
 dnl
-GNUPG_FIX_HDR_VERSION(src/gcrypt.h, GCRYPT_VERSION)
+GNUPG_FIX_HDR_VERSION([src/gcrypt.h], GCRYPT_VERSION)
 
 LIBGCRYPT_LIBS="-L${libdir} -lgcrypt"
 LIBGCRYPT_CFLAGS=""
 AC_SUBST(LIBGCRYPT_LIBS)
 AC_SUBST(LIBGCRYPT_CFLAGS)
 
-AC_OUTPUT_COMMANDS([
+AC_CONFIG_COMMANDS([gcrypt-defs],[[
 chmod +x scripts/db2any
 chmod +x src/libgcrypt-config
 cat >gcrypt-defs.tmp <<G10EOF
@@ -700,16 +761,16 @@ else
     mv gcrypt-defs.tmp gcrypt-defs.h
     echo "gcrypt-defs.h created"
 fi
-],[
+]],[[
 prefix=$prefix
 exec_prefix=$exec_prefix
 libdir=$libdir
 datadir=$datadir
 DATADIRNAME=$DATADIRNAME
-])
+]])
 
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile
 jnlib/Makefile
 mpi/Makefile
@@ -720,4 +781,5 @@ src/Makefile
 src/libgcrypt-config
 tests/Makefile
 ])
+AC_OUTPUT
 
diff --git a/mpi/ChangeLog b/mpi/ChangeLog
index a97ccf40..63cd4cf2 100644
--- a/mpi/ChangeLog
+++ b/mpi/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-03  Werner Koch  <wk@gnupg.org>
+
+	* config.links: Changed the way the list of files to be
+	symlinked is returned.
+
 2001-05-31  Werner Koch  <wk@gnupg.org>
 
 	* mpih-cmp.c: Removed and moved mpihelp_cmp to ..
diff --git a/mpi/config.links b/mpi/config.links
index 48c7977c..8c47cb90 100644
--- a/mpi/config.links
+++ b/mpi/config.links
@@ -1,5 +1,24 @@
+# config.links - helper for ../configure
+# Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+#
+# This file is part of Libgcrypt.
+#
+# Libgcrypt is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# Libgcrypt is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
 # sourced by ../configure to get the list of files to link
-# this should set $mpi_ln_src and mpi_ln_dst.
+# this should set $mpi_ln_list.
 # Note: this is called from the above directory.
 
 
@@ -255,8 +274,7 @@ mpi_ln_modules="${mpi_extra_modules} mpih-add1 mpih-mul1 mpih-mul2 mpih-mul3 \
 		 mpih-lshift mpih-rshift mpih-sub1"
 
 mpi_ln_objects=
-mpi_ln_src=
-mpi_ln_dst=
+mpi_ln_list=
 
 # try to get file to link from the assembler subdirectory and
 # if this fails get it from the generic subdirectory.
@@ -266,12 +284,10 @@ for fn in $mpi_ln_modules ; do
     for dir in $path ; do
 	rm -f $srcdir/mpi/$fn.[Sc]
 	if test -f $srcdir/mpi/$dir/$fn.S ; then
-	    mpi_ln_src="$mpi_ln_src mpi/$dir/$fn.S"
-	    mpi_ln_dst="$mpi_ln_dst mpi/$fn.S"
+            mpi_ln_list="$mpi_ln_list mpi/$fn.S:mpi/$dir/$fn.S"
 	    break;
 	elif test -f $srcdir/mpi/$dir/$fn.c ; then
-	    mpi_ln_src="$mpi_ln_src mpi/$dir/$fn.c"
-	    mpi_ln_dst="$mpi_ln_dst mpi/$fn.c"
+            mpi_ln_list="$mpi_ln_list mpi/$fn.c:mpi/$dir/$fn.c"
 	    break;
 	fi
     done
@@ -280,10 +296,9 @@ done
 # Same thing for the file which defines the limb size
 path="$path generic"
 for dir in $path ; do
-     	rm -f $srcdir/mpi/mpi-asm-defs.h
-	if test -f $srcdir/mpi/$dir/mpi-asm-defs.h ; then
-	    mpi_ln_src="$mpi_ln_src mpi/$dir/mpi-asm-defs.h"
-	    mpi_ln_dst="$mpi_ln_dst mpi/mpi-asm-defs.h"
-	    break;
-	fi
+    rm -f $srcdir/mpi/mpi-asm-defs.h
+    if test -f $srcdir/mpi/$dir/mpi-asm-defs.h ; then
+        mpi_ln_list="$mpi_ln_list mpi/mpi-asm-defs.h:mpi/$dir/mpi-asm-defs.h"
+        break;
+    fi
 done
diff --git a/scripts/autogen.sh b/scripts/autogen.sh
index ae80fa10..2bb55b98 100755
--- a/scripts/autogen.sh
+++ b/scripts/autogen.sh
@@ -4,7 +4,7 @@
 PGM=GnuPG
 DIE=no
 
-autoconf_vers=2.13
+autoconf_vers=2.52
 automake_vers=1.4
 aclocal_vers=1.4
 libtool_vers=1.3
diff --git a/scripts/distfiles b/scripts/distfiles
index 2d79a5b7..fc36b039 100644
--- a/scripts/distfiles
+++ b/scripts/distfiles
@@ -5,7 +5,6 @@ mkinstalldirs
 missing
 autogen.sh
 ChangeLog
-ltconfig
-ltmain.sh
 db2any
+ltmain.sh
 
diff --git a/src/gcrypt.h b/src/gcrypt.h
index b13e3875..43b7a5a1 100644
--- a/src/gcrypt.h
+++ b/src/gcrypt.h
@@ -35,7 +35,7 @@ extern "C" {
  * header matches the installed library.
  * Note: Do not edit the next line as configure may fix the string here.
  */
-#define GCRYPT_VERSION "1.1.3"
+#define GCRYPT_VERSION "1.1.4"
 
 
 #ifndef HAVE_BYTE_TYPEDEF