[Monodevelop-patches-list] r2421 - trunk/MonoDevelop

[John Luke <jluke@cfl.rr.com>]

Author: jluke
Date: 2005-04-03 16:30:46 -0400 (Sun, 03 Apr 2005)
New Revision: 2421

Modified:
   trunk/MonoDevelop/ChangeLog
   trunk/MonoDevelop/autogen.sh
Log:
add back aclocal


Modified: trunk/MonoDevelop/ChangeLog
===================================================================
--- trunk/MonoDevelop/ChangeLog	2005-04-03 19:51:40 UTC (rev 2420)
+++ trunk/MonoDevelop/ChangeLog	2005-04-03 20:30:46 UTC (rev 2421)
@@ -1,3 +1,7 @@
+2005-04-03  John Luke  <john.luke at gmail.com>
+
+	* autogen.sh: add back aclocal
+
 2005-04-01	Christian Hergert	<christian.hergert at gmail.com>
 
 	* contrib/: Add folder for external libraries

Modified: trunk/MonoDevelop/autogen.sh
===================================================================
--- trunk/MonoDevelop/autogen.sh	2005-04-03 19:51:40 UTC (rev 2420)
+++ trunk/MonoDevelop/autogen.sh	2005-04-03 20:30:46 UTC (rev 2421)
@@ -32,6 +32,13 @@
   DIE=1
 }
 
+# if no automake, don't bother testing for aclocal
+test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
+  echo
+  echo "**Error**: Missing \`aclocal'."
+  DIE=1
+}
+
 if test "$DIE" -eq 1; then
   exit 1
 fi
@@ -56,6 +63,17 @@
 intltoolize --force --copy --automake ||
   { echo "**Error**: intltoolize failed."; exit 1; }
 
+echo "Running aclocal $ACLOCAL_FLAGS ..."
+aclocal $ACLOCAL_FLAGS || {
+  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
+}
+
 echo "Running automake --gnu $am_opt ..."
 automake --add-missing --gnu $am_opt ||
   { echo "**Error**: automake failed."; exit 1; }