[m-rev.] for review: autoconfigure which version of .NET std lib to use

[Fergus Henderson]

On 01-Mar-2002, Peter Ross <peter.ross at miscrit.be> wrote:
> Configure the version of the .NET std library that we are using instead
> of hard-coding it in the compiler.
> 
> aclocal.m4:
>     Find the version number of the mscorlib assembly and record it in
>     MS_DOTNET_LIBRARY_VERSION.

This change broke the nightly tests on mars (which has Portable.Net installed).

Here's a fix.

----------

Estimated hours taken: 0.5
Branches: main

aclocal.m4:
	Fix some bugs in the code to check the dotnet library version:
		- it was invoking the test even if `csc' wasn't found
		- even if --enable-dotnet-library-grades was not specified,
		  it was invoking AC_MSG_ERROR if the test failed,
		  which causes configure to fail.  It should only be
		  invoking AC_MSG_WARN in that case.
	Also delete some unused code.

Workspace: /home/ceres/fjh/mercury
Index: aclocal.m4
===================================================================
RCS file: /home/mercury1/repository/mercury/aclocal.m4,v
retrieving revision 1.8
diff -u -d -r1.8 aclocal.m4
--- aclocal.m4	3 Mar 2002 12:12:49 -0000	1.8
+++ aclocal.m4	4 Mar 2002 05:38:50 -0000
@@ -98,26 +98,16 @@
 AC_MSG_RESULT($mercury_cv_microsoft_visual_cpp)
 MS_CL=`basename "$MS_CL"`
 
+# Check for the C# (C sharp) compiler.
 AC_PATH_PROG(MS_CSC, csc)
-AC_MSG_CHECKING(for Microsoft.NET Visual C sharp)
-AC_CACHE_VAL(mercury_cv_microsoft_visual_csharp, [
-if test "$MS_CSC" != ""; then
-	changequote(<<,>>) 
-	MS_VISUALCSHARP_DIR=`expr "$MS_CSC" : '\(.*\)[/\\]*[bB]in[/\\]*csc`
-	changequote([,]) 
-	mercury_cv_microsoft_visual_csharp="yes"
-else
-	MS_VISUALCSHARP_DIR=""
-	mercury_cv_microsoft_visual_csharp="no"
-fi
-])
-AC_MSG_RESULT($mercury_cv_microsoft_visual_csharp)
 MS_CSC=`basename "$MS_CSC"`
 
 # We default to the Beta 2 version of the library
 mercury_cv_microsoft_dotnet_library_version=1.0.2411.0
-if test $mercury_cv_microsoft_dotnet = "yes"; then
-	AC_MSG_CHECKING(determining version of .NET libraries)
+if	test $mercury_cv_microsoft_dotnet = "yes" &&
+	test "$MS_CSC" != "";
+then
+	AC_MSG_CHECKING(version of .NET libraries)
 	cat > conftest.cs << EOF
 	using System;
 	using System.Reflection;
@@ -142,9 +132,11 @@
 		rm -f conftest*
 	else
 		rm -f conftest*
-		AC_MSG_ERROR(unable to determine version)
 		if test $enable_dotnet_grades = "yes"; then
-			    exit 1
+			AC_MSG_ERROR(unable to determine version)
+			exit 1
+		else
+			AC_MSG_WARN(unable to determine version)
 		fi
 	fi
 fi
-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
The University of Melbourne         |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------