diff --git a/autogen.sh b/autogen.sh
index 4ba72fa81..e679afedb 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,9 +5,14 @@ echo "This may take a while ..."
 
 # Regenerate configuration files
 cp acinclude.m4 aclocal.m4
+found=false
 for autoconf in autoconf autoconf259
-do if which $autoconf >/dev/null; then $autoconf; break; fi
+do if which $autoconf >/dev/null 2>&1; then $autoconf && found=true; break; fi
 done
+if test x$found = xfalse; then
+    echo "Couldn't find autoconf, aborting"
+    exit 1
+fi
 (cd test; sh autogen.sh)
 
 # Run configure for this platform
diff --git a/test/autogen.sh b/test/autogen.sh
index 09ecb2abe..ffa215245 100755
--- a/test/autogen.sh
+++ b/test/autogen.sh
@@ -2,6 +2,11 @@
 #
 # Regenerate configuration files
 cp acinclude.m4 aclocal.m4
+found=false
 for autoconf in autoconf autoconf259
-do if which $autoconf >/dev/null; then $autoconf; break; fi
+do if which $autoconf >/dev/null 2>&1; then $autoconf && found=true; break; fi
 done
+if test x$found = xfalse; then
+    echo "Couldn't find autoconf, aborting"
+    exit 1
+fi