X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fgc-random.m4;h=e32630669d5dbb4ec4f2eb32d86a9fa2171cf187;hb=e660a47d371278b8d4ba7f227c5df451984cfe5b;hp=3bbfdafab13e25b835cad69efec248b7e634197c;hpb=42d1eda5dcce2d68deab7a642e7f29bcd7144a0d;p=gnulib.git diff --git a/m4/gc-random.m4 b/m4/gc-random.m4 index 3bbfdafab..e32630669 100644 --- a/m4/gc-random.m4 +++ b/m4/gc-random.m4 @@ -1,5 +1,5 @@ -# gc-random.m4 serial 4 -dnl Copyright (C) 2005-2009 Free Software Foundation, Inc. +# gc-random.m4 serial 6 +dnl Copyright (C) 2005-2012 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. @@ -12,7 +12,7 @@ AC_DEFUN([gl_GC_RANDOM], AC_REQUIRE([AC_CANONICAL_HOST])dnl case "$host_os" in - *openbsd*) + *openbsd* | *mirbsd*) NAME_OF_RANDOM_DEVICE="/dev/srandom" NAME_OF_PSEUDO_RANDOM_DEVICE="/dev/prandom" NAME_OF_NONCE_DEVICE="/dev/urandom" @@ -39,37 +39,37 @@ AC_DEFUN([gl_GC_RANDOM], AC_MSG_CHECKING([device with (strong) random data...]) AC_ARG_ENABLE([random-device], - AS_HELP_STRING([--enable-random-device], - [device with (strong) randomness (for Nettle)]), - NAME_OF_RANDOM_DEVICE=$enableval) + 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], - AS_HELP_STRING([--enable-pseudo-random-device], - [device with pseudo randomness (for Nettle)]), - NAME_OF_PSEUDO_RANDOM_DEVICE=$enableval) + 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], - AS_HELP_STRING([--enable-nonce-device], - [device with unpredictable nonces (for Nettle)]), - NAME_OF_NONCE_DEVICE=$enableval) + 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 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]])) + 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]])) + 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]])) + 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...]]) @@ -80,7 +80,7 @@ AC_DEFUN([gl_GC_RANDOM], 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", + "$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"], [defined to the name of the unpredictable nonce device])