for review: turning off intermodule stuff in the library

[Zoltan Somogyi]

library/Mmakefile:
	Only turn on non-interface intermodule information flow
	if LIBRARY_INTERMODULE is defined.

Mmake.common.in:
	Turn on LIBRARY_INTERMODULE by default. It can be turned off
	by Mmake.{,stage.}params.

Zoltan.

Index: Mmake.common.in
===================================================================
RCS file: /home/mercury1/repository/mercury/Mmake.common.in,v
retrieving revision 1.25
diff -u -u -r1.25 Mmake.common.in
--- Mmake.common.in	1998/01/01 05:25:13	1.25
+++ Mmake.common.in	1998/03/03 06:02:30
@@ -171,6 +171,9 @@
 # Options to pass to the Mercury compiler
 MCFLAGS	= --no-infer-all --halt-at-warn $(EXTRA_MCFLAGS)
 
+# Do we want to deal with intermodule information when building the library
+LIBRARY_INTERMODULE = yes
+
 #-----------------------------------------------------------------------------#
 
 # The Mmake.params file can be used to override definitions in this file
Index: library/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/library/Mmakefile,v
retrieving revision 1.22
diff -u -u -r1.22 Mmakefile
--- Mmakefile	1998/02/18 23:57:10	1.22
+++ Mmakefile	1998/03/03 06:01:14
@@ -41,9 +41,19 @@
 		MERCURY_SP_OVERRIDING_LIB_OBJS="$(NU_OVERRIDING_LIBRARY_QLS)" \
 		$(SCRIPTS_DIR)/msl
 
+ifeq ($(LIBRARY_INTERMODULE),yes)
+
 INTERMODULE_OPTS = --transitive-intermodule-optimization
 ENABLE_TERM_OPTS = --enable-termination
-# CHECK_TERM_OPTS = --check-termination
+CHECK_TERM_OPTS = --check-termination
+
+else
+
+INTERMODULE_OPTS =
+ENABLE_TERM_OPTS =
+CHECK_TERM_OPTS =
+
+endif
 
 MCD	=	MERCURY_INT_DIR=. \
 		MERCURY_C_INCL_DIR=$(RUNTIME_DIR) $(MC) \
@@ -135,7 +145,16 @@
 check		: library.check
 
 .PHONY: all-ints 
+
+ifeq ($(LIBRARY_INTERMODULE),yes)
+
 all-ints: ints int3s opts trans_opts
+
+else
+
+all-ints: ints int3s
+
+endif
 
 .PHONY: ints 
 ints		: library.ints