[m-rev.] diff: don't require flex and bison for bindist install

[Julien Fischer]

Estimated hours take: 0.1
Branches: main

Don't require flex and bison to be available in order to
install the binary distribution.

configure.in:
 	Don't check for flex and bison when reconfiguring.

Julien.

Index: configure.in
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/configure.in,v
retrieving revision 1.534
diff -u -r1.534 configure.in
--- configure.in	28 Nov 2008 04:35:38 -0000	1.534
+++ configure.in	8 Dec 2008 13:48:33 -0000
@@ -4698,19 +4698,29 @@
  # Check for flex and bison
  #

-AC_PROG_LEX
-if test "`basename $LEX`" != "flex"
+# We only require flex and bison if we are going to compile the trace
+# directory.  We don't need them if we are reconfiguring an existing
+# installation.  We omit these tests in that case because otherwise users
+# would have to flex and bison available in order to install the binary
+# distribution.
+#
+if test "$reconfiguring" = "no"
  then
-    AC_MSG_ERROR([You need flex to build Mercury])
-fi

-AC_PROG_YACC
-# AC_PROG_YACC may bind YACC to e.g. "bison -y"; we care only about
-# the program name.
-YACCPROG=`echo $YACC | sed 's/ .*//'`
-if test "`basename $YACCPROG`" != "bison"
-then
-    AC_MSG_ERROR([You need bison to build Mercury])
+    AC_PROG_LEX
+    if test "`basename $LEX`" != "flex"
+    then
+        AC_MSG_ERROR([You need flex to build Mercury])
+    fi
+
+    AC_PROG_YACC
+    # AC_PROG_YACC may bind YACC to e.g. "bison -y"; we care only about
+    # the program name.
+    YACCPROG=`echo $YACC | sed 's/ .*//'`
+    if test "`basename $YACCPROG`" != "bison"
+    then
+        AC_MSG_ERROR([You need bison to build Mercury])
+    fi
  fi

  #-----------------------------------------------------------------------------#


--------------------------------------------------------------------------
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
--------------------------------------------------------------------------