dnl -*-fundamental-*- *@--GLOB-HEADER--@*
dnl
-dnl $Id: aclocal.glob,v 1.10 2000/10/14 16:32:15 mdw Exp $
+dnl $Id: aclocal.glob,v 1.13 2001/02/23 09:07:24 mdw Exp $
dnl
dnl Common library of autoconf macros
dnl
dnl----- Revision history ---------------------------------------------------
dnl
dnl $Log: aclocal.glob,v $
+dnl Revision 1.13 2001/02/23 09:07:24 mdw
+dnl Restore temporary variable on exit.
+dnl
+dnl Revision 1.12 2001/02/04 01:18:52 mdw
+dnl Overhaul the mLib debugging options.
+dnl
+dnl Revision 1.11 2001/01/20 12:03:08 mdw
+dnl Remove redundant stuff.
+dnl
dnl Revision 1.10 2000/10/14 16:32:15 mdw
dnl Fixes from upstream.
dnl
dnl----- Common files distribution --------------------------- *@--NOTICE--@*
dnl
-dnl $Id: aclocal.glob,v 1.10 2000/10/14 16:32:15 mdw Exp $
+dnl $Id: aclocal.glob,v 1.13 2001/02/23 09:07:24 mdw Exp $
-dnl --- *@-AC_PROG_CC_STDC-@* ---
+dnl --- *@-AM_PROG_CC_STDC-@* ---
dnl
dnl Author: Franc,ois Pinard
dnl
-dnl Synopsis: AC_PROG_CC_STDC
+dnl Synopsis: AM_PROG_CC_STDC
dnl
dnl Arguments: ---
dnl
AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
AC_REQUIRE([AC_PROG_MAKE_SET])])
-dnl --- *@-AM_PROG_INSTALL-@* ---
-dnl
-dnl Author: Franc,ois Pinard
-dnl
-dnl Synopsis: AM_PROG_INSTALL
-dnl
-dnl Arguments: ---
-dnl
-dnl Use: Calls `AC_PROG_INSTALL' to find an installer. Then it sets
-dnl `INSTALL_SCRIPT' to a suitable value if necessary.
-
-# serial 1
-
-AC_DEFUN(AM_PROG_INSTALL,
-[AC_PROG_INSTALL
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 755'
-AC_SUBST(INSTALL_SCRIPT)dnl
-])
-
dnl --- *@-AM_PROG_LEX-@* ---
dnl
dnl Author: Alexandre Oliva
# serial 1
AC_DEFUN(fp_C_PROTOTYPES,
-[AC_REQUIRE([fp_PROG_CC_STDC])
+[AC_REQUIRE([AM_PROG_CC_STDC])
AC_MSG_CHECKING([for function prototypes])
if test "$ac_cv_prog_cc_stdc" != no; then
AC_MSG_RESULT(yes)
{
/* Under Solaris 2.4, strtod returns the wrong value for the
terminating character under some conditions. */
-
-## @defmac AC_FUNC_STRTOD
-## @maindex FUNC_STRTOD
-## @ovindex LIBOBJS
-## If the @code{strtod} function is not available, or does not work
-## correctly (like the one on SunOS 5.4), add @samp{strtod.o} to output
-## variable @code{LIBOBJS}.
-## @end defmac
-
-AC_DEFUN(AM_FUNC_STRTOD,
-[AC_CACHE_CHECK(for working strtod, am_cv_func_strtod,
-[AC_TRY_RUN([
-double strtod ();
-int
-main()
-{
- {
- /* Some versions of Linux strtod mis-parse strings with leading '+'. */
- char *string = " +69";
- char *term;
- double value;
- value = strtod (string, &term);
- if (value != 69 || term != (string + 4))
- exit (1);
- }
-
- {
- /* Under Solaris 2.4, strtod returns the wrong value for the
- terminating character under some conditions. */
char *string = "NaN";
char *term;
strtod (string, &term);
AC_MSG_ERROR([$2 library not found or too old.]),
$5)
AC_MSG_RESULT([not found])
-fi])
+fi
+popdef([upname])])
dnl *@-mdw_MLIB-@*
dnl
dnl
dnl Arguments: ---
dnl
-dnl Use: Turns off the `NDEBUG' flag if the user wants to do
-dnl debugging.
+dnl Use: Turns on the `NDEBUG' flag, to disable useful things like
+dnl assertions.
AC_DEFUN(mdw_OPT_NDEBUG,
[AC_ARG_ENABLE(debugging,
-[ --enable-debugging spews vast swathes of useless information],
+[ --disable-debugging spews vast swathes of useless information],
[if test "$enableval" = "no"; then
AC_DEFINE(NDEBUG, 1)
-fi],
-[AC_DEFINE(NDEBUG, 1)])])
+fi])])
dnl --- *@-mdw_OPT_EFENCE-@* ---
dnl
AC_CHECK_LIB(efence, malloc)
fi])])
-dnl --- *@-mdw_OPT_mLib_DEBUG-@* ---
+dnl --- *@-mdw_OPT_TRACE-@* ---
dnl
dnl Author: Mark Wooding
dnl
-dnl Synopsis: mdw_OPT_mLib_DEBUG(PROGRAM)
+dnl Synopsis: mdw_OPT_TRACE
dnl
dnl Arguments: ---
dnl
-dnl Use: Provides options for mLib debugging. In particular, the
+dnl Use: Turns on the `NTRACE' flag, to disable useful things like
+dnl trace outputs.
+
+AC_DEFUN(mdw_OPT_TRACE,
+[AC_ARG_ENABLE(tracing,
+[ --disable-tracing disable output of trace information],
+[if test "$enableval" = "no"; then
+ AC_DEFINE(NTRACE, 1)
+fi])])
+
+dnl --- *@-mdw_OPT_mLib_TRACK-@* ---
+dnl
+dnl Author: Mark Wooding
+dnl
+dnl Synopsis: mdw_OPT_mLib_TRACK(PROGRAM)
+dnl
+dnl Arguments: PROGRAM = name of this program or package.
+dnl
+dnl Use: Controls the unsupported mLib memory tracker. The
dnl following are defined:
dnl
-dnl --enable-tracing turns off the NTRACE variable
dnl --enable-track turns on malloc tracking
dnl --enable-blame-PROGRAM tracks malloc contexts in PROGRAM
dnl
-dnl There must be a separate `blame' option, so that the various
-dnl blame options work properly.
-
-AC_DEFUN(mdw_OPT_mLib_DEBUG,
-[mdw_OPT_NDEBUG
-mdw_OPT_EFENCE
-
-AC_ARG_ENABLE(tracing,
-[ --enable-tracing enable output of tracing information],
-[if test "$enableval" = "no"; then
- AC_DEFINE(NTRACE, 1)
-fi],
-[AC_DEFINE(NTRACE, 1)])
+dnl There must be a separate `blame' option for each program,
+dnl so that the various blame options in a hierarchy get
+dnl propagated properly. This is an obsolete feature from the
+dnl days when mLib was provided as a subdirectory of other
+dnl packages.
+AC_DEFUN(mdw_OPT_mLib_TRACK,
+[AC_REQUIRE([mdw_OPT_TRACE])
AC_ARG_ENABLE(track,
[ --enable-track enable tracking of malloc and free],
[AC_DEFINE(TRACK_ENABLE, 1)])
-
AC_ARG_ENABLE(blame-$1,
[ --enable-blame-$1
track malloc contexts while in $1],
[AC_DEFINE(TRACK_BLAME, 1)])])
+dnl --- *@-mdw_OPT_mLib_DEBUG-@* ---
+dnl
+dnl Author: Mark Wooding
+dnl
+dnl Synopsis: mdw_OPT_mLib_DEBUG(PROGRAM)
+dnl
+dnl Arguments: PROGRAM = name of this program or package.
+dnl
+dnl Use: Provides all of the above debugging options.
+
+AC_DEFUN(mdw_OPT_mLib_DEBUG,
+[mdw_REQUIRE([mdw_OPT_NDEBUG])
+mdw_REQUIRE([mdw_OPT_mLib_TRACK], [$1])])
+
dnl----- That's all, folks --------------------------------- *@--GLOB-END--@*
~mdw / cfd / blobdiff