See ChangeLog: Wed Feb 24 11:07:27 CET 1999 Werner Koch

1 files changed, 60 insertions, 16 deletions

diff --git a/configure.in b/configure.in
index 35aaa6241..85be8d9bb 100644
--- a/configure.in
+++ b/configure.in
@@ -24,12 +24,45 @@ 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 agiants this list
+
+AC_MSG_CHECKING([which static random module to use])
+AC_ARG_ENABLE(static-rnd,
+    [  --enable-static-rnd=[egd|unix|linux|nonde]  ],
+[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 7dev/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
+
 AC_MSG_CHECKING([whether use of extensions is requested])
 AC_ARG_ENABLE(dynload,
 [  --disable-dynload       disable use of extensions],
@@ -68,6 +101,7 @@ AC_ARG_WITH(included-zlib,
 [g10_force_zlib=yes], [g10_force_zlib=no] )
 AC_MSG_RESULT($g10_force_zlib)
 
+
 dnl Checks for programs.
 
 AC_CANONICAL_SYSTEM
@@ -300,23 +334,31 @@ dnl Figure out the default linkage mode for cipher modules
 dnl
 dnl (We always need a static rmd160)
 static_modules="$static_modules rmd160"
-if test "$ac_cv_have_dev_random" = yes; then
-    static_modules="$static_modules rndlinux"
+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
+          i386--mingw32)
+              static_modules="$static_modules rndw32"
+              ;;
+          i386-emx-os2)
+              static_modules="$static_modules rndos2"
+              ;;
+          m68k-atari-mint)
+              static_modules="$static_modules rndatari"
+              ;;
+          *)
+              static_modules="$static_modules rndunix"
+             ;;
+      esac
+  fi
 else
-    case "${target}" in
-        i386--mingw32)
-            static_modules="$static_modules rndw32"
-            ;;
-        i386-emx-os2)
-            static_modules="$static_modules rndos2"
-            ;;
-        m68k-atari-mint)
-            static_modules="$static_modules rndatari"
-            ;;
-        *)
-            static_modules="$static_modules rndunix"
-           ;;
-    esac
+  if test "$use_static_rnd" = none; then
+    :
+  else
+    static_modules="$static_modules rnd$use_static_rnd"
+  fi
 fi
 
 dnl
@@ -350,6 +392,8 @@ AC_SUBST(DYNAMIC_CIPHER_MODS)
 dnl
 dnl And build the constructor file
 dnl
+
+test -d cipher || mkdir cipher
 cat <<EOF >cipher/construct.c
 /* automatically generated by configure - do not edit */