summaryrefslogtreecommitdiff
path: root/m4/gc.m4
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2005-10-22 15:37:28 +0000
committerSimon Josefsson <simon@josefsson.org>2005-10-22 15:37:28 +0000
commitfac38a1add066ab143d9a7a26ae84a1d66a045f5 (patch)
tree5ea37c180f2ce1becc32299d84a998d202b86ec4 /m4/gc.m4
parent9837d835548a17223b16ea65f4c9340e94cd2353 (diff)
downloadgnulib-fac38a1add066ab143d9a7a26ae84a1d66a045f5.tar.gz
* gc.m4: Don't be fooled by --disable-*random-device parameters,
suggested by Bruno Haible <bruno@clisp.org>. Fix error messages.
Diffstat (limited to 'm4/gc.m4')
-rw-r--r--m4/gc.m421
1 files changed, 9 insertions, 12 deletions
diff --git a/m4/gc.m4 b/m4/gc.m4
index 41e569d5bc..d91147738c 100644
--- a/m4/gc.m4
+++ b/m4/gc.m4
@@ -51,33 +51,30 @@ AC_DEFUN([gl_GC],
AC_ARG_ENABLE(random-device,
AC_HELP_STRING([--enable-random-device],
[device with (strong) randomness (for Nettle)]),
- NAME_OF_RANDOM_DEVICE=$enableval)
+ test "$enableval" != "no" && 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)]),
- NAME_OF_PSEUDO_RANDOM_DEVICE=$enableval)
+ test "$enableval" != "no" && 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)]),
- NAME_OF_NONCE_DEVICE=$enableval)
+ test "$enableval" != "no" && 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_ERROR([[
- *** Device for (strong) random data $NAME_OF_RANDOM_DEVICE does not exist
- ]]))
- AC_CHECK_FILE($NAME_OF_PSEUDO_RANDOM_DEVICE,, AC_MSG_ERROR([[
- *** Device for pseudo-random data $NAME_OF_PSEUDO_RANDOM_DEVICE does not exist
- ]]))
- AC_CHECK_FILE($NAME_OF_NONCE_DEVICE,, AC_MSG_ERROR([[
- *** Device for unpredictable nonces $NAME_OF_NONCE_DEVICE does not exist
- ]]))
+ AC_CHECK_FILE($NAME_OF_RANDOM_DEVICE,,
+ AC_MSG_ERROR([[device for (strong) random data `$NAME_OF_RANDOM_DEVICE' does not exist]]))
+ AC_CHECK_FILE($NAME_OF_PSEUDO_RANDOM_DEVICE,,
+ AC_MSG_ERROR([[device for pseudo-random data `$NAME_OF_PSEUDO_RANDOM_DEVICE' does not exist]]))
+ AC_CHECK_FILE($NAME_OF_NONCE_DEVICE,,
+ AC_MSG_ERROR([[device for unpredictable nonces `$NAME_OF_NONCE_DEVICE' does not exist]]))
else
AC_MSG_NOTICE([[Cross compiling, assuming random devices exists...]])
fi