[m-rev.] diff: fix 11.07-beta builds

[Julien Fischer]

Branches: main

Fix building of the 11.07 branch.

tools/test_mercury:
 	Handle the fact that the 11.07 version of the compiler shouldn't
 	have to run aclocal -I m4 before running autoconf.
 	(NOTE: the version of this script on the trunk is used to build
 	both branches; it has to remain compatible with both.)

Julien.

Index: tools/test_mercury
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.396
diff -u -r1.396 test_mercury
--- tools/test_mercury	8 Nov 2011 02:22:42 -0000	1.396
+++ tools/test_mercury	10 Nov 2011 14:21:22 -0000
@@ -735,7 +735,16 @@
  # XXX building the depend target in parallel sometimes fails so we don't
  # do that at the moment - it's probably not worth doing anyway.
  #
-aclocal -I m4 || { false; exit 1; }
+
+# XXX the 11.07 version of the compiler doesn't need to run aclocal
+# (and doesn't have an m4 directory).  We can remove this once the
+# 11.07 branch is no longer the release branch.
+#
+case $BRANCH in
+    latest)
+        aclocal -I m4 || { false; exit 1; }
+    ;;
+esac
  autoconf || { false; exit 1; }
  rm -f config.cache
  ./configure --prefix=$INSTALL_DIR $CONFIG_OPTS || { false; exit 1; }


--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------