From e996d72e025c7663df6fe985a9266eb45df08459 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Wed, 23 Jan 2002 11:20:59 +1100
Subject:  - (djm) Use case statements in autoconf to clean up some tests

---
 configure.ac | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 1081b6a37..a23d32497 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-i# $Id: configure.ac,v 1.15 2002/01/22 21:59:32 stevesk Exp $
+# $Id: configure.ac,v 1.16 2002/01/23 00:21:01 djm Exp $
 
 AC_INIT
 AC_CONFIG_SRCDIR([ssh.c])
@@ -897,7 +897,17 @@ AC_SUBST(INSTALL_SSH_RAND_HELPER)
 AC_ARG_WITH(prngd-port,
 	[  --with-prngd-port=PORT  read entropy from PRNGD/EGD TCP localhost:PORT],
 	[
-		if test ! -z "$withval" -a "x$withval" != "xno" ; then
+		case "$withval" in
+		no)
+			withval=""
+			;;
+		[[0-9]]*)
+			;;
+		*)
+			AC_MSG_ERROR(You must specify a numeric port number for --with-prngd-port)
+			;;
+		esac
+		if test ! -z "$withval" ; then
 			PRNGD_PORT="$withval"
 			AC_DEFINE_UNQUOTED(PRNGD_PORT, $PRNGD_PORT)
 		fi
@@ -908,18 +918,24 @@ AC_ARG_WITH(prngd-port,
 AC_ARG_WITH(prngd-socket,
 	[  --with-prngd-socket=FILE read entropy from PRNGD/EGD socket FILE (default=/var/run/egd-pool)],
 	[
-		if test -z "$withval" ; then
+		case "$withval" in
+		yes)
 			withval="/var/run/egd-pool"
-		fi
-		if test "x$withval" != "xno" ; then
+			;;
+		no)
+			withval=""
+			;;
+		/*)
+			;;
+		*)
+			AC_MSG_ERROR(You must specify an absolute path to the entropy socket)
+			;;
+		esac
+
+		if test ! -z "$withval" ; then
 			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 '^/' >/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
 				AC_MSG_WARN(Entropy socket is not readable)
 			fi
-- 
cgit v1.2.3