[m-rev.] diff: allow disabling of .NET grades

[Simon Taylor]

Estimated hours taken: 0.25
Branches: main

configure.in:
	Add an option `--disable-dotnet-grades' which
	disables installation of the .ilc grade even if
	ilasm is found.

.INSTALL.in:
	Document the new option.

tools/test_mercury:
	Pass `--disable-dotnet-grades' to configure on mars.
	Portable .NET is installed on mars, and the test
	in configure.in for ilasm doesn't check whether
	the ilasm found will work with Mercury.

Index: configure.in
===================================================================
RCS file: /home/mercury1/repository/mercury/configure.in,v
retrieving revision 1.279
diff -u -u -r1.279 configure.in
--- configure.in	5 Oct 2001 01:22:55 -0000	1.279
+++ configure.in	31 Oct 2001 06:59:25 -0000
@@ -2015,6 +2015,10 @@
                           install profiling versions of the high level C grade],
 enable_hlc_prof_grades=yes,enable_hlc_prof_grades=no)
 
+AC_ARG_ENABLE(dotnet-grades,
+[  --disable-dotnet-grades do not install the .NET grades],
+enable_dotnet_grades="$enableval",enable_dotnet_grades=yes)
+
 AC_ARG_ENABLE(libgrades,
 [  --enable-libgrades=...  install exactly the given versions of the library],
 enable_libgrades_given=yes;enable_libgrades="$enableval",enable_libgrades_given=no)
@@ -2097,7 +2101,8 @@
 # add `hlc' (--high-level-code, i.e. MLDS back-end) grades
 LIBGRADES="$LIBGRADES hlc.gc"
 
-if test $mercury_cv_microsoft_dotnet = "yes"; then
+if test $mercury_cv_microsoft_dotnet = yes -a "$enable_dotnet_grades" = yes
+then
     LIBGRADES="$LIBGRADES ilc"
 fi
 
Index: .INSTALL.in
===================================================================
RCS file: /home/mercury1/repository/mercury/.INSTALL.in,v
retrieving revision 1.8
diff -u -u -r1.8 .INSTALL.in
--- .INSTALL.in	9 Jul 2001 08:31:49 -0000	1.8
+++ .INSTALL.in	31 Oct 2001 06:49:48 -0000
@@ -142,6 +142,11 @@
 #	   The option --enable-hlc-prof-grades causes the installation
 #	   of profiling versions of the high level code grades.
 #
+#	   The option --disable-dotnet-grades prevents the installation
+#	   of the .NET grades (see README.DotNet) even if the Microsoft
+#	   .NET SDK is installed. These grades are never installed if
+#	   the .NET SDK is not found.
+#
 #	   The option --enable-deep-profiler=/some/dir/name enables the deep
 #	   profiler, and specifies the directory in which to install the
 #	   deep profiler's CGI script. The option --disable-deep-profiler
Index: tools/test_mercury
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.165
diff -u -u -r1.165 test_mercury
--- tools/test_mercury	16 Oct 2001 08:40:43 -0000	1.165
+++ tools/test_mercury	31 Oct 2001 06:46:04 -0000
@@ -365,7 +365,10 @@
 		esac
 		;;
 	mars)
-		CONFIG_OPTS=""
+		# Portable .NET is installed on mars, and the
+		# test in configure.in doesn't test whether the
+		# ilasm it finds is suitable for use with Mercury.
+		CONFIG_OPTS="--disable-dotnet-grades"
 		MMAKE_USE_SUBDIRS=yes
 		export MMAKE_USE_SUBDIRS
 		;;
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------