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

[Julien Fischer]

Branches: main

Fix 11.07 source distribution builds.

tools/test_mercury:
 	Only invoke aclocal on the main branch when building
 	the source distribution.

Julien.

Index: tools/test_mercury
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.397
diff -u -r1.397 test_mercury
--- tools/test_mercury	10 Nov 2011 14:25:56 -0000	1.397
+++ tools/test_mercury	13 Nov 2011 11:39:47 -0000
@@ -865,6 +865,18 @@
      # it is enabled.  (See bug #115 for further details -- it should be re-enbled
      # once bug #115 has been fixed.)
      #
+    # See above for an explanation of why we handle aclocal like this.
+    #
+    case $BRANCH in
+        latest)
+            ACLOCAL_CMD="alcocal -I m4"
+        ;;
+
+        *)
+            ACLOCAL_CMD="true"
+        ;;
+    esac
+
      { cd $DIR/mercury &&
      $MMAKE realclean MMAKEFLAGS=$PARALLEL &&
      (cd $DIR/tests &&
@@ -872,7 +884,7 @@
      : > Mmake.params &&
      rm -f so_locations &&
      rm -f .enable_lib_grades &&
-    aclocal -I m4 &&
+    $ACLOCAL_CMD &&
      autoconf &&
      mercury_cv_low_tag_bits=2 \
      mercury_cv_bits_per_word=32 \
\
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------