X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fgc-random.m4;h=3bbfdafab13e25b835cad69efec248b7e634197c;hb=2ea759e2faab0331078b1ea0df244ef781dbd994;hp=40e047106a8b5fd90f894d143425720b3cdc2afc;hpb=eccde6c1375aa759f640810c122a29d0275ae6e6;p=gnulib.git

diff --git a/m4/gc-random.m4 b/m4/gc-random.m4
index 40e047106..3bbfdafab 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 4
+dnl Copyright (C) 2005-2009 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.
@@ -38,52 +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],
+  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_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],
+  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_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],
+  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)
+  AC_MSG_RESULT([$NAME_OF_NONCE_DEVICE])
 
   if test "$cross_compiling" != yes; then
     if test "$NAME_OF_RANDOM_DEVICE" != "no"; then
-      AC_CHECK_FILE($NAME_OF_RANDOM_DEVICE,,
+      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_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_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,
+  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.])
 ])