From c7ea4647358ab9acd9b06503987f304b82f24975 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 24 Sep 2002 22:52:19 +0000 Subject: exit if aclocal-1.4 fails to run without warnings Usually compilation 2002-09-24 Bastien Nocera * autogen.sh: exit if aclocal-1.4 fails to run without warnings Usually compilation would fail afterwards with funky errors. Branched to gnome-2-0 svn path=/branches/gnome-2-0/; revision=2596 --- macros2/ChangeLog | 6 ++++++ macros2/autogen.sh | 12 +++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/macros2/ChangeLog b/macros2/ChangeLog index 7c721882..eb7907f5 100644 --- a/macros2/ChangeLog +++ b/macros2/ChangeLog @@ -1,3 +1,9 @@ +2002-09-24 Bastien Nocera + + * autogen.sh: exit if aclocal-1.4 fails to run without warnings + Usually compilation would fail afterwards with funky errors. + Branched to gnome-2-0 + 2002-08-18 Havoc Pennington * autogen.sh: hardcode aclocal-1.4/automake-1.4 so that users with diff --git a/macros2/autogen.sh b/macros2/autogen.sh index 7be40a7b..735b5fa4 100644 --- a/macros2/autogen.sh +++ b/macros2/autogen.sh @@ -153,7 +153,17 @@ do fi echo "Running aclocal $aclocalinclude ..." - aclocal-1.4 $aclocalinclude + aclocal-1.4 $aclocalinclude || { + echo + echo "**Error**: \`aclocal' failed. Please fix the warnings" + echo "(probably missing development files) and try again" + DIE=1 + } + + if test "$DIE" -eq 1; then + exit 1 + fi + if grep "^AM_CONFIG_HEADER" $bn >/dev/null; then echo "Running autoheader..." autoheader -- cgit v1.2.1