Snapshot release 0.4.2V0-4-2

1 files changed, 17 insertions, 19 deletions

diff --git a/scripts/autogen.sh b/scripts/autogen.sh
index 215ef072d..17905a132 100755
--- a/scripts/autogen.sh
+++ b/scripts/autogen.sh
@@ -2,34 +2,32 @@
 # Run this to generate all the initial makefiles, etc.
 
 PGM=GnuPG
-
 DIE=no
-NO_AUTOMAKE=no
 
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+if (autoconf --version) < /dev/null > /dev/null 2>&1 ; then
+    :
+else
     echo
     echo "**Error**: You must have "\`autoconf\'" installed to compile $PGM."
     echo '           (version 2.10 or newer is required'
-    DIE=yes
-}
-
-(automake --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "**Error**: You must have "\`automake\'" installed to compile $PGM."
-    echo '           (version 1.3 or newer is required)'
-    DIE=yes
-    NO_AUTOMAKE=yes
-}
-
+    DIE="yes"
+fi
 
-# if no automake, don't bother testing for aclocal
-test "$NO_AUTOMAKE" = "no" \
-     || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
+if (automake --version) < /dev/null > /dev/null 2>&1 ; then
+  if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+    :
+  else
     echo
     echo "**Error**: Missing "\`aclocal\'".  The version of "\`automake\'
     echo "           installed doesn't appear recent enough."
-    DIE=yes
-}
+    DIE="yes"
+  fi
+else
+    echo
+    echo "**Error**: You must have "\`automake\'" installed to compile $PGM."
+    echo '           (version 1.3 or newer is required)'
+    DIE="yes"
+fi
 
 if test "$DIE" = "yes"; then
     exit 1