From 7b9c7bd4080ebfa48e92df3fd5789f86c1a3cc62 Mon Sep 17 00:00:00 2001
From: Mark Brown <dougl@cs.mu.oz.au>
Date: Wed, 5 Jan 2000 16:40:17 +0000
Subject: [PATCH] Disable the support for declarative debugging in grades
 without

Estimated hours taken: 1

Disable the support for declarative debugging in grades without
conservative GC.  This was meant to be part of an earlier change,
but somehow did not get committed.

configure.in:
runtime/mercury_conf.h.in:
	Define MR_DISABLE_DECLARATIVE_DEBUGGER if --disable-decl-debug
	is passed as an option to `configure'.

runtime/mercury_conf_param.h:
	Define MR_USE_DECLARATIVE_DEBUGGER if conservative GC is being
	used, and declarative debugging has not been disabled.
---
 configure.in                 |  6 +++---
 runtime/mercury_conf.h.in    | 11 +++++++----
 runtime/mercury_conf_param.h |  9 +++++++++
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/configure.in b/configure.in
index a8dd2595f..3cbeccb2c 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------#
-# Copyright (C) 1995-1999 The University of Melbourne. 
+# Copyright (C) 1995-2000 The University of Melbourne. 
 # This file may only be copied under the terms of the GNU General
 # Public Licence - see the file COPYING in the Mercury distribution.
 #-----------------------------------------------------------------------------#
@@ -1692,8 +1692,8 @@ AC_SUBST(LIBGRADES)
 AC_ARG_ENABLE(decl-debug,
 [  --disable-decl-debug    disable the declarative debugger],
 mercury_cv_enable_decl_debug="$enableval",mercury_cv_enable_decl_debug=yes)
-if test "$mercury_cv_enable_decl_debug" = "yes"; then
-	AC_DEFINE(MR_USE_DECLARATIVE_DEBUGGER)
+if test "$mercury_cv_enable_decl_debug" = "no"; then
+	AC_DEFINE(MR_DISABLE_DECLARATIVE_DEBUGGER)
 fi
 #-----------------------------------------------------------------------------#
 
diff --git a/runtime/mercury_conf.h.in b/runtime/mercury_conf.h.in
index bba70f3c5..4642be215 100644
--- a/runtime/mercury_conf.h.in
+++ b/runtime/mercury_conf.h.in
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1995-1999 The University of Melbourne.
+** Copyright (C) 1995-2000 The University of Melbourne.
 ** This file may only be copied under the terms of the GNU Library General
 ** Public License - see the file COPYING.LIB in the Mercury distribution.
 */
@@ -320,10 +320,13 @@
 #undef  MR_USE_EXTERNAL_DEBUGGER
 
 /*
-** MR_USE_DECLARATIVE_DEBUGGER:
-**	Include declarative debugging support in the internal debugger.
+** MR_DISABLE_DECLARATIVE_DEBUGGER:
+**	Remove declarative debugging support from the internal
+**	debugger, even if it is compatible with the current grade.
+**	Whether the declarative debugger can be used or not is
+**	determined in runtime/mercury_conf_param.h.
 */
-#undef	MR_USE_DECLARATIVE_DEBUGGER
+#undef	MR_DISABLE_DECLARATIVE_DEBUGGER
 
 /*
 ** MR_NO_USE_READLINE
diff --git a/runtime/mercury_conf_param.h b/runtime/mercury_conf_param.h
index 401b1c341..b96271ca9 100644
--- a/runtime/mercury_conf_param.h
+++ b/runtime/mercury_conf_param.h
@@ -323,6 +323,15 @@
   #define MR_MAY_NEED_INITIALIZATION
 #endif
 
+/*
+** MR_USE_DECLARATIVE_DEBUGGER -- include support for declarative
+**				  debugging in the internal debugger.
+*/
+
+#if defined(CONSERVATIVE_GC) && !defined(MR_DISABLE_DECLARATIVE_DEBUGGER)
+  #define MR_USE_DECLARATIVE_DEBUGGER
+#endif
+
 /*---------------------------------------------------------------------------*/
 
 /*