gpgsm --verify does now work like gpg including the

[gnupg.git] / configure.in

diff --git a/configure.in b/configure.in
index 6c3b209..563e9a4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -11,73 +11,17 @@ AC_PREREQ(2.13)
 AC_INIT(g10/gpg.c)
 AC_CONFIG_AUX_DIR(scripts)
 AM_CONFIG_HEADER(config.h)
 AC_INIT(g10/gpg.c)
 AC_CONFIG_AUX_DIR(scripts)
 AM_CONFIG_HEADER(config.h)

+AC_CANONICAL_SYSTEM
+AM_INIT_AUTOMAKE(gnupg,1.1.2a)

 
 

+ALL_LINGUAS="da de eo es_ES fr id it ja nl pl pt_BR pt_PT ru sv"

 
 

-VERSION=`cat $srcdir/VERSION`
-PACKAGE=gnupg
-ALL_LINGUAS="de es_ES fr it pl pt_BR pt_PT ru"
-static_modules="sha1 md5 rmd160"
-AC_SUBST(VERSION)
-AC_SUBST(PACKAGE)
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
-
-MODULES_IN_CIPHER=`awk '/# MODULES: / { for(i=3;i<=NF;i++) print $i}' \
-                                                $srcdir/cipher/Makefile.am`
-
-dnl
-dnl  Check for random module options
-dnl
-dnl  Fixme: get the list of available modules from MODULES_IN_CIPHER
-dnl         and check against this list
-
-AC_MSG_CHECKING([which static random module to use])
-AC_ARG_ENABLE(static-rnd,
-    [  --enable-static-rnd=[egd|unix|linux|none]  ],
-[use_static_rnd=$enableval], [use_static_rnd=default] )
-
-if test "$use_static_rnd" = no; then
-    use_static_rnd=default
-fi
-
-case "$use_static_rnd" in
-    egd | linux | unix | none | default )
-      AC_MSG_RESULT($use_static_rnd)
-      ;;
-    * )
-      AC_MSG_RESULT(invalid argument)
-      AC_MSG_ERROR(there is no random module rnd$use_static_rnd)
-      ;;
-esac
-
-
-
-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)
-
+AC_PROG_AWK

 
 dnl
 dnl  Check other options
 dnl
 
 
 dnl
 dnl  Check other options
 dnl
 

-AC_MSG_CHECKING([whether use of extensions is requested])
-AC_ARG_ENABLE(dynload,
-[  --disable-dynload       disable use of extensions],
-    try_dynload=$enableval, try_dynload=yes)
-AC_MSG_RESULT($try_dynload)
-
-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_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],
 AC_MSG_CHECKING([whether memory debugging is requested])
 AC_ARG_ENABLE(m-debug,
 [  --enable-m-debug        enable debugging of memory allocation],


@@ -105,17 +49,6 @@ AC_ARG_WITH(included-zlib,
 AC_MSG_RESULT($g10_force_zlib)
 
 dnl
 AC_MSG_RESULT($g10_force_zlib)
 
 dnl

-dnl Check wether we want to compile libgcrypt
-dnl
-AC_MSG_CHECKING([whether compilation of libgcrypt is requested])
-AC_ARG_ENABLE(libgcrypt,
-    [  --enable-libgcrypt      compile the libgcrypt [default=yes]],
-[compile_libgcrypt="$enableval"],[compile_libgcrypt=no])
-AC_MSG_RESULT($compile_libgcrypt)
-AM_CONDITIONAL(COMPILE_LIBGCRYPT, test x$compile_libgcrypt = xyes)
-
-
-dnl

 dnl Check whether we want to use Linux capabilities
 dnl
 AC_MSG_CHECKING([whether use of capabilities is requested])
 dnl Check whether we want to use Linux capabilities
 dnl
 AC_MSG_CHECKING([whether use of capabilities is requested])


@@ -132,12 +65,11 @@ AM_MAINTAINER_MODE
 
 dnl Checks for programs.
 
 
 dnl Checks for programs.
 

-AC_CANONICAL_SYSTEM

 dnl
 dnl Setup some stuff depending on host/target.
 dnl
 case "${target}" in
 dnl
 dnl Setup some stuff depending on host/target.
 dnl
 case "${target}" in

-    *-*-mingw32)
+    *-*-mingw32*)

         # special stuff for Windoze NT
         # Do we need to set cross_compiling here or is it sufficient
         # to rely on AC_PROG_CC which is called later?
         # special stuff for Windoze NT
         # Do we need to set cross_compiling here or is it sufficient
         # to rely on AC_PROG_CC which is called later?


@@ -145,8 +77,10 @@ case "${target}" in
         CC="${target}-gcc"
         CPP="${target}-gcc -E"
         RANLIB="${target}-ranlib"
         CC="${target}-gcc"
         CPP="${target}-gcc -E"
         RANLIB="${target}-ranlib"

+        disallowed_modules="rndunix rndlinux rndegd"

         ;;
     *)
         ;;
     *)

+        disallowed_modules="rndw32"

        ;;
 esac
 
        ;;
 esac
 


@@ -164,29 +98,13 @@ AC_PROG_CPP
 AC_ISC_POSIX
 AC_PROG_INSTALL
 AC_PROG_AWK
 AC_ISC_POSIX
 AC_PROG_INSTALL
 AC_PROG_AWK

-AC_CHECK_PROG(DOCBOOK_TO_MAN, docbook-to-man, yes, no)
-AM_CONDITIONAL(HAVE_DOCBOOK_TO_MAN, test "$ac_cv_prog_DOCBOOK_TO_MAN" = yes)
-
-
-dnl
-dnl Build shared libraries only when compilation of libgcrypt
-dnl has been requested
-dnl
-dnl AM_DISABLE_STATIC
-dnl enable_shared="$compile_libgcrypt"
-AM_PROG_LIBTOOL
-
-
-MPI_OPT_FLAGS=""
-if test "$GCC" = yes; then
-    CFLAGS="$CFLAGS -Wall -Wcast-align -Wshadow -Wstrict-prototypes"
-fi
+GPH_PROG_DOCBOOK
+GNUPG_CHECK_FAQPROG

 
 
 try_gettext=yes
 
 
 try_gettext=yes

-try_gdbm=yes

 case "${target}" in
 case "${target}" in

-    *-*-mingw32)
+    *-*-mingw32*)

         # special stuff for Windoze NT
         ac_cv_have_dev_random=no
         AC_DEFINE(USE_ONLY_8DOT3)
         # special stuff for Windoze NT
         ac_cv_have_dev_random=no
         AC_DEFINE(USE_ONLY_8DOT3)


@@ -194,7 +112,6 @@ case "${target}" in
         AC_DEFINE(HAVE_DOSISH_SYSTEM)
         AC_DEFINE(USE_SIMPLE_GETTEXT)
         try_gettext="no"
         AC_DEFINE(HAVE_DOSISH_SYSTEM)
         AC_DEFINE(USE_SIMPLE_GETTEXT)
         try_gettext="no"

-        try_gdbm="no"

         ;;
     i?86-emx-os2 | i?86-*-os2*emx )
         # OS/2 with the EMX environment
         ;;
     i?86-emx-os2 | i?86-*-os2*emx )
         # OS/2 with the EMX environment


@@ -202,7 +119,6 @@ case "${target}" in
         AC_DEFINE(HAVE_DRIVE_LETTERS)
         AC_DEFINE(HAVE_DOSISH_SYSTEM)
         try_gettext="no"
         AC_DEFINE(HAVE_DRIVE_LETTERS)
         AC_DEFINE(HAVE_DOSISH_SYSTEM)
         try_gettext="no"

-        try_gdbm="no"

         ;;
 
     i?86-*-msdosdjgpp*)
         ;;
 
     i?86-*-msdosdjgpp*)


@@ -211,9 +127,14 @@ case "${target}" in
         AC_DEFINE(HAVE_DRIVE_LETTERS)
         AC_DEFINE(HAVE_DOSISH_SYSTEM)
         try_gettext="no"
         AC_DEFINE(HAVE_DRIVE_LETTERS)
         AC_DEFINE(HAVE_DOSISH_SYSTEM)
         try_gettext="no"

-        try_gdbm="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"
     *-*-hpux*)
         if test -z "$GCC" ; then
             CFLAGS="$CFLAGS -Ae -D_HPUX_SOURCE"


@@ -232,17 +153,9 @@ case "${target}" in
        ;;
 esac
 
        ;;
 esac
 

-AC_SUBST(MPI_OPT_FLAGS)
-GNUPG_SYS_SYMBOL_UNDERSCORE
-GNUPG_CHECK_PIC
-GNUPG_CHECK_RDYNAMIC
-if test "$NO_PIC" = yes; then
-    try_dynload=no
-fi
-

 
 case "${target}" in
 
 case "${target}" in

-    *-*-mingw32)
+    *-*-mingw32*)

         PRINTABLE_OS_NAME="MingW32"
         ;;
     i?86-emx-os2 | i?86-*-os2*emx )
         PRINTABLE_OS_NAME="MingW32"
         ;;
     i?86-emx-os2 | i?86-*-os2*emx )


@@ -250,7 +163,6 @@ case "${target}" in
         ;;
     i?86-*-msdosdjgpp*)
         PRINTABLE_OS_NAME="MSDOS/DJGPP"
         ;;
     i?86-*-msdosdjgpp*)
         PRINTABLE_OS_NAME="MSDOS/DJGPP"

-        try_dynload=no

         ;;
     *-linux*)
         PRINTABLE_OS_NAME="GNU/Linux"
         ;;
     *-linux*)
         PRINTABLE_OS_NAME="GNU/Linux"


@@ -265,25 +177,6 @@ dnl let that after linux to avoid gnu-linux problems
 esac
 AC_DEFINE_UNQUOTED(PRINTABLE_OS_NAME, "$PRINTABLE_OS_NAME")
 
 esac
 AC_DEFINE_UNQUOTED(PRINTABLE_OS_NAME, "$PRINTABLE_OS_NAME")
 

-dnl  Fixme: Are these the best flags for OpenBSD????
-dnl (I have removed the -lc from * ...CFLAGS for test purposes.)
-case "${target}" in
-    *-openbsd*)
-        NAME_OF_DEV_RANDOM="/dev/srandom"
-        NAME_OF_DEV_URANDOM="/dev/urandom"
-        DYNLINK_MOD_CFLAGS="-shared -rdynamic -fpic -Wl,-Bshareable -Wl,-x"
-        ;;
-    *)
-        NAME_OF_DEV_RANDOM="/dev/random"
-        NAME_OF_DEV_URANDOM="/dev/urandom"
-        DYNLINK_MOD_CFLAGS="-shared $CFLAGS_PIC"
-        ;;
-esac
-AC_DEFINE_UNQUOTED(NAME_OF_DEV_RANDOM, "$NAME_OF_DEV_RANDOM")
-AC_DEFINE_UNQUOTED(NAME_OF_DEV_URANDOM, "$NAME_OF_DEV_URANDOM")
-AC_SUBST(MPI_OPT_FLAGS)
-
-

 dnl Checks for libraries.
 
 if test "$try_gettext" = yes; then
 dnl Checks for libraries.
 
 if test "$try_gettext" = yes; then


@@ -295,16 +188,32 @@ AC_SUBST(USE_NLS)
 AC_SUBST(USE_INCLUDED_LIBINTL)
 fi
 
 AC_SUBST(USE_INCLUDED_LIBINTL)
 fi
 

-dnl
-dnl There are lot of misconfigured systems.  We include
-dnl gdbm support only if the lib and the header is installed.
-dnl
-if test "$try_gdbm" = yes; then
-AC_CHECK_HEADERS(gdbm.h)
-if test "$ac_cv_header_gdbm_h" = yes ; then
-  AC_CHECK_LIB(gdbm,gdbm_firstkey)
+AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config)
+if test -n "$LIBGCRYPT_CONFIG"; then
+       LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
+       LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
+else
+    AC_MSG_ERROR([[
+***
+*** You need libgcrypt to build this program.
+*** It should be available at the same place you go this
+*** software.
+***]])

 fi
 fi

+AC_SUBST(LIBGCRYPT_CFLAGS)
+AC_SUBST(LIBGCRYPT_LIBS)
+
+
+dnl Where is the GTK+ toolkit
+if test "$cross_compiling" = yes ; then
+  CFLAGS="$CFLAGS -I/home/wk/work/gtk+w32/include/gtk+/gdk/win32 \
+ -I/home/wk/work/gtk+w32/include -I/home/wk/work/gtk+w32/include/gtk+"
+  LIBS="$LIBS     -L/home/wk/work/gtk+w32/lib -lgtk -lgdk -lglib"
+  compile_agent=no
+else
+  AM_PATH_GTK(1.2.1, compile_agent=yes,compile_agent=no)

 fi
 fi

+AM_CONDITIONAL(COMPILE_AGENT, test x$compile_agent = xyes)

 
 
 dnl Solaris needs -lsocket and -lnsl. Unisys system includes
 
 
 dnl Solaris needs -lsocket and -lnsl. Unisys system includes


@@ -323,56 +232,9 @@ if test x$ac_try_nsl = x1; then
 fi
 
 
 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)
-    DYNLINK_LDFLAGS="$CFLAGS_RDYNAMIC"
-    use_gnupg_extensions=yes
-  else
-    AC_CHECK_LIB(c,dlopen)
-    if test "$ac_cv_lib_c_dlopen" = "yes"; then
-      AC_DEFINE(USE_DYNAMIC_LINKING)
-      AC_DEFINE(HAVE_DL_DLOPEN)
-      DYNLINK_LDFLAGS="$CFLAGS_RDYNAMIC"
-      use_gnupg_extensions=yes
-    else
-      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)
-        DYNLINK_LDFLAGS="$CFLAGS_RDYNAMIC"
-        use_gnupg_extensions=yes
-dnl -----------------
-dnl  DLD is not ready for use. So I better disable this test
-dnl
-dnl    AC_CHECK_LIB(dld,dld_link)
-dnl    if test "$ac_cv_lib_dld_dld_link" = "yes"; then
-dnl      AC_DEFINE(USE_DYNAMIC_LINKING)
-dnl      AC_DEFINE(HAVE_DLD_DLD_LINK)
-dnl      DYNLINK_LDFLAGS="$CFLAGS_RDYNAMIC"
-dnl      use_gnupg_extensions=yes
-dnl ---------------
-      fi
-    fi
-  fi
-else
-  AC_MSG_CHECKING(for dynamic loading)
-  DYNLINK_LDFLAGS=
-  DYNLINK_MOD_CFLAGS=
-  use_gnupg_extensions=no
-  AC_MSG_RESULT(has been disabled)
-fi
-
-AM_CONDITIONAL(ENABLE_GNUPG_EXTENSIONS, test "$use_gnupg_extensions" = yes )
-AC_SUBST(DYNLINK_LDFLAGS)
-AC_SUBST(DYNLINK_MOD_CFLAGS)
-
-

 dnl Checks for header files.
 AC_HEADER_STDC
 dnl Checks for header files.
 AC_HEADER_STDC

-AC_CHECK_HEADERS(unistd.h langinfo.h)
+AC_CHECK_HEADERS(unistd.h langinfo.h termio.h)

 
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 
 
 dnl Checks for typedefs, structures, and compiler characteristics.


@@ -394,6 +256,7 @@ GNUPG_CHECK_TYPEDEF(u32, HAVE_U32_TYPEDEF)
 AC_CHECK_SIZEOF(unsigned short, 2)
 AC_CHECK_SIZEOF(unsigned int, 4)
 AC_CHECK_SIZEOF(unsigned long, 4)
 AC_CHECK_SIZEOF(unsigned short, 2)
 AC_CHECK_SIZEOF(unsigned int, 4)
 AC_CHECK_SIZEOF(unsigned long, 4)

+AC_CHECK_SIZEOF(unsigned long long, 0)

 
 if test "$ac_cv_sizeof_unsigned_short" = "0" \
    || test "$ac_cv_sizeof_unsigned_int" = "0" \
 
 if test "$ac_cv_sizeof_unsigned_short" = "0" \
    || test "$ac_cv_sizeof_unsigned_int" = "0" \


@@ -406,8 +269,9 @@ fi
 dnl Checks for library functions.
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(strerror stpcpy strlwr stricmp tcgetattr rand strtoul mmap)
 dnl Checks for library functions.
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(strerror stpcpy strlwr stricmp tcgetattr rand strtoul mmap)

-AC_CHECK_FUNCS(memmove gettimeofday getrusage gethrtime setrlimit)
+AC_CHECK_FUNCS(memmove gettimeofday getrusage gethrtime setrlimit clock_gettime)

 AC_CHECK_FUNCS(memicmp atexit raise getpagesize strftime nl_langinfo)
 AC_CHECK_FUNCS(memicmp atexit raise getpagesize strftime nl_langinfo)

+AC_CHECK_FUNCS(waitpid wait4 sigaction sigprocmask fopen64 fstat64)

 
 GNUPG_CHECK_MLOCK
 GNUPG_FUNC_MKDIR_TAKES_ONE_ARG
 
 GNUPG_CHECK_MLOCK
 GNUPG_FUNC_MKDIR_TAKES_ONE_ARG


@@ -446,201 +310,11 @@ if test "$ac_cv_header_sys_shm_h" = "yes"; then
   AC_DEFINE(USE_SHM_COPROCESSING)
 fi
 
   AC_DEFINE(USE_SHM_COPROCESSING)
 fi
 

-dnl
-dnl check whether we have a random device
-dnl
-if test "$try_dev_random" = yes ; then
-    AC_CACHE_CHECK(for random device, ac_cv_have_dev_random,
-    [if test -c "$NAME_OF_DEV_RANDOM" && test -c "$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)
-    fi
-else
-    AC_MSG_CHECKING(for random device)
-    ac_cv_have_dev_random=no
-    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)
-    fi
-fi
-
-
-dnl
-dnl Figure out the default linkage mode for cipher modules
-dnl
-dnl (We always need a static rmd160)
-print_egd_notice=no
-static_modules="$static_modules rmd160"
-if test "$use_static_rnd" = default; then
-  if test "$ac_cv_have_dev_random" = yes; then
-      static_modules="$static_modules rndlinux"
-  else
-      case "${target}" in
-          *-*-mingw32)
-              static_modules="$static_modules rndw32"
-              AC_DEFINE(USE_STATIC_RNDW32)
-              ;;
-          i?86-emx-os2|i?86-*-os2*emx)
-              static_modules="$static_modules rndos2"
-              ;;
-          m68k-atari-mint)
-              static_modules="$static_modules rndatari"
-              ;;
-          i?86-*-msdosdjgpp*)
-              static_modules="$static_modules"
-              ;;
-          *)
-              static_modules="$static_modules rndunix"
-              print_egd_notice=yes
-             ;;
-      esac
-  fi
-else
-  if test "$use_static_rnd" = none; then
-    :
-  else
-    static_modules="$static_modules rnd$use_static_rnd"
-    if test "$use_static_rnd" = "unix"; then
-        print_egd_notice=yes
-    fi
-  fi
-fi
-
-
-if test "$print_egd_notice" = "yes"; then
-    AC_MSG_WARN([[
-***
-*** The performance of the UNIX random gatherer module is not very good
-*** and it does not keep the entropy pool over multiple invocations of
-*** GnuPG.  The suggested way to overcome this problem is to use the
-***
-***               Entropy Gathering Daemon (EGD)
-***
-*** which provides a entropy source for the whole system.  It is written
-*** in Perl and available at the GnuPG FTP servers.  For more information
-*** consult the GnuPG webpages:
-***
-***           http://www.gnupg.org/download.html#egd
-***
-*** You may want to run ./configure with --enable-static-rnd=none to be
-*** able to load the EGD client code dynamically; this way you can choose
-*** between RNDUNIX and RNDEGD without recompilation.
-***]])
-fi

 
 dnl
 
 dnl

-dnl Parse the modules list and build the list
-dnl of static and dymically linked modules
-dnl
-STATIC_CIPHER_NAMES=""
-STATIC_CIPHER_OBJS=""
-DYNAMIC_CIPHER_MODS=""
-GNUPG_MSG_PRINT([dynamically linked cipher modules:])
-for name in $MODULES_IN_CIPHER; do
-    x="no"
-    for i in $static_modules; do
-        if test "$name" = "$i" ; then
-            x="yes"
-        fi
-    done;
-    if test $x = yes; then
-        STATIC_CIPHER_NAMES="$STATIC_CIPHER_NAMES $name"
-        STATIC_CIPHER_OBJS="$STATIC_CIPHER_OBJS $name.lo"
-    else
-        DYNAMIC_CIPHER_MODS="$DYNAMIC_CIPHER_MODS $name"
-        GNUPG_MSG_PRINT([$name])
-    fi
-done
-AC_MSG_RESULT()
-AC_SUBST(STATIC_CIPHER_OBJS)
-AC_SUBST(STATIC_CIPHER_NAMES)
-AC_SUBST(DYNAMIC_CIPHER_MODS)
-
-dnl
-dnl And build the constructor file
-dnl
-
-test -d cipher || mkdir cipher
-cat <<G10EOF >cipher/construct.c
-/* automatically generated by configure - do not edit */
-
-G10EOF
-GNUPG_MSG_PRINT([statically linked cipher modules:])
-for name in $STATIC_CIPHER_NAMES; do
-    echo "void ${name}_constructor(void);" >>cipher/construct.c
-    GNUPG_MSG_PRINT([$name])
-done
-AC_MSG_RESULT()
-cat <<G10EOF >>cipher/construct.c
-
-void
-cipher_modules_constructor(void)
-{
-    static int done = 0;
-    if( done )
-        return;
-    done = 1;
-
-G10EOF
-for name in $STATIC_CIPHER_NAMES; do
-    echo "   ${name}_constructor();" >>cipher/construct.c
-done
-echo '}' >>cipher/construct.c
-
-
-
-
-dnl
-dnl Figure how to link the cipher modules
-dnl
-AC_SUBST(STATIC_CIPHER_OBJS)
-AC_SUBST(DYNAMIC_CIPHER_MODS)
-
-
-dnl 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_cv_mpi_extra_asm_modules="$mpi_extra_modules"
-    ac_cv_mpi_sflags="$mpi_sflags"
-    ac_cv_mpi_config_done="yes"
-    AC_MSG_RESULT(done)
-else
-    AC_MSG_RESULT(failed)
-    AC_MSG_ERROR([mpi/config.links missing!])
-fi
-MPI_EXTRA_ASM_OBJS=""
-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"
-done
-AC_MSG_RESULT()
-fi
-AC_SUBST(MPI_EXTRA_ASM_OBJS)
-MPI_SFLAGS="$ac_cv_mpi_sflags"
-AC_SUBST(MPI_SFLAGS)
-

 dnl Do we have zlib? Must do it here because Solaris failed
 dnl when compiling a conftest (due to the "-lz" from LIBS).
 dnl Do we have zlib? Must do it here because Solaris failed
 dnl when compiling a conftest (due to the "-lz" from LIBS).

+dnl

 use_local_zlib=yes
 if test "$g10_force_zlib" = "yes"; then
   :
 use_local_zlib=yes
 if test "$g10_force_zlib" = "yes"; then
   :


@@ -664,6 +338,9 @@ fi
 AC_SUBST(ZLIBS)
 
 
 AC_SUBST(ZLIBS)
 
 

+# 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
 tmp_pat='[a-zA-Z]'
 changequote([,])dnl
 changequote(,)dnl
 tmp_pat='[a-zA-Z]'
 changequote([,])dnl


@@ -671,32 +348,42 @@ if echo "$VERSION" | sed 's/-.*//' | grep "$tmp_pat" >/dev/null ; then
     AC_DEFINE(IS_DEVELOPMENT_VERSION)
 fi
 
     AC_DEFINE(IS_DEVELOPMENT_VERSION)
 fi
 

-dnl Temp workaround:
-GNUPG_LINK_FILES(gcrypt/gcrypt.h, gcrypt.h )
+dnl Temp workarounds 
+GNUPG_LINK_FILES(include/types.h, types.h )

 
 AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes)
 
 GNUPG_DO_LINK_FILES
 
 
 AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes)
 
 GNUPG_DO_LINK_FILES
 

-dnl
-dnl Make the version number in gcrypt/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(gcrypt/gcrypt.h, GCRYPT_VERSION)
+GNUPG_CHECK_GNUMAKE
+
+if test "$GCC" = yes; then
+    if test "$MAINTAINER_MODE" = "yes"; then
+        CFLAGS="$CFLAGS -Wall -Wcast-align -Wshadow -Wstrict-prototypes"
+    else
+        CFLAGS="$CFLAGS -Wall"
+    fi
+fi

 
 
 AC_OUTPUT_COMMANDS([
 
 
 AC_OUTPUT_COMMANDS([

-chmod +x gcrypt/gcrypt-config
+chmod +x scripts/db2html

 cat >gnupg-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"
 cat >gnupg-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"
 #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 gnupg-defs.h gnupg-defs.tmp 2>/dev/null; then
 #endif
 G10EOF
 if cmp -s gnupg-defs.h gnupg-defs.tmp 2>/dev/null; then


@@ -718,20 +405,17 @@ DATADIRNAME=$DATADIRNAME
 
 AC_OUTPUT([
 Makefile
 
 AC_OUTPUT([
 Makefile

+scripts/db2html

 intl/Makefile
 po/Makefile.in
 jnlib/Makefile
 util/Makefile
 intl/Makefile
 po/Makefile.in
 jnlib/Makefile
 util/Makefile

-mpi/Makefile
-cipher/Makefile

 g10/Makefile
 g10/Makefile

+agent/Makefile

 doc/Makefile
 doc/Makefile

-doc/gph/Makefile
+doc/version.sgml

 tools/Makefile
 zlib/Makefile
 checks/Makefile
 tools/Makefile
 zlib/Makefile
 checks/Makefile

-gcrypt/Makefile
-gcrypt/gcrypt-config

 ])
 
 ])
 

-dnl *-*wedit:notab*-*  Please keep this as the last line.