Simplify logic of /dev/*random search, reducing to a single AC_DEFINE

expansion for the DEV_RANDOM variable.  This allows the removal of
DEV_RANDOM from acconfig.h even with autoheader 2.13.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64034 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 12 insertions, 15 deletions

diff --git a/configure.in b/configure.in
index 23b77c009..070454370 100644
--- a/configure.in
+++ b/configure.in
@@ -1628,28 +1628,25 @@ if test "$rand" != "1"; then
     [ apr_devrandom="$withval" ], [ apr_devrandom="yes" ])
 
   if test "$apr_devrandom" = "yes"; then
-    if test -r "/dev/random"; then
-      AC_DEFINE_UNQUOTED(DEV_RANDOM, ["/dev/random"], [Define to path of random device])
-      AC_MSG_RESULT(/dev/random)
-      rand="1"
-    elif test -r "/dev/arandom"; then
-      AC_DEFINE_UNQUOTED(DEV_RANDOM, ["/dev/arandom"])
-      AC_MSG_RESULT(/dev/arandom)
-      rand="1"
-    elif test -r "/dev/urandom"; then
-      AC_DEFINE_UNQUOTED(DEV_RANDOM, ["/dev/urandom"])
-      AC_MSG_RESULT(/dev/urandom)
-      rand="1"
-    fi
+    for f in /dev/random /dev/arandom /dev/urandom; do
+      if test -r $f; then
+        apr_devrandom=$f
+        rand=1
+        break
+      fi
+    done
   elif test "$apr_devrandom" != "no"; then
     if test -r "$apr_devrandom"; then
-      AC_DEFINE_UNQUOTED(DEV_RANDOM, ["$apr_devrandom"])
-      AC_MSG_RESULT($apr_devrandom)
       rand="1"
     else
       AC_ERROR([$apr_devrandom not found or unreadable.])
     fi
   fi
+
+  if test "$rand" = "1"; then
+    AC_DEFINE_UNQUOTED(DEV_RANDOM, ["$apr_devrandom"], [Define to path of random device])
+    AC_MSG_RESULT([$apr_devrandom])
+  fi
 fi
 
 if test "$rand" != "1"; then