aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--macros/ChangeLog7
-rw-r--r--macros/autogen.sh20
2 files changed, 22 insertions, 5 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog
index ac39413dfb..5122c1667e 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,3 +1,10 @@
+2000-06-17 Dan Winship <danw@helixcode.com>
+
+ * autogen.sh: exit immediately if aclocal, autoheader, automake,
+ or autoconf fails, rather than continuing on with broken state.
+ (In the aclocal case, print a hopefully-useful explanatory
+ message.)
+
2000-06-13 Martin Baulig <baulig@suse.de>
* gnome-bonobo-check.am (AM_BONOBO_USES_OAF): New macro.
diff --git a/macros/autogen.sh b/macros/autogen.sh
index 18cfd60720..a649be9b04 100644
--- a/macros/autogen.sh
+++ b/macros/autogen.sh
@@ -145,16 +145,26 @@ do
fi
fi
echo "Running aclocal $aclocalinclude ..."
- aclocal $aclocalinclude
+ aclocal $aclocalinclude || {
+ echo
+ echo "**Error**: aclocal failed. This may mean that you have not"
+ echo "installed all of the packages you need, or you may need to"
+ echo "set ACLOCAL_FLAGS to include \"-I \$prefix/share/aclocal\""
+ echo "for the prefix where you installed the packages whose"
+ echo "macros were not found"
+ exit 1
+ }
+
if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
echo "Running autoheader..."
- autoheader
+ autoheader || { echo "**Error**: autoheader failed."; exit 1; }
fi
echo "Running automake --gnu $am_opt ..."
- automake --add-missing --gnu $am_opt
+ automake --add-missing --gnu $am_opt ||
+ { echo "**Error**: automake failed."; exit 1; }
echo "Running autoconf ..."
- autoconf
- )
+ autoconf || { echo "**Error**: autoconf failed."; exit 1; }
+ ) || exit 1
fi
done