A lot of cleanups as well as minor API changes.
[libgcrypt.git] / configure.ac
index 1982779..c33437e 100644 (file)
@@ -1,6 +1,6 @@
 # Configure.ac script for Libgcrypt
-# Copyright (C) 1998, 1999, 2000, 2001,
-#               2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999, 2000, 2001, 2002
+#               2003, 2004, 2006 Free Software Foundation, Inc.
 #
 # This file is part of Libgcrypt.
 #
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # (Process this file with autoconf to produce a configure script.)
-AC_REVISION($Revision$)dnl
+AC_REVISION($Revision$)
+AC_PREREQ(2.59)
+min_automake_version="1.9.3"
 
-AC_PREREQ(2.52)
-# Version number: Remember to change it immediately *after* a release but
-# remove a "-cvs" prefix right *before* a release and append it soon later.
-AC_INIT(libgcrypt, 1.1.13-cvs, bug-libgcrypt@gnupg.org)
+
+# Remember to change the version number immediately *after* a release.
+# Set my_issvn to "yes" for non-released code.  Remember to run an
+# "svn up" and "autogen.sh" right before creating a distribution.
+m4_define([my_version], [1.3.0])
+m4_define([my_issvn], [yes])
+
+m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
+            || echo 'Revision: 0')|sed -n '/^Revision:/ {s/[^0-9]//gp;q;}')]))
+AC_INIT([libgcrypt], my_version[]m4_if(my_issvn,[yes],[-svn[]svn_revision]),
+        [bug-libgcrypt@gnupg.org])
 # LT Version numbers, remember to change them just *before* a release.
 #   (Interfaces removed:    CURRENT++, AGE=0, REVISION=0)
 #   (Interfaces added:      CURRENT++, AGE++, REVISION=0)
 #   (No interfaces changed:                   REVISION++)
-LIBGCRYPT_LT_CURRENT=6
-LIBGCRYPT_LT_AGE=5
-LIBGCRYPT_LT_REVISION=1
-#-----------------------
+LIBGCRYPT_LT_CURRENT=14
+LIBGCRYPT_LT_AGE=3
+LIBGCRYPT_LT_REVISION=0
+
+
+# If the API is changed in an incompatible way: increment the next counter.
+LIBGCRYPT_CONFIG_API_VERSION=1
+
+NEED_GPG_ERROR_VERSION=1.0
+
 
 PACKAGE=$PACKAGE_NAME
 VERSION=$PACKAGE_VERSION
 
-AC_CONFIG_SRCDIR([src/gcrypt.h])
-AC_CONFIG_AUX_DIR(scripts)
+AC_CONFIG_SRCDIR([src/libgcrypt.vers])
 AC_CANONICAL_TARGET()
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
 AM_CONFIG_HEADER(config.h)
+AM_MAINTAINER_MODE
 
 AH_TOP([
 /* need this, because some autoconf tests rely on this (e.g. stpcpy)
@@ -49,10 +64,21 @@ AH_TOP([
 #define _GNU_SOURCE  1
 ])
 
-
 AH_BOTTOM([
-#include "gcrypt-defs.h"
 #define _GCRYPT_IN_LIBGCRYPT 1
+
+/* If the configure check for endianness has been disabled, get it from
+   OS macros.  This is intended for making fat binary builds on OS X.  */
+#ifdef DISABLED_ENDIAN_CHECK
+# if defined(__BIG_ENDIAN__)
+#  define WORDS_BIGENDIAN 1
+# elif defined(__LITTLE_ENDIAN__)
+#  undef WORDS_BIGENDIAN
+# else
+#  error "No endianness found"
+# endif
+#endif /*DISABLED_ENDIAN_CHECK*/
+
 ])
 
 AH_VERBATIM([_REENTRANT],
@@ -60,8 +86,8 @@ AH_VERBATIM([_REENTRANT],
     special features from the library. */
 #ifndef _REENTRANT
 # define _REENTRANT 1
-#endif])
-
+#endif
+])
 
 
 AC_SUBST(LIBGCRYPT_LT_CURRENT)
@@ -72,24 +98,185 @@ AC_SUBST(VERSION)
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package])
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version of this package])
 
+
+######################
+##  Basic checks.  ### (we need some results later on (e.g. $GCC)
+######################
+
+AC_PROG_MAKE_SET
+missing_dir=`cd $ac_aux_dir && pwd`
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
+AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
+AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
+# AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
+AC_PROG_CC
+AC_PROG_CPP
+AM_PROG_AS
+AC_ISC_POSIX
+AC_PROG_INSTALL
 AC_PROG_AWK
 
-dnl Used by libgcrypt-config
+AC_LIBTOOL_WIN32_DLL
+AC_LIBTOOL_RC
+AM_PROG_LIBTOOL
+
+
+##########################
+## General definitions. ##
+##########################
+
+# Used by libgcrypt-config
 LIBGCRYPT_CONFIG_LIBS="-lgcrypt"
 LIBGCRYPT_CONFIG_CFLAGS=""
 
-dnl Definitions for symmetric ciphers.
-available_ciphers="arcfour blowfish cast5 des aes twofish serpent"
+# Definitions for symmetric ciphers.
+available_ciphers="arcfour blowfish cast5 des aes twofish serpent rfc2268 seed"
 enabled_ciphers=""
 
-dnl Definitions for public-key ciphers.
+# Definitions for public-key ciphers.
 available_pubkey_ciphers="dsa elgamal rsa"
 enabled_pubkey_ciphers=""
 
-dnl Definitions for message digests.
+# Definitions for message digests.
 available_digests="crc md4 md5 rmd160 sha1 sha256"
+available_digests_64="sha512 tiger whirlpool"
 enabled_digests=""
 
+# Definitions for random modules.
+available_random_modules="linux egd unix"
+auto_random_modules="$available_random_modules"
+
+# Supported thread backends.
+LIBGCRYPT_THREAD_MODULES=""
+
+# Other definitions.
+print_egd_notice=no
+have_w32_system=no
+
+# Setup some stuff depending on host/target.
+case "${target}" in
+    *-*-mingw32*)
+      available_random_modules="w32"
+      ac_cv_have_dev_random=no
+      have_w32_system=yes
+      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])
+      ;;
+
+    i?86-emx-os2 | i?86-*-os2*emx)
+        # OS/2 with the EMX environment
+        ac_cv_have_dev_random=no
+        AC_DEFINE(HAVE_DRIVE_LETTERS)
+        AC_DEFINE(HAVE_DOSISH_SYSTEM)
+        ;;
+
+    i?86-*-msdosdjgpp*)
+        # DOS with the DJGPP environment
+        ac_cv_have_dev_random=no
+        AC_DEFINE(HAVE_DRIVE_LETTERS)
+        AC_DEFINE(HAVE_DOSISH_SYSTEM)
+        ;;
+
+    *-*-freebsd*)
+       # FreeBSD
+       CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+       LDFLAGS="$LDFLAGS -L/usr/local/lib"
+       ;;
+
+    *-*-hpux*)
+        if test -z "$GCC" ; then
+            CFLAGS="$CFLAGS -Ae -D_HPUX_SOURCE"
+        fi
+        ;;
+    *-dec-osf4*)
+        if test -z "$GCC" ; then
+            # Suppress all warnings
+            # to get rid of the unsigned/signed char mismatch warnings.
+            CFLAGS="$CFLAGS -w"
+        fi
+        ;;
+    m68k-atari-mint)
+        ;;
+    *)
+      ;;
+esac
+
+if test "$have_w32_system" = yes; then
+   AC_DEFINE(HAVE_W32_SYSTEM,1, [Defined if we run on a W32 API based system])
+fi
+AM_CONDITIONAL(HAVE_W32_SYSTEM, test "$have_w32_system" = yes)
+
+
+
+# A printable OS Name is sometime useful.
+case "${target}" in
+    *-*-mingw32*)
+        PRINTABLE_OS_NAME="MingW32"
+        ;;
+
+    i?86-emx-os2 | i?86-*-os2*emx )
+        PRINTABLE_OS_NAME="OS/2"
+        ;;
+
+    i?86-*-msdosdjgpp*)
+        PRINTABLE_OS_NAME="MSDOS/DJGPP"
+        ;;
+
+    *-linux*)
+        PRINTABLE_OS_NAME="GNU/Linux"
+        ;;
+
+    *)
+        PRINTABLE_OS_NAME=`uname -s || echo "Unknown"`
+        ;;
+esac
+
+
+case "${target}" in
+    *-openbsd*)
+        # FIXME: Are these the best flags for OpenBSD?
+        NAME_OF_DEV_RANDOM="/dev/srandom"
+        NAME_OF_DEV_URANDOM="/dev/urandom"
+#       DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x"
+        ;;
+
+    *-solaris* | *-irix* | *-dec-osf* | *-netbsd* )
+        NAME_OF_DEV_RANDOM="/dev/random"
+        NAME_OF_DEV_URANDOM="/dev/random"
+#       DYNLINK_MOD_CFLAGS="-shared $CFLAGS_PIC"
+        ;;
+
+    *)
+        NAME_OF_DEV_RANDOM="/dev/random"
+        NAME_OF_DEV_URANDOM="/dev/urandom"
+        # -shared is a gcc-ism.  Find pic flags from GNUPG_CHECK_PIC.
+#        if test -n "$GCC" ; then
+#           DYNLINK_MOD_CFLAGS="-shared $CFLAGS_PIC"                            
+#        else
+#           DYNLINK_MOD_CFLAGS="$CFLAGS_PIC"
+#        fi
+        ;;
+esac
+
+
+AC_ARG_ENABLE(endian-check,
+              AC_HELP_STRING([--disable-endian-check],
+             [disable the endian check and trust the OS provided macros]),
+             endiancheck=$enableval,endiancheck=yes)
+if test x"$endiancheck" = xyes ; then
+  AC_C_BIGENDIAN
+else
+  AC_DEFINE(DISABLED_ENDIAN_CHECK,1,[configure did not test for endianess])
+fi
+
+
 AC_CHECK_SIZEOF(unsigned short, 2)
 AC_CHECK_SIZEOF(unsigned int, 4)
 AC_CHECK_SIZEOF(unsigned long, 4)
@@ -101,26 +288,31 @@ if test "$ac_cv_sizeof_unsigned_short" = "0" \
     AC_MSG_WARN([Hmmm, something is wrong with the sizes - using defaults]);
 fi
 
-dnl Do we have any 64-bit data types?
+# Do we have any 64-bit data types?
 if test "$ac_cv_sizeof_unsigned_int" != "8" \
    && test "$ac_cv_sizeof_unsigned_long" != "8" \
    && test "$ac_cv_sizeof_unsigned_long_long" != "8" \
    && test "$ac_cv_sizeof_uint64_t" != "8"; then
     AC_MSG_WARN([No 64-bit types.  Disabling TIGER/192, SHA-384, and SHA-512])
 else
-  available_digests="$available_digests sha512 tiger"
+  available_digests="$available_digests $available_digests_64"
 fi
 
-dnl If not specified otherwise, all algorithms will be included.
+# If not specified otherwise, all available algorithms will be
+# included.
 default_ciphers="$available_ciphers"
 default_pubkey_ciphers="$available_pubkey_ciphers"
 default_digests="$available_digests"
 
-dnl Support for the --enable-ciphers switch.
+############################
+## Command line switches. ##
+############################
+
+# Implementation of the --enable-ciphers switch.
 AC_ARG_ENABLE(ciphers,
              AC_HELP_STRING([--enable-ciphers=ciphers],
                             [select the symmetric ciphers to include]),
-             [enabled_ciphers=$(echo $enableval | tr , ' ' | tr '[A-Z]' '[a-z]')],
+             [enabled_ciphers=`echo $enableval | tr , ' ' | tr '[A-Z]' '[a-z]'`],
              [enabled_ciphers=""])
 if test "x$enabled_ciphers" = "x" \
    -o "$enabled_ciphers" = "yes"  \
@@ -136,15 +328,11 @@ for cipher in $enabled_ciphers; do
 done
 AC_MSG_RESULT([$enabled_ciphers])
 
-AM_PATH_GPG_ERROR(0.1)
-AC_DEFINE(GPG_ERR_SOURCE_DEFAULT, GPG_ERR_SOURCE_GCRYPT,
-          [The default error source for libgcrypt.])
-
-dnl Support for the --enable-pubkey-ciphers switch.
+# Implementation of the --enable-pubkey-ciphers switch.
 AC_ARG_ENABLE(pubkey-ciphers,
              AC_HELP_STRING([--enable-pubkey-ciphers=ciphers],
                             [select the public-key ciphers to include]),
-             [enabled_pubkey_ciphers=$(echo $enableval | tr , ' ' | tr '[A-Z]' '[a-z]')],
+             [enabled_pubkey_ciphers=`echo $enableval | tr , ' ' | tr '[A-Z]' '[a-z]'`],
              [enabled_pubkey_ciphers=""])
 if test "x$enabled_pubkey_ciphers" = "x" \
    -o "$enabled_pubkey_ciphers" = "yes"  \
@@ -160,11 +348,11 @@ for cipher in $enabled_pubkey_ciphers; do
 done
 AC_MSG_RESULT([$enabled_pubkey_ciphers])
 
-dnl Support for the --enable-digests switch.
+# Implementation of the --enable-digests switch.
 AC_ARG_ENABLE(digests,
              AC_HELP_STRING([--enable-digests=digests],
                             [select the message digests to include]),
-             [enabled_digests=$(echo $enableval | tr , ' ' | tr '[A-Z]' '[a-z]')],
+             [enabled_digests=`echo $enableval | tr , ' ' | tr '[A-Z]' '[a-z]'`],
              [enabled_digests=""])
 if test "x$enabled_digests" = "x" \
    -o "$enabled_digests" = "yes"  \
@@ -180,98 +368,32 @@ for digest in $enabled_digests; do
 done
 AC_MSG_RESULT([$enabled_digests])
 
-dnl Define automake conditionals and config.h symbols depending on the
-dnl selected ciphers, pubkey-ciphers and digests.
-
-LIST_MEMBER(arcfour, $enabled_ciphers)
-AM_CONDITIONAL(USE_ARCFOUR, test "$found" = "1")
-AC_DEFINE_UNQUOTED(USE_ARCFOUR, $found, [Defined if this module should be included])
-LIST_MEMBER(blowfish, $enabled_ciphers)
-AM_CONDITIONAL(USE_BLOWFISH, test "$found" = "1")
-AC_DEFINE_UNQUOTED(USE_BLOWFISH, $found, [Defined if this module should be included])
-LIST_MEMBER(cast5, $enabled_ciphers)
-AM_CONDITIONAL(USE_CAST5, test "$found" = "1")
-AC_DEFINE_UNQUOTED(USE_CAST5, $found, [Defined if this module should be included])
-LIST_MEMBER(des, $enabled_ciphers)
-AM_CONDITIONAL(USE_DES, test "$found" = "1")
-AC_DEFINE_UNQUOTED(USE_DES, $found, [Defined if this module should be included])
-LIST_MEMBER(aes, $enabled_ciphers)
-AM_CONDITIONAL(USE_AES, test "$found" = "1")
-AC_DEFINE_UNQUOTED(USE_AES, $found, [Defined if this module should be included])
-LIST_MEMBER(twofish, $enabled_ciphers)
-AM_CONDITIONAL(USE_TWOFISH, test "$found" = "1")
-AC_DEFINE_UNQUOTED(USE_TWOFISH, $found, [Defined if this module should be included])
-LIST_MEMBER(serpent, $enabled_ciphers)
-AM_CONDITIONAL(USE_SERPENT, test "$found" = "1")
-AC_DEFINE_UNQUOTED(USE_SERPENT, $found, [Defined if this module should be included])
-
-LIST_MEMBER(dsa, $enabled_pubkey_ciphers)
-AM_CONDITIONAL(USE_DSA, test "$found" = "1")
-AC_DEFINE_UNQUOTED(USE_DSA, $found, [Defined if this module should be included])
-LIST_MEMBER(rsa, $enabled_pubkey_ciphers)
-AM_CONDITIONAL(USE_RSA, test "$found" = "1")
-AC_DEFINE_UNQUOTED(USE_RSA, $found, [Defined if this module should be included])
-LIST_MEMBER(elgamal, $enabled_pubkey_ciphers)
-AM_CONDITIONAL(USE_ELGAMAL, test "$found" = "1")
-AC_DEFINE_UNQUOTED(USE_ELGAMAL, $found, [Defined if this module should be included])
-
-LIST_MEMBER(crc, $enabled_digests)
-AM_CONDITIONAL(USE_CRC, test "$found" = "1")
-AC_DEFINE_UNQUOTED(USE_CRC, $found, [Defined if this module should be included])
-LIST_MEMBER(md4, $enabled_digests)
-AM_CONDITIONAL(USE_MD4, test "$found" = "1")
-AC_DEFINE_UNQUOTED(USE_MD4, $found, [Defined if this module should be included])
-LIST_MEMBER(md5, $enabled_digests)
-AM_CONDITIONAL(USE_MD5, test "$found" = "1")
-AC_DEFINE_UNQUOTED(USE_MD5, $found, [Defined if this module should be included])
-LIST_MEMBER(sha1, $enabled_digests)
-AM_CONDITIONAL(USE_SHA1, test "$found" = "1")
-AC_DEFINE_UNQUOTED(USE_SHA1, $found, [Defined if this module should be included])
-LIST_MEMBER(sha256, $enabled_digests)
-AM_CONDITIONAL(USE_SHA256, test "$found" = "1")
-AC_DEFINE_UNQUOTED(USE_SHA256, $found, [Defined if this module should be included])
-LIST_MEMBER(sha512, $enabled_digests)
-AM_CONDITIONAL(USE_SHA512, test "$found" = "1")
-AC_DEFINE_UNQUOTED(USE_SHA512, $found, [Defined if this module should be included])
-LIST_MEMBER(tiger, $enabled_digests)
-AM_CONDITIONAL(USE_TIGER, test "$found" = "1")
-AC_DEFINE_UNQUOTED(USE_TIGER, $found, [Defined if this module should be included])
-
-# rmd160 should be included always.
-AM_CONDITIONAL(USE_RMD160, true)
-AC_DEFINE_UNQUOTED(USE_RMD160, 1, [Defined if this module should be included])
-
-
-AC_SUBST(LIBGCRYPT_CIPHERS, $enabled_ciphers)
-AC_SUBST(LIBGCRYPT_PUBKEY_CIPHERS, $enabled_pubkey_ciphers)
-AC_SUBST(LIBGCRYPT_DIGESTS, $enabled_digests)
-
-dnl
-dnl  Check for random module options
-dnl
-
+# Implementation of the --enable-random switch.
+AC_ARG_ENABLE(random,
+             AC_HELP_STRING([--enable-random=name],
+                            [select which random number generator to use]),
+             [random=`echo $enableval | tr '[A-Z]' '[a-z]'`],
+             [])
+if test "x$random" = "x" -o "$random" = "yes" -o "$random" = "no"; then
+    random=default
+fi
 AC_MSG_CHECKING([which random module to use])
-AC_ARG_ENABLE(static-rnd,
-    [  --enable-static-rnd=[egd|unix|linux|default|auto]  ],
-[use_static_rnd=$enableval], [use_static_rnd=default] )
-
-if test "$use_static_rnd" = no; then
-    use_static_rnd=default
+if test "$random" != "default" -a "$random" != "auto"; then
+    LIST_MEMBER($random, $available_random_modules)
+    if test "$found" = "0"; then
+       AC_MSG_ERROR([unsupported random module specified])
+    fi
 fi
+AC_MSG_RESULT($random)
 
-case "$use_static_rnd" in
-    egd | linux | unix | default )
-      AC_MSG_RESULT($use_static_rnd)
-      ;;
-    auto )
-      AC_MSG_RESULT(automagically selected at runtime)
-      ;;
-    * )
-      AC_MSG_RESULT(invalid argument)
-      AC_MSG_ERROR(there is no random module rnd$use_static_rnd)
-      ;;
-esac
+# Implementation of the --disable-dev-random switch.
+AC_MSG_CHECKING([whether use of /dev/random is requested])
+AC_ARG_ENABLE(dev-random,
+[  --disable-dev-random    disable the use of dev random],
+    try_dev_random=$enableval, try_dev_random=yes)
+AC_MSG_RESULT($try_dev_random)
 
+# Implementation of the --with-egd-socket switch.
 AC_ARG_WITH(egd-socket,
     [  --with-egd-socket=NAME  Use NAME for the EGD socket)],
             egd_socket_name="$withval", egd_socket_name="" )
@@ -279,28 +401,16 @@ 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])
 
-
-
-dnl
-dnl See whether the user wants to disable checking for /dev/random
-
-AC_MSG_CHECKING([whether use of /dev/random is requested])
-AC_ARG_ENABLE(dev-random,
-[  --disable-dev-random    disable the use of dev random],
-    try_dev_random=$enableval, try_dev_random=yes)
-AC_MSG_RESULT($try_dev_random)
-
-
-dnl
-dnl  Check other options
-dnl
-
+# Implementation of --disable-asm.
 AC_MSG_CHECKING([whether assembler modules are requested])
-AC_ARG_ENABLE(asm,
-[  --disable-asm           do not use assembler modules],
-     try_asm_modules=$enableval, try_asm_modules=yes)
+AC_ARG_ENABLE([asm],
+              AC_HELP_STRING([--disable-asm],
+                            [Disable assembler modules]),
+              [try_asm_modules=$enableval],
+              [try_asm_modules=yes])
 AC_MSG_RESULT($try_asm_modules)
 
+# Implementation of the --enable-m-guard switch.
 AC_MSG_CHECKING([whether memory guard is requested])
 AC_ARG_ENABLE(m-guard,
     [  --enable-m-guard        enable memory guard facility],
@@ -310,147 +420,28 @@ if test "$use_m_guard" = yes ; then
     AC_DEFINE(M_GUARD,1,[Define to use the (obsolete) malloc guarding feature])
 fi
 
-dnl
-dnl Check whether we want to use Linux capabilities
-dnl
+# Implementation of the --with-capabilities switch.
+# Check whether we want to use Linux capabilities
 AC_MSG_CHECKING([whether use of capabilities is requested])
 AC_ARG_WITH(capabilities,
     [  --with-capabilities     use linux capabilities [default=no]],
 [use_capabilities="$withval"],[use_capabilities=no])
 AC_MSG_RESULT($use_capabilities)
 
+AC_DEFINE_UNQUOTED(PRINTABLE_OS_NAME, "$PRINTABLE_OS_NAME",
+                   [A human readable text with the name of the OS])
 
-AM_MAINTAINER_MODE
-
-dnl Checks for programs.
-
-dnl
-dnl Setup some stuff depending on host/target.
-dnl
-case "${target}" in
-    *-*-mingw32*)
-        # special stuff for Windoze NT
-        disallowed_modules="rndunix rndlinux rndegd"
-        ;;
-    *)
-        disallowed_modules="rndw32"
-       ;;
-esac
-
-AC_PROG_MAKE_SET
-AM_SANITY_CHECK
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-dnl AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_PROG_CC
-AC_PROG_CPP
-AM_PROG_AS
-AC_ISC_POSIX
-AC_PROG_INSTALL
-AC_PROG_AWK
-GPH_PROG_DB2ANY
-
-AM_PROG_LIBTOOL
-
-
-MPI_OPT_FLAGS=""
-
-
-try_gettext=no
-case "${target}" in
-    *-*-mingw32*)
-        # special stuff for Windoze NT
-        ac_cv_have_dev_random=no
-        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 )
-        # OS/2 with the EMX environment
-        ac_cv_have_dev_random=no
-        AC_DEFINE(HAVE_DRIVE_LETTERS)
-        AC_DEFINE(HAVE_DOSISH_SYSTEM)
-        try_gettext="no"
-        ;;
-
-    i?86-*-msdosdjgpp*)
-        # DOS with the DJGPP environment
-        ac_cv_have_dev_random=no
-        AC_DEFINE(HAVE_DRIVE_LETTERS)
-        AC_DEFINE(HAVE_DOSISH_SYSTEM)
-        try_gettext="no"
-        ;;
-
-    *-*-freebsd*)
-       # FreeBSD
-       CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-       LDFLAGS="$LDFLAGS -L/usr/local/lib"
-       ;;
-
-    *-*-hpux*)
-        if test -z "$GCC" ; then
-            CFLAGS="$CFLAGS -Ae -D_HPUX_SOURCE"
-        fi
-        ;;
-    *-dec-osf4*)
-        if test -z "$GCC" ; then
-            # Suppress all warnings
-            # to get rid of the unsigned/signed char mismatch warnings.
-            CFLAGS="$CFLAGS -w"
-        fi
-        ;;
-    m68k-atari-mint)
-        ;;
-    *)
-       ;;
-esac
-
-AC_SUBST(MPI_OPT_FLAGS)
-GNUPG_SYS_SYMBOL_UNDERSCORE
-GNUPG_CHECK_PIC
-#GNUPG_CHECK_EXPORTDYNAMIC
-#if test "$NO_PIC" = yes; then
-#    try_dynload=no
-#fi
-
-# For now we hardcode the use of version scripts.  It would be better
-# to write a text for this or even implement this within libtool
+# For some systems we know that we have ld_version scripts.  
+# Use it then as default.
 have_ld_version_script=no
-case "${target}" in
-    *-*-mingw32*)
-        PRINTABLE_OS_NAME="MingW32"
-        ;;
-    i?86-emx-os2 | i?86-*-os2*emx )
-        PRINTABLE_OS_NAME="OS/2"
+case "${host}" in
+    *-*-linux*)
+       have_ld_version_script=yes
         ;;
-    i?86-*-msdosdjgpp*)
-        PRINTABLE_OS_NAME="MSDOS/DJGPP"
-        try_dynload=no
-        ;;
-    *-linux*)
-        PRINTABLE_OS_NAME="GNU/Linux"
-        have_ld_version_script=yes
-        ;;
-dnl let that after linux to avoid gnu-linux problems
-    *-gnu*)
-        PRINTABLE_OS_NAME="GNU/Hurd"
-        have_ld_version_script=yes
-        ;;
-    *)
-        PRINTABLE_OS_NAME=`uname -s || echo "Unknown"`
+    *-*-gnu*)
+       have_ld_version_script=yes
         ;;
 esac
-AC_DEFINE_UNQUOTED(PRINTABLE_OS_NAME, "$PRINTABLE_OS_NAME",
-                   [A human readable text with the name of the OS])
 AC_ARG_ENABLE([ld-version-script],
               AC_HELP_STRING([--enable-ld-version-script],
                              [enable/disable use of linker version script.
@@ -459,122 +450,129 @@ AC_ARG_ENABLE([ld-version-script],
               [ : ] )
 AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
 
-
-dnl  Fixme: Are these the best flags for OpenBSD????
-case "${target}" in
-    *-openbsd* | *-netbsd*)
-        NAME_OF_DEV_RANDOM="/dev/srandom"
-        NAME_OF_DEV_URANDOM="/dev/urandom"
-#       DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x"
-        ;;
-
-    *-solaris* | *-irix* | *-dec-osf* )
-        NAME_OF_DEV_RANDOM="/dev/random"
-        NAME_OF_DEV_URANDOM="/dev/random"
-#       DYNLINK_MOD_CFLAGS="-shared $CFLAGS_PIC"
-        ;;
-
-    *)
-        NAME_OF_DEV_RANDOM="/dev/random"
-        NAME_OF_DEV_URANDOM="/dev/urandom"
-        # -shared is a gcc-ism.  Find pic flags from GNUPG_CHECK_PIC.
-#        if test -n "$GCC" ; then
-#           DYNLINK_MOD_CFLAGS="-shared $CFLAGS_PIC"                            
-#        else
-#           DYNLINK_MOD_CFLAGS="$CFLAGS_PIC"
-#        fi
-        ;;
-esac
 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)
 
+###############################
+#### Checks for libraries. ####
+###############################
 
-dnl Checks for libraries.
-
-USE_NLS=no
-USE_INCLUDED_LIBINTL=no
-AC_SUBST(USE_NLS)
-AC_SUBST(USE_INCLUDED_LIBINTL)
+#
+# gpg-error is required.
+#
+AM_PATH_GPG_ERROR("$NEED_GPG_ERROR_VERSION")
+if test "x$GPG_ERROR_LIBS" = "x"; then
+  AC_MSG_ERROR([libgpg-error is needed.
+                See ftp://ftp.gnupg.org/gcrypt/libgpg-error/ .])
+fi
 
+AC_DEFINE(GPG_ERR_SOURCE_DEFAULT, GPG_ERR_SOURCE_GCRYPT,
+          [The default error source for libgcrypt.])
 
-dnl Solaris needs -lsocket and -lnsl. Unisys system includes
-dnl gethostbyname in libsocket but needs libnsl for socket.
-AC_CHECK_LIB(nsl, gethostbyname)
-AC_CHECK_LIB(socket, socket, ac_need_libsocket=1, ac_try_nsl=1)
-if test x$ac_need_libsocket = x1; then
-    LIBS="$LIBS -lsocket"
+#
+# Check whether the GNU Pth library is available.  We require this 
+# to build the optional gcryptrnd program.
+#
+AC_ARG_WITH(pth-prefix,
+            AC_HELP_STRING([--with-pth-prefix=PFX],
+                           [prefix where GNU Pth is installed (optional)]),
+     pth_config_prefix="$withval", pth_config_prefix="")
+if test x$pth_config_prefix != x ; then
+   PTH_CONFIG="$pth_config_prefix/bin/pth-config"
 fi
-if test x$ac_try_nsl = x1; then
-    AC_CHECK_LIB(nsl, gethostbyname, ac_need_libnsl=1)
-    if test x$ac_need_libnsl = x1
-    then
-        LIBS="$LIBS -lnsl"
-    fi
+AC_PATH_PROG(PTH_CONFIG, pth-config, no)
+if test "$PTH_CONFIG" = "no"; then
+    AC_MSG_WARN([[
+***
+*** To build the Libgcrypt's random humber daemon
+*** we need the support of the GNU Portable Threads Library.
+*** Download it from ftp://ftp.gnu.org/gnu/pth/
+*** On a Debian GNU/Linux system you might want to try 
+***   apt-get install libpth-dev
+***]])
+ else
+  GNUPG_PTH_VERSION_CHECK([1.3.7])
+  if test $have_pth = yes; then      
+     PTH_CFLAGS=`$PTH_CONFIG --cflags`
+     PTH_LIBS=`$PTH_CONFIG --ldflags`
+     PTH_LIBS="$PTH_LIBS `$PTH_CONFIG --libs --all`"
+     AC_DEFINE(USE_GNU_PTH, 1,
+              [Defined if the GNU Portable Thread Library should be used])
+     AC_DEFINE(HAVE_PTH, 1,
+              [Defined if the GNU Pth is available])
+  fi
 fi
+AC_SUBST(PTH_CFLAGS)
+AC_SUBST(PTH_LIBS)
 
 
-dnl Checks for header files.
+# Solaris needs -lsocket and -lnsl. Unisys system includes
+# gethostbyname in libsocket but needs libnsl for socket.
+AC_SEARCH_LIBS(setsockopt, [socket], ,
+       [AC_SEARCH_LIBS(setsockopt, [socket], , , [-lnsl])])
+AC_SEARCH_LIBS(setsockopt, [nsl])
+
+##################################
+#### Checks for header files. ####
+##################################
+
 AC_HEADER_STDC
 AC_CHECK_HEADERS(unistd.h sys/select.h)
 
+##########################################
+#### Checks for typedefs, structures, ####
+####  and compiler characteristics.   ####
+##########################################
 
-dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_C_INLINE
 AC_TYPE_SIZE_T
 AC_TYPE_SIGNAL
 AC_DECL_SYS_SIGLIST
 
-GNUPG_CHECK_ENDIAN
-
-
 GNUPG_CHECK_TYPEDEF(byte, HAVE_BYTE_TYPEDEF)
 GNUPG_CHECK_TYPEDEF(ushort, HAVE_USHORT_TYPEDEF)
 GNUPG_CHECK_TYPEDEF(ulong, HAVE_ULONG_TYPEDEF)
 GNUPG_CHECK_TYPEDEF(u16, HAVE_U16_TYPEDEF)
 GNUPG_CHECK_TYPEDEF(u32, HAVE_U32_TYPEDEF)
 
-#
-# Checks for library functions.
-#
+gl_TYPE_SOCKLEN_T
+case "${host}" in
+  *-*-mingw32*)
+    # socklen_t may or may not be defined depending on what headers
+    # are included.  To be safe we use int as this is the actual type.
+    FALLBACK_SOCKLEN_T="typedef int gcry_socklen_t;"
+    ;;
+  *)
+    if test ".$gl_cv_socklen_t_equiv" = "."; then
+      FALLBACK_SOCKLEN_T="typedef socklen_t gcry_socklen_t;"
+    else
+      FALLBACK_SOCKLEN_T="typedef ${gl_cv_socklen_t_equiv} gcry_socklen_t;"
+    fi
+esac
+AC_SUBST(FALLBACK_SOCKLEN_T)
+
+
+
+#######################################
+#### Checks for library functions. ####
+#######################################
+
 AC_FUNC_VPRINTF
-dnl We have replacements for these in src/missing-string.c
+# We have replacements for these in src/missing-string.c
 AC_CHECK_FUNCS(stpcpy strcasecmp)
-dnl We have replacements for these in src/g10lib.h
+# We have replacements for these in src/g10lib.h
 AC_CHECK_FUNCS(strtoul memmove stricmp atexit raise)
-dnl Other checks
+# Other checks
 AC_CHECK_FUNCS(strerror rand mmap getpagesize waitpid wait4)
 AC_CHECK_FUNCS(gettimeofday getrusage gethrtime clock_gettime)
+AC_CHECK_FUNCS(fcntl ftruncate)
 
 GNUPG_CHECK_MLOCK
-GNUPG_FUNC_MKDIR_TAKES_ONE_ARG
-
-# 
-# The ATH systems needs to know whether pth or pthreads are available.
-# 
-have_pth=no
-have_pthread=no
-AC_CHECK_LIB(pth,pth_version,have_pth=yes)
-if test "$have_pth" = yes; then
-  AC_DEFINE(HAVE_PTH, ,[Define if we have Pth.])
-fi
-AC_CHECK_LIB(pthread,pthread_create,have_pthread=yes)
-if test "$have_pthread" != yes; then
-  AC_CHECK_LIB(c,pthread_create,have_pthread=yes)
-fi
-if test "$have_pthread" = yes; then
-  AC_DEFINE(HAVE_PTHREAD, ,[Define if we have pthread.])
-fi
-AM_CONDITIONAL(HAVE_PTH, test "$have_pth" = "yes")
-AM_CONDITIONAL(HAVE_PTHREAD, test "$have_pthread" = "yes")
-
 
-#
-# Check whether we can use Linux capabilities as requested
-#
+# Check whether we can use Linux capabilities as requested.
 if test "$use_capabilities" = "yes" ; then
 use_capabilities=no
 AC_CHECK_HEADERS(sys/capability.h)
@@ -601,16 +599,7 @@ if test "$use_capabilities" = "no" ; then
 fi
 fi
 
-
-GNUPG_CHECK_IPC
-if test "$ac_cv_header_sys_shm_h" = "yes"; then
-  AC_DEFINE(USE_SHM_COPROCESSING,1,
-            [define if the shared memory interface should be made available])
-fi
-
-dnl
-dnl check whether we have a random device
-dnl
+# Check whether a random device is available.
 if test "$try_dev_random" = yes ; then
     AC_CACHE_CHECK(for random device, ac_cv_have_dev_random,
     [if test -r "$NAME_OF_DEV_RANDOM" && test -r "$NAME_OF_DEV_URANDOM" ; then
@@ -625,114 +614,39 @@ else
     AC_MSG_RESULT(has been disabled)
 fi
 
-#dnl
-#dnl and whether this device supports ioctl
-#dnl (Note, that we should do a real test here)
-#dnl
-#if test "$ac_cv_have_dev_random" = yes ; then
-#    AC_CHECK_HEADERS(linux/random.h)
-#    AC_CACHE_CHECK(for random device ioctl, ac_cv_have_dev_random_ioctl,
-#      [ if test "$ac_cv_header_linux_random_h" = yes ; then
-#          ac_cv_have_dev_random_ioctl=yes;
-#        else
-#          ac_cv_have_dev_random_ioctl=no;
-#        fi
-#      ])
-#    if test "$ac_cv_have_dev_random_ioctl" = yes; then
-#        AC_DEFINE(HAVE_DEV_RANDOM_IOCTL,1,
-#                  [defined if the random device supports some IOCTLs])
-#    fi
-#fi
-#
+# Figure out the random modules for this configuration.
+if test "$random" = "default"; then
 
-dnl
-dnl Figure out the random modules that are available for this
-dnl configuration.
-dnl
-print_egd_notice=no
-random_modules=""
-if test "$use_static_rnd" = default; then
-
-     # Figure out the default random module.
-     if test "$ac_cv_have_dev_random" = yes; then
-        random_modules="rndlinux"
-     else
-         case "${target}" in
-            *-*-mingw32*|*-*-cygwin*)
-                random_modules="rndw32"
-                ;;
-            i?86-emx-os2|i?86-*-os2*emx)
-                random_modules="rndos2"
-                ;;
-            m68k-atari-mint)
-                random_modules="rndatari"
-                ;;
-            i?86-*-msdosdjgpp*)
-                :
-                ;;
-            *)
-                random_modules="rndlinux rndegd rndunix"
-                AC_DEFINE(USE_ALL_RANDOM_MODULES, 1, 
-                          [Allow to select random modules at runtime.])
-                ;;
-         esac
-     fi
+    # Select default value.
+    if test "$ac_cv_have_dev_random" = yes; then
+        # Try Linuxish random device.
+        random_modules="linux"
+    else
+        case "${target}" in
+        *-*-mingw32*|*-*-cygwin*)
+          # Windows random device.
+          random_modules="w32"
+          ;;
+        *)
+          # Build everything, allow to select at runtime.
+          random_modules="$auto_random_modules"
+          ;;
+        esac    
+    fi
 else
-     if test "$use_static_rnd" = auto; then
-          random_modules="rndlinux rndegd rndunix"
-          AC_DEFINE(USE_ALL_RANDOM_MODULES, 1)
-     else
-          random_modules="rnd$use_static_rnd";
-     fi
-fi
-
-if test -z "$random_modules"; then
-   AC_MSG_ERROR(no random module available)
-fi
-
-
-dnl Filter out the modules contained in `disallowed_modules'.
-random_modules_tmp=$random_modules
-random_modules=""
-for rndmod in $random_modules_tmp; do
-    LIST_MEMBER($rndmod, $disallowed_modules)
-    if test "$found" = "0"; then
-       random_modules="$random_modules $rndmod"
+    if test "$random" = "auto"; then
+        # Build everything, allow to select at runtime.
+        random_modules="$auto_random_modules"
+    else
+        random_modules="$random"
     fi
-done
-
-dnl Define conditionals and config.h symbols depending on the enabled
-dnl random modules.
-
-LIST_MEMBER(rndlinux, $random_modules)
-AM_CONDITIONAL(USE_RNDLINUX, test "$found" = "1")
-AC_DEFINE_UNQUOTED(USE_RNDLINUX, $found, [Defined if the /dev/random based RNG should be used.])
-
-LIST_MEMBER(rndunix, $random_modules)
-AM_CONDITIONAL(USE_RNDUNIX, test "$found" = "1")
-AC_DEFINE_UNQUOTED(USE_RNDUNIX, $found, [Defined if the default Unix RNG should be used.])
-if test "$found" = "1"; then
-   print_egd_notice=yes
-fi
-
-LIST_MEMBER(rndegd, $random_modules)
-AM_CONDITIONAL(USE_RNDEGD, test "$found" = "1")
-AC_DEFINE_UNQUOTED(USE_RNDEGD, $found, [Defined if the EGD based RNG should be used.])
-if test "$found" = "1"; then
-   EGDLIBS=$NETLIBS
-   AC_SUBST(EGDLIBS)
 fi
 
-LIST_MEMBER(rndw32, $random_modules)
-AM_CONDITIONAL(USE_RNDW32, test "$found" = "1")
-AC_DEFINE_UNQUOTED(USE_RNDW32, $found, [Defined if the Windows specific RNG should be used.])
-
-AC_MSG_RESULT()
-
 
 #
-# setup assembler stuff
+# Setup assembler stuff.
 #
+GNUPG_SYS_SYMBOL_UNDERSCORE()
 AC_MSG_CHECKING(for mpi assembler functions)
 if test -f $srcdir/mpi/config.links ; then
     . $srcdir/mpi/config.links
@@ -758,38 +672,12 @@ AC_SUBST(MPI_MOD_LIST_O)
 MPI_SFLAGS="$ac_cv_mpi_sflags"
 AC_SUBST(MPI_SFLAGS)
 
-# [not used anymore]
-## Set the condtionals for the assembler modules
-## Fixme: We should put this into acinclude and write a script
-##        which can be run to update this list and the mpi/Makefile
-#AM_CONDITIONAL(MPI_MOD_ASM_MPIH_ADD1, test "$mpi_mod_asm_mpih_add1" = yes )
-#AM_CONDITIONAL(MPI_MOD_ASM_MPIH_SUB1, test "$mpi_mod_asm_mpih_sub1" = yes )
-#AM_CONDITIONAL(MPI_MOD_ASM_MPIH_MUL1, test "$mpi_mod_asm_mpih_mul1" = yes )
-#AM_CONDITIONAL(MPI_MOD_ASM_MPIH_MUL2, test "$mpi_mod_asm_mpih_mul2" = yes )
-#AM_CONDITIONAL(MPI_MOD_ASM_MPIH_MUL3, test "$mpi_mod_asm_mpih_mul3" = yes )
-#AM_CONDITIONAL(MPI_MOD_ASM_MPIH_LSHIFT, test "$mpi_mod_asm_mpih_lshift" = yes )
-#AM_CONDITIONAL(MPI_MOD_ASM_MPIH_RSHIFT, test "$mpi_mod_asm_mpih_rshift" = yes )
-#AM_CONDITIONAL(MPI_MOD_ASM_UDIV, test "$mpi_mod_asm_udiv" = yes )
-#AM_CONDITIONAL(MPI_MOD_ASM_UDIV_QRNND, test "$mpi_mod_asm_udiv_qrnnd" = yes )
-## And the corresponding conditionals for C
-#AM_CONDITIONAL(MPI_MOD_C_MPIH_ADD1, test "$mpi_mod_c_mpih_add1" = yes )
-#AM_CONDITIONAL(MPI_MOD_C_MPIH_SUB1, test "$mpi_mod_c_mpih_sub1" = yes )
-#AM_CONDITIONAL(MPI_MOD_C_MPIH_MUL1, test "$mpi_mod_c_mpih_mul1" = yes )
-#AM_CONDITIONAL(MPI_MOD_C_MPIH_MUL2, test "$mpi_mod_c_mpih_mul2" = yes )
-#AM_CONDITIONAL(MPI_MOD_C_MPIH_MUL3, test "$mpi_mod_c_mpih_mul3" = yes )
-#AM_CONDITIONAL(MPI_MOD_C_MPIH_LSHIFT, test "$mpi_mod_c_mpih_lshift" = yes )
-#AM_CONDITIONAL(MPI_MOD_C_MPIH_RSHIFT, test "$mpi_mod_c_mpih_rshift" = yes )
-#AM_CONDITIONAL(MPI_MOD_C_UDIV, test "$mpi_mod_c_udiv" = yes )
-#AM_CONDITIONAL(MPI_MOD_C_UDIV_QRNND, test "$mpi_mod_c_udiv_qrnnd" = yes )
-#
-
-
 # Allow users to append something to the version string without
 # flagging it as development version.  The user version part is
 # considered everything after a dash.
-changequote(,)dnl
+changequote(,)#
 tmp_pat='[a-zA-Z]'
-changequote([,])dnl
+changequote([,])#
 if echo "$VERSION" | sed 's/-.*//' | grep "$tmp_pat" >/dev/null ; then
     AC_DEFINE(IS_DEVELOPMENT_VERSION,1,
               [Defined if this is not a regular release])
@@ -797,53 +685,53 @@ fi
 
 AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes)
 
-GNUPG_CHECK_GNUMAKE
+
+# This is handy for debugging so the compiler doesn't rearrange
+# things and eliminate variables.
+AC_ARG_ENABLE(optimization,
+       AC_HELP_STRING([--disable-optimization],
+                     [disable compiler optimization]),
+                      [if test $enableval = no ; then
+                         CFLAGS=`echo $CFLAGS | sed 's/-O[[0-9]]//'`
+                       fi])
+
+AC_ARG_ENABLE(gcc-warnings,
+             AC_HELP_STRING([--enable-gcc-warnings],
+                            [enable more verbose gcc warnings]),
+             [more_gcc_warnings="$enableval"],
+             [more_gcc_warnings="no"])
 
 if test "$GCC" = yes; then
-    if test "$MAINTAINER_MODE" = "yes"; then
+    if test "$USE_MAINTAINER_MODE" = "yes" ||
+       test "$more_gcc_warnings" = "yes"; then
         CFLAGS="$CFLAGS -Wall -Wcast-align -Wshadow -Wstrict-prototypes"
+        if test "$more_gcc_warnings" = "yes"; then
+            CFLAGS="$CFLAGS -W -Wextra -Wpointer-arith -Wbad-function-cast"
+            CFLAGS="$CFLAGS -Wwrite-strings"
+            CFLAGS="$CFLAGS -Wdeclaration-after-statement"
+            CFLAGS="$CFLAGS -Wno-missing-field-initializers"
+            CFLAGS="$CFLAGS -Wno-sign-compare"
+            # Note: We don't use -Wunreachable-code because this gives
+            # warnings for all asserts and many inline functions like
+            # gpg_error (gcc 4.1.2 20060928).
+        fi
     else
         CFLAGS="$CFLAGS -Wall"
     fi
 fi
 
-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)
+# Check whether as(1) supports a noeexecstack feature.  This test
+# includes an override option.
+CL_AS_NOEXECSTACK
 
+
+AC_SUBST(LIBGCRYPT_CONFIG_API_VERSION)
 AC_SUBST(LIBGCRYPT_CONFIG_LIBS)
 AC_SUBST(LIBGCRYPT_CONFIG_CFLAGS)
+AC_SUBST(LIBGCRYPT_THREAD_MODULES)
 
-AC_CONFIG_COMMANDS([gcrypt-defs],[[
+AC_CONFIG_COMMANDS([gcrypt-conf],[[
 chmod +x src/libgcrypt-config
-cat >gcrypt-defs.tmp <<G10EOF
-/* Generated automatically by configure */
-#ifdef HAVE_DRIVE_LETTERS
-  #define GNUPG_LOCALEDIR "c:/lib/gnupg/locale"
-  #define GNUPG_LIBDIR  "c:/lib/gnupg"
-  #define GNUPG_DATADIR "c:/lib/gnupg"
-  #define GNUPG_HOMEDIR "c:/gnupg-test"
-#else
-  #define GNUPG_LOCALEDIR "${prefix}/${DATADIRNAME}/locale"
-  #define GNUPG_LIBDIR  "${libdir}/gnupg"
-  #define GNUPG_DATADIR "${datadir}/gnupg"
-  #ifdef __VMS
-    #define GNUPG_HOMEDIR "/SYS\$LOGIN/gnupg" 
-  #else
-    #define GNUPG_HOMEDIR "~/.gnupg-test" 
-  #endif
-#endif
-G10EOF
-if cmp -s gcrypt-defs.h gcrypt-defs.tmp 2>/dev/null; then
-    echo "gcrypt-defs.h is unchanged"
-    rm -f gcrypt-defs.tmp
-else
-    rm -f gcrypt-defs.h
-    mv gcrypt-defs.tmp gcrypt-defs.h
-    echo "gcrypt-defs.h created"
-fi
 ]],[[
 prefix=$prefix
 exec_prefix=$exec_prefix
@@ -852,14 +740,156 @@ datadir=$datadir
 DATADIRNAME=$DATADIRNAME
 ]])
 
+#####################
+#### Conclusion. ####
+#####################
+
+# Define conditional sources and config.h symbols depending on the
+# selected ciphers, pubkey-ciphers, digests and random modules.
+
+LIST_MEMBER(arcfour, $enabled_ciphers)
+test "$found" = "1" && GCRYPT_CIPHERS="$GCRYPT_CIPHERS arcfour.lo"
+AC_DEFINE_UNQUOTED(USE_ARCFOUR, $found,
+                                 [Defined if this module should be included])
+
+LIST_MEMBER(blowfish, $enabled_ciphers)
+test "$found" = "1" && GCRYPT_CIPHERS="$GCRYPT_CIPHERS blowfish.lo"
+AC_DEFINE_UNQUOTED(USE_BLOWFISH, $found,
+                                  [Defined if this module should be included])
+
+LIST_MEMBER(cast5, $enabled_ciphers)
+test "$found" = "1" && GCRYPT_CIPHERS="$GCRYPT_CIPHERS cast5.lo"
+AC_DEFINE_UNQUOTED(USE_CAST5, $found,
+                               [Defined if this module should be included])
+
+LIST_MEMBER(des, $enabled_ciphers)
+test "$found" = "1" && GCRYPT_CIPHERS="$GCRYPT_CIPHERS des.lo"
+AC_DEFINE_UNQUOTED(USE_DES, $found,
+                             [Defined if this module should be included])
+
+LIST_MEMBER(aes, $enabled_ciphers)
+test "$found" = "1" && GCRYPT_CIPHERS="$GCRYPT_CIPHERS rijndael.lo"
+AC_DEFINE_UNQUOTED(USE_AES, $found,
+                             [Defined if this module should be included])
+
+LIST_MEMBER(twofish, $enabled_ciphers)
+test "$found" = "1" && GCRYPT_CIPHERS="$GCRYPT_CIPHERS twofish.lo"
+AC_DEFINE_UNQUOTED(USE_TWOFISH, $found,
+                                 [Defined if this module should be included])
+
+LIST_MEMBER(serpent, $enabled_ciphers)
+test "$found" = "1" && GCRYPT_CIPHERS="$GCRYPT_CIPHERS serpent.lo"
+AC_DEFINE_UNQUOTED(USE_SERPENT, $found,
+                                 [Defined if this module should be included])
+
+LIST_MEMBER(rfc2268, $enabled_ciphers)
+test "$found" = "1" && GCRYPT_CIPHERS="$GCRYPT_CIPHERS rfc2268.lo"
+AC_DEFINE_UNQUOTED(USE_RFC2268, $found,
+                                 [Defined if this module should be included])
+
+LIST_MEMBER(seed, $enabled_ciphers)
+test "$found" = "1" && GCRYPT_CIPHERS="$GCRYPT_CIPHERS seed.lo"
+AC_DEFINE_UNQUOTED(USE_SEED, $found,
+                             [Defined if this module should be included])
+
+LIST_MEMBER(dsa, $enabled_pubkey_ciphers)
+test "$found" = "1" && GCRYPT_PUBKEY_CIPHERS="$GCRYPT_PUBKEY_CIPHERS dsa.lo"
+AC_DEFINE_UNQUOTED(USE_DSA, $found,
+                             [Defined if this module should be included])
+
+LIST_MEMBER(rsa, $enabled_pubkey_ciphers)
+test "$found" = "1" && GCRYPT_PUBKEY_CIPHERS="$GCRYPT_PUBKEY_CIPHERS rsa.lo"
+AC_DEFINE_UNQUOTED(USE_RSA, $found,
+                            [Defined if this module should be included])
+
+LIST_MEMBER(elgamal, $enabled_pubkey_ciphers)
+test "$found" = "1" \ 
+     && GCRYPT_PUBKEY_CIPHERS="$GCRYPT_PUBKEY_CIPHERS elgamal.lo"
+AC_DEFINE_UNQUOTED(USE_ELGAMAL, $found,
+                                [Defined if this module should be included])
+
+LIST_MEMBER(crc, $enabled_digests)
+test "$found" = "1" && GCRYPT_DIGESTS="$GCRYPT_DIGESTS crc.lo"
+AC_DEFINE_UNQUOTED(USE_CRC, $found,
+                            [Defined if this module should be included])
+
+LIST_MEMBER(md4, $enabled_digests)
+test "$found" = "1" && GCRYPT_DIGESTS="$GCRYPT_DIGESTS md4.lo"
+AC_DEFINE_UNQUOTED(USE_MD4, $found,
+                             [Defined if this module should be included])
+
+LIST_MEMBER(md5, $enabled_digests)
+test "$found" = "1" && GCRYPT_DIGESTS="$GCRYPT_DIGESTS md5.lo"
+AC_DEFINE_UNQUOTED(USE_MD5, $found,
+                             [Defined if this module should be included])
+
+LIST_MEMBER(sha256, $enabled_digests)
+test "$found" = "1" && GCRYPT_DIGESTS="$GCRYPT_DIGESTS sha256.lo"
+AC_DEFINE_UNQUOTED(USE_SHA256, $found,
+                                [Defined if this module should be included])
+
+LIST_MEMBER(sha512, $enabled_digests)
+test "$found" = "1" && GCRYPT_DIGESTS="$GCRYPT_DIGESTS sha512.lo"
+AC_DEFINE_UNQUOTED(USE_SHA512, $found,
+                                [Defined if this module should be included])
+
+LIST_MEMBER(tiger, $enabled_digests)
+test "$found" = "1" && GCRYPT_DIGESTS="$GCRYPT_DIGESTS tiger.lo"
+AC_DEFINE_UNQUOTED(USE_TIGER, $found,
+                               [Defined if this module should be included])
+
+LIST_MEMBER(whirlpool, $enabled_digests)
+test "$found" = "1" && GCRYPT_DIGESTS="$GCRYPT_DIGESTS whirlpool.lo"
+AC_DEFINE_UNQUOTED(USE_WHIRLPOOL, $found,
+                               [Defined if this module should be included])
+
+# rmd160 and sha1 should be included always.
+GCRYPT_DIGESTS="$GCRYPT_DIGESTS rmd160.lo sha1.lo"
+AC_DEFINE_UNQUOTED(USE_RMD160, 1, [Defined if this module should be included])
+AC_DEFINE_UNQUOTED(USE_SHA1, 1,   [Defined if this module should be included])
+
+LIST_MEMBER(linux, $random_modules)
+test "$found" = "1" && GCRYPT_RANDOM="$GCRYPT_RANDOM rndlinux.lo"
+AC_DEFINE_UNQUOTED(USE_RNDLINUX, $found,
+                   [Defined if the /dev/random based RNG should be used.])
+
+
+LIST_MEMBER(unix, $random_modules)
+test "$found" = "1" && GCRYPT_RANDOM="$GCRYPT_RANDOM rndunix.lo"
+AC_DEFINE_UNQUOTED(USE_RNDUNIX, $found,
+                  [Defined if the default Unix RNG should be used.])
+if test "$found" = "1"; then
+   print_egd_notice=yes
+fi
+
+LIST_MEMBER(egd, $random_modules)
+test "$found" = "1" && GCRYPT_RANDOM="$GCRYPT_RANDOM rndegd.lo"
+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"
+AC_DEFINE_UNQUOTED(USE_RNDW32, $found,
+                  [Defined if the Windows specific RNG should be used.])
+
+AC_SUBST([GCRYPT_CIPHERS])
+AC_SUBST([GCRYPT_PUBKEY_CIPHERS])
+AC_SUBST([GCRYPT_DIGESTS])
+AC_SUBST([GCRYPT_RANDOM])
+
+AC_SUBST(LIBGCRYPT_CIPHERS, $enabled_ciphers)
+AC_SUBST(LIBGCRYPT_PUBKEY_CIPHERS, $enabled_pubkey_ciphers)
+AC_SUBST(LIBGCRYPT_DIGESTS, $enabled_digests)
+
 
 AC_CONFIG_FILES([
 Makefile
+m4/Makefile
 mpi/Makefile
 cipher/Makefile
 doc/Makefile
-doc/version.sgml
 src/Makefile
+src/gcrypt.h
 src/libgcrypt-config
 tests/Makefile
 w32-dll/Makefile
@@ -901,9 +931,5 @@ if test -n "$warn"; then
 fi
 
 # Give some feedback
-echo
 echo   "                Configured for: $PRINTABLE_OS_NAME ($target)"
-if test -n "$show_extraasm"; then
-  echo "  Extra cpu specific functions:$show_extraasm"
-fi
 echo