[m-rev.] trivial diff: fix configure script problems

[Julien Fischer]

Estimated hours taken: 0.2
Branches: main

Make configure work again.

configure.in:
 	Fix part of the configure script that got broken during the
 	conversion to 4-space indentation.

 	Fix a long-standing problem: when checking for the use of a
 	Microsoft C compiler the output of AC_PROG_EGREP would
 	be interleaved with that of the check for C compiler.
 	Explicitly call AC_PROG_EGREP before calling AC_EGREP_CPP
 	so that the output from configure appears in a sensible
 	order.

Julien.

Index: configure.in
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/configure.in,v
retrieving revision 1.521
diff -u -r1.521 configure.in
--- configure.in	25 Feb 2008 07:21:18 -0000	1.521
+++ configure.in	25 Feb 2008 12:36:41 -0000
@@ -814,15 +814,25 @@
  done

  AC_PROG_CPP
+
  #-----------------------------------------------------------------------------#
-AC_MSG_CHECKING(for use of a Microsoft C compiler)
-AC_EGREP_CPP(yes,
+
+AC_PROG_EGREP
+AC_MSG_CHECKING([for use of a Microsoft C compiler])
+AC_EGREP_CPP([yes],
  [
  #ifdef _MSC_VER
      yes
  #endif
  ],
-[ac_microsoft=yes] AC_MSG_RESULT(yes), [ac_microsoft=no] AC_MSG_RESULT(no))
+[ac_microsoft=yes], [ac_microsoft=no])
+
+if test "$ac_microsoft" = "yes"
+then
+    AC_MSG_RESULT([yes])
+else
+    AC_MSG_RESULT([no])
+fi

  LDFLAGS_FOR_TRACE=
  LD_LIBFLAGS_FOR_TRACE=

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