diff --git a/ChangeLog b/ChangeLog index 231a4d4b5..243a87372 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +20020123 + - (djm) Fix non-standard shell syntax in autoconf. Patch from + Dave Dykstra + 20020122 - (djm) autoconf hacking: - We don't support --without-zlib currently, so don't allow it. @@ -7378,4 +7382,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1789 2002/01/22 12:52:17 djm Exp $ +$Id: ChangeLog,v 1.1790 2002/01/22 21:12:36 djm Exp $ diff --git a/configure.ac b/configure.ac index de1c7f582..d002a3386 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -i# $Id: configure.ac,v 1.13 2002/01/22 12:51:43 djm Exp $ +i# $Id: configure.ac,v 1.14 2002/01/22 21:12:37 djm Exp $ AC_INIT AC_CONFIG_SRCDIR([ssh.c]) @@ -915,10 +915,12 @@ AC_ARG_WITH(prngd-socket, if test ! -z "$PRNGD_PORT" ; then AC_MSG_ERROR(You may not specify both a PRNGD/EGD port and socket) fi - if ! echo "$withval" | grep -q '^/' ; then + if echo "$withval" | grep '^/' >/dev/null 2>&1 ; then + # Good + else AC_MSG_ERROR(You must specify an absolute path to the entropy socket) fi - if ! test -r "$withval" ; then + if test ! -r "$withval" ; then AC_MSG_WARN(Entropy socket is not readable) fi PRNGD_SOCKET="$withval"