X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fgc-random.m4;h=04baed7a805bd52b89056c739ffa6d952b2ca438;hb=46f5f314f34a08c9305758482d7d2fdb0e999d09;hp=02cef2165ac371eb1edefe39163117af0f6c5556;hpb=216c04af3d0ae20181e266391d1bdc09c120404c;p=gnulib.git

diff --git a/m4/gc-random.m4 b/m4/gc-random.m4
index 02cef2165..04baed7a8 100644
--- a/m4/gc-random.m4
+++ b/m4/gc-random.m4
@@ -1,5 +1,5 @@
-# gc-random.m4 serial 1
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+# gc-random.m4 serial 6
+dnl Copyright (C) 2005-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -9,20 +9,22 @@ AC_DEFUN([gl_GC_RANDOM],
   # Devices with randomness.
   # FIXME: Are these the best defaults?
 
-  case "${target}" in
-    *-openbsd*)
+  AC_REQUIRE([AC_CANONICAL_HOST])dnl
+
+  case "$host_os" in
+    *openbsd* | *mirbsd*)
       NAME_OF_RANDOM_DEVICE="/dev/srandom"
       NAME_OF_PSEUDO_RANDOM_DEVICE="/dev/prandom"
       NAME_OF_NONCE_DEVICE="/dev/urandom"
       ;;
 
-    *-netbsd*)
+    *netbsd*)
       NAME_OF_RANDOM_DEVICE="/dev/srandom"
       NAME_OF_PSEUDO_RANDOM_DEVICE="/dev/urandom"
       NAME_OF_NONCE_DEVICE="/dev/urandom"
       ;;
 
-    *-solaris* | *-irix* | *-dec-osf* )
+    *solaris* | *irix* | *dec-osf* )
       NAME_OF_RANDOM_DEVICE="/dev/random"
       NAME_OF_PSEUDO_RANDOM_DEVICE="/dev/random"
       NAME_OF_NONCE_DEVICE="/dev/random"
@@ -36,46 +38,50 @@ AC_DEFUN([gl_GC_RANDOM],
   esac
 
   AC_MSG_CHECKING([device with (strong) random data...])
-  AC_ARG_ENABLE(random-device,
-	AC_HELP_STRING([--enable-random-device],
-		[device with (strong) randomness (for Nettle)]),
-	test "$enableval" != "no" && NAME_OF_RANDOM_DEVICE=$enableval)
-  AC_MSG_RESULT($NAME_OF_RANDOM_DEVICE)
+  AC_ARG_ENABLE([random-device],
+        AS_HELP_STRING([--enable-random-device],
+                [device with (strong) randomness (for Nettle)]),
+        NAME_OF_RANDOM_DEVICE=$enableval)
+  AC_MSG_RESULT([$NAME_OF_RANDOM_DEVICE])
 
   AC_MSG_CHECKING([device with pseudo random data...])
-  AC_ARG_ENABLE(pseudo-random-device,
-	AC_HELP_STRING([--enable-pseudo-random-device],
-		[device with pseudo randomness (for Nettle)]),
-	test "$enableval" != "no" && NAME_OF_PSEUDO_RANDOM_DEVICE=$enableval)
-  AC_MSG_RESULT($NAME_OF_PSEUDO_RANDOM_DEVICE)
+  AC_ARG_ENABLE([pseudo-random-device],
+        AS_HELP_STRING([--enable-pseudo-random-device],
+                [device with pseudo randomness (for Nettle)]),
+        NAME_OF_PSEUDO_RANDOM_DEVICE=$enableval)
+  AC_MSG_RESULT([$NAME_OF_PSEUDO_RANDOM_DEVICE])
 
   AC_MSG_CHECKING([device with unpredictable data for nonces...])
-  AC_ARG_ENABLE(nonce-device,
-	AC_HELP_STRING([--enable-nonce-device],
-		[device with unpredictable nonces (for Nettle)]),
-	test "$enableval" != "no" && NAME_OF_NONCE_DEVICE=$enableval)
-  AC_MSG_RESULT($NAME_OF_NONCE_DEVICE)
+  AC_ARG_ENABLE([nonce-device],
+        AS_HELP_STRING([--enable-nonce-device],
+                [device with unpredictable nonces (for Nettle)]),
+        NAME_OF_NONCE_DEVICE=$enableval)
+  AC_MSG_RESULT([$NAME_OF_NONCE_DEVICE])
 
   if test "$cross_compiling" != yes; then
-    AC_CHECK_FILE($NAME_OF_RANDOM_DEVICE,,
-      AC_MSG_WARN([[device for (strong) random data `$NAME_OF_RANDOM_DEVICE' does not exist]]))
-    AC_CHECK_FILE($NAME_OF_PSEUDO_RANDOM_DEVICE,,
-      AC_MSG_WARN([[device for pseudo-random data `$NAME_OF_PSEUDO_RANDOM_DEVICE' does not exist]]))
-    AC_CHECK_FILE($NAME_OF_NONCE_DEVICE,,
-      AC_MSG_WARN([[device for unpredictable nonces `$NAME_OF_NONCE_DEVICE' does not exist]]))
+    if test "$NAME_OF_RANDOM_DEVICE" != "no"; then
+      AC_CHECK_FILE([$NAME_OF_RANDOM_DEVICE],,
+        AC_MSG_WARN([[Device '$NAME_OF_RANDOM_DEVICE' does not exist, consider to use --enable-random-device]]))
+    fi
+    if test "$NAME_OF_PSEUDO_RANDOM_DEVICE" != "no"; then
+      AC_CHECK_FILE([$NAME_OF_PSEUDO_RANDOM_DEVICE],,
+        AC_MSG_WARN([[Device '$NAME_OF_PSEUDO_RANDOM_DEVICE' does not exist, consider to use --enable-pseudo-random-device]]))
+    fi
+    if test "$NAME_OF_NONCE_DEVICE" != "no"; then
+      AC_CHECK_FILE([$NAME_OF_NONCE_DEVICE],,
+        AC_MSG_WARN([[Device '$NAME_OF_NONCE_DEVICE' does not exist, consider to use --enable-nonce-device]]))
+    fi
   else
-    AC_MSG_NOTICE([[Cross compiling, assuming random devices exists on the target host...]])  
+    AC_MSG_NOTICE([[Cross compiling, assuming random devices exists on the target host...]])
   fi
 
   # FIXME?: Open+read 42 bytes+close twice and compare data.  Should differ.
 
-  AC_DEFINE_UNQUOTED(NAME_OF_RANDOM_DEVICE, "$NAME_OF_RANDOM_DEVICE",
+  AC_DEFINE_UNQUOTED([NAME_OF_RANDOM_DEVICE], ["$NAME_OF_RANDOM_DEVICE"],
                    [defined to the name of the (strong) random device])
-  AC_DEFINE_UNQUOTED(NAME_OF_PSEUDO_RANDOM_DEVICE,
-			 "$NAME_OF_PSEUDO_RANDOM_DEVICE",
+  AC_DEFINE_UNQUOTED([NAME_OF_PSEUDO_RANDOM_DEVICE],
+                         "$NAME_OF_PSEUDO_RANDOM_DEVICE",
                    [defined to the name of the pseudo random device])
-  AC_DEFINE_UNQUOTED(NAME_OF_NONCE_DEVICE, "$NAME_OF_NONCE_DEVICE",
+  AC_DEFINE_UNQUOTED([NAME_OF_NONCE_DEVICE], ["$NAME_OF_NONCE_DEVICE"],
                    [defined to the name of the unpredictable nonce device])
-
-  AC_DEFINE(GC_USE_RANDOM, 1, [Define if you want to support RNG through GC.])
 ])