[m-rev.] diff: fix `mmake --use-mmc-make' errors

[Simon Taylor]

Estimated hours taken: 0.25
Branches: main

Fix "cygpath: command not found" errors with `mmake --use-mmc-make'.

configure.in:
bindist/bindist.configure.in:
scripts/Mmake.vars.in:
	Check that `cygpath' exists, rather than hard-coding
	it in Mmake.vars.in.

Index: configure.in
===================================================================
RCS file: /home/mercury1/repository/mercury/configure.in,v
retrieving revision 1.335
diff -u -u -r1.335 configure.in
--- configure.in	24 Oct 2002 16:30:30 -0000	1.335
+++ configure.in	2 Nov 2002 15:56:52 -0000
@@ -392,6 +392,8 @@
 ] AC_MSG_RESULT(yes), [ac_microsoft=no
 ] AC_MSG_RESULT(no))
 
+AC_CHECK_PROG(CYGPATH, cygpath, cygpath -w, echo)
+
 if test "$ac_microsoft" = "yes" ; then
 	# Use MS-style file names and command-line options
 	OBJ_SUFFIX="obj"
@@ -408,7 +410,10 @@
 
 	USING_MICROSOFT_CL_COMPILER="yes"
 
-	FIX_PATH_FOR_CC="cygpath -w"
+	case "$CYGPATH" in "echo")
+		AC_MSG_WARN("cygpath required with Microsoft Visual C++") ;;
+	esac
+	FIX_PATH_FOR_CC="$CYGPATH"
 
 		# MS doesn't use a ranlib.
 	RANLIB="echo"
@@ -459,6 +464,7 @@
 AC_SUBST(LINK_LIB)
 AC_SUBST(LINK_OPT_SEP)
 AC_SUBST(FIX_PATH_FOR_CC)
+AC_SUBST(CYGPATH)
 
 #-----------------------------------------------------------------------------#
 # Microsoft.NET configuration
Index: bindist/bindist.configure.in
===================================================================
RCS file: /home/mercury1/repository/mercury/bindist/bindist.configure.in,v
retrieving revision 1.43
diff -u -u -r1.43 bindist.configure.in
--- bindist/bindist.configure.in	25 Oct 2002 02:29:57 -0000	1.43
+++ bindist/bindist.configure.in	2 Nov 2002 15:49:49 -0000
@@ -84,6 +84,7 @@
 AC_SUBST(LINK_LIB)
 AC_SUBST(LINK_OPT_SEP)
 AC_SUBST(FIX_PATH_FOR_CC)
+AC_SUBST(CYGPATH)
 AC_SUBST(MATH_LIB)
 AC_SUBST(SHARED_LIBS_SH)
 AC_SUBST(CGIDIR)
Index: scripts/Mmake.vars.in
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/Mmake.vars.in,v
retrieving revision 1.82
diff -u -u -r1.82 Mmake.vars.in
--- scripts/Mmake.vars.in	24 Oct 2002 09:16:11 -0000	1.82
+++ scripts/Mmake.vars.in	2 Nov 2002 06:15:39 -0000
@@ -212,7 +212,7 @@
 
 # MS_CL is the command line version of Microsoft Visual C++, which we
 # use to compile Managed C++ code in the .NET backend.
-FIX_PATH_FOR_CL	= cygpath -w
+FIX_PATH_FOR_CL	= @CYGPATH@
 MS_CL		= @MS_CL@
 MS_VISUALCPP_DIR = @MS_VISUALCPP_DIR@
 ALL_MS_CLFLAGS	= $(MS_CLFLAGS) $(EXTRA_MS_CLFLAGS) $(TARGET_MS_CLFLAGS) \
@@ -259,7 +259,7 @@
 # which have a different command-line interface. 
 # (What about Rotor?)
 
-FIX_PATH_FOR_CSC = cygpath -w
+FIX_PATH_FOR_CSC = @CYGPATH@
 MS_CSC		= csc
 ALL_MS_CSCFLAGS	= $(MS_CSCFLAGS) $(EXTRA_MS_CSCFLAGS) $(TARGET_MS_CSCFLAGS) \
 		$(LIB_MS_CSCFLAGS)
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------