[m-rev.] for review: clean up environment variable handling

[Simon Taylor]

On 11-Apr-2003, Fergus Henderson <fjh at cs.mu.OZ.AU> wrote:
> On 11-Apr-2003, Simon Taylor <stayl at cs.mu.OZ.AU> wrote:
> > 
> > Clean up the handling of environment variables.
> ...
> > scripts/Mercury.config.in:
> > 	Fix syntax errors.
> ...
> > Index: scripts/Mercury.config.in
> ...
> > @@ -24,62 +24,63 @@
> >  # be used by the substitution for SHARED_LIBS.
> >  MATH_LIB=$(MERCURY_MATH_LIB)
> >  
> > +DEFAULT_MERCURY_LINKAGE=@DEFAULT_LINKAGE@
> 
> That change wasn't mentioned in the log message.
> 
> > NEWS:
> > 	Document the change.
> 
> You didn't post a diff for the NEWS file.
> 
> Otherwise that looks fine.


Estimated hours taken: 0.5
Branches: main

Clean up the handling of environment variables.

scripts/Mmake.rules:
scripts/c2init.in:
scripts/mgnuc.in:
scripts/ml.in:
scripts/mmc.in:
scripts/parse_ml_options.sh-subr.in:
scripts/binary_step.in:
	Remove support for the environment variables which were
	previously used to override the location of the standard
	library (MERCURY_ALL_C_INCL_DIRS, MERCURY_ALL_MC_C_INCL_DIRS,
	MERCURY_INT_DIR, MERCURY_C_LIB_DIR, MERCURY_MOD_LIB_MODS,
	MERCURY_TRACE_LIB_MODS).

scripts/Mercury.config.in:
	Fix syntax errors.

	Set the DEFAULT_MERCURY_LINKAGE variable here rather
	than in the mmc script.

scripts/mmc.in:
	Setting DEFAULT_MCFLAGS is no longer required -- mmc
	now reads its configuration information from the
	Mercury.config file. This also fixes a bug which
	caused failures in the `mmc --make' tests in
	debugging grades on mundroo -- `mmc --make' wasn't
	including /usr/local/lib and /usr/local/include in
	the search paths for libraries and headers.

configure.in:
	Check that the installed compiler is capable of
	reading the Mercury.config file.
	Bootstrap tag: bootstrap_20030413_read_config_file.

NEWS:
doc/user_guide.texi:
	Document the change.


Index: NEWS
===================================================================
RCS file: /home/mercury1/repository/mercury/NEWS,v
retrieving revision 1.307
diff -u -u -r1.307 NEWS
--- NEWS	20 Mar 2003 22:51:35 -0000	1.307
+++ NEWS	10 Apr 2003 14:09:32 -0000
@@ -144,6 +144,11 @@
 * The Mercury compiler now uses `.' and not `:' as the module separator
   in all output.
 
+* The environment variables which were previously used to override the
+  location of the standard library (MERCURY_ALL_C_INCL_DIRS,
+  MERCURY_ALL_MC_C_INCL_DIRS, MERCURY_INT_DIR, MERCURY_C_LIB_DIR,
+  MERCURY_MOD_LIB_MODS, MERCURY_TRACE_LIB_MODS) have been removed.
+
 Portability improvements:
 
 * Nothing yet.
Index: configure.in
===================================================================
RCS file: /home/mercury1/repository/mercury/configure.in,v
retrieving revision 1.357
diff -u -u -r1.357 configure.in
--- configure.in	21 Mar 2003 08:00:25 -0000	1.357
+++ configure.in	10 Apr 2003 14:23:49 -0000
@@ -194,10 +194,10 @@
 		").
 EOF
 	if
-		# Test for the `--bug-intermod-2002-06-13' option.
+		# Test for the `--read-config-file-2003-03-01' option
 		echo $BOOTSTRAP_MC conftest >&AC_FD_CC 2>&1 &&
 		$BOOTSTRAP_MC \
-			--bug-foreign_import-2002-08-06 \
+			--read-config-file-2003-03-01 \
 			--halt-at-warn $link_static_opt conftest \
 			</dev/null >&AC_FD_CC 2>&1 &&
 		test "`./conftest 2>&1 | tr -d '\015'`" = "Hello, world"
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------