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.
This commit is contained in:
Mark Brown
2000-01-05 16:40:17 +00:00
parent 38976906e1
commit 7b9c7bd408
3 changed files with 19 additions and 7 deletions

View File

@@ -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 # This file may only be copied under the terms of the GNU General
# Public Licence - see the file COPYING in the Mercury distribution. # Public Licence - see the file COPYING in the Mercury distribution.
#-----------------------------------------------------------------------------# #-----------------------------------------------------------------------------#
@@ -1692,8 +1692,8 @@ AC_SUBST(LIBGRADES)
AC_ARG_ENABLE(decl-debug, AC_ARG_ENABLE(decl-debug,
[ --disable-decl-debug disable the declarative debugger], [ --disable-decl-debug disable the declarative debugger],
mercury_cv_enable_decl_debug="$enableval",mercury_cv_enable_decl_debug=yes) mercury_cv_enable_decl_debug="$enableval",mercury_cv_enable_decl_debug=yes)
if test "$mercury_cv_enable_decl_debug" = "yes"; then if test "$mercury_cv_enable_decl_debug" = "no"; then
AC_DEFINE(MR_USE_DECLARATIVE_DEBUGGER) AC_DEFINE(MR_DISABLE_DECLARATIVE_DEBUGGER)
fi fi
#-----------------------------------------------------------------------------# #-----------------------------------------------------------------------------#

View File

@@ -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 ** 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. ** Public License - see the file COPYING.LIB in the Mercury distribution.
*/ */
@@ -320,10 +320,13 @@
#undef MR_USE_EXTERNAL_DEBUGGER #undef MR_USE_EXTERNAL_DEBUGGER
/* /*
** MR_USE_DECLARATIVE_DEBUGGER: ** MR_DISABLE_DECLARATIVE_DEBUGGER:
** Include declarative debugging support in the internal 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 ** MR_NO_USE_READLINE

View File

@@ -323,6 +323,15 @@
#define MR_MAY_NEED_INITIALIZATION #define MR_MAY_NEED_INITIALIZATION
#endif #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
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* /*