diff --git a/autogen.sh b/autogen.sh
index ed58ef488..201a536e8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -16,22 +16,33 @@ if [ $AUTO_MAKE_VERSION -ge 14 ]; then
     fi
 fi
 echo "Running aclocal $ACLOCAL_OPTS"
-aclocal $ACLOCAL_OPTS
+aclocal $ACLOCAL_OPTS 2> autogen.err
 
 echo "Running autoheader"
-autoheader
+autoheader 2>> autogen.err
+if [ ! -e src/Include/config.h.in ]; then
+    echo "ERROR: autoheader didn't create simgear/simgear_config.h.in!"
+    echo "Aborting ... consulte autogen.err for details."
+    exit 1
+fi    
 
 echo -n "Running automake"
 if [ $OSTYPE = "IRIX" -o $OSTYPE = "IRIX64" ]; then
     echo " --add-missing --include-deps"
-    automake --add-missing --include-deps
+    automake --add-missing --include-deps 2>> autogen.err
 else
     echo " --add-missing"
-    automake --add-missing
+    automake --add-missing 2>> autogen.err
 fi
 
 echo "Running autoconf"
-autoconf
+autoconf 2>> autogen.err
+
+if [ ! -e configure ]; then
+    echo "ERROR: configure was not created!"
+    echo "Aborting ... consulte autogen.err for details."
+    exit 1
+fi
 
 # fixup Makefiles for Irix
 if test "$OSTYPE" = "IRIX" -o "$OSTYPE" = "IRIX64"; then
@@ -55,3 +66,5 @@ fi
 
 echo "Now you are ready to run './configure'"
 echo "======================================"
+
+rm -f autogen.err