Mercurial > hg > octave-kai > gnulib-hg
changeset 6420:3b630ecba683
* gc.m4: Don't be fooled by --disable-*random-device parameters,
suggested by Bruno Haible <bruno@clisp.org>. Fix error messages.
| author | Simon Josefsson <simon@josefsson.org> |
|---|---|
| date | Sat, 22 Oct 2005 15:37:28 +0000 |
| parents | 0f85e93091df |
| children | 36fc37878824 |
| files | m4/ChangeLog m4/gc.m4 |
| diffstat | 2 files changed, 14 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,8 @@ +2005-10-22 Simon Josefsson <jas@extundo.com> + + * gc.m4: Don't be fooled by --disable-*random-device parameters, + suggested by Bruno Haible <bruno@clisp.org>. Fix error messages. + 2005-10-21 Simon Josefsson <jas@extundo.com> * gc.m4: Don't use libgcrypt if gcrypt.h isn't found, suggested by
--- a/m4/gc.m4 +++ b/m4/gc.m4 @@ -51,33 +51,30 @@ 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