Drop dmalloc and efence support.

diff --git a/configure.in b/configure.in
index 1619952e36b2027f79e2b34b342fe649ea8c5fa3..f590a472a716d93c7d9c5dff4c5759eba07d779c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -35,20 +35,6 @@ AC_SUBST(MINOR_VERSION, `echo $PACKAGE_VERSION | sed 's/.*\.\(.*\)\..*/\1/g'`)
 AC_SUBST(PATCH_VERSION, `echo $PACKAGE_VERSION | sed 's/.*\..*\.\(.*\)/\1/g'`)
 AC_SUBST(NUMBER_VERSION, `printf "0x%02x%02x%02x" $MAJOR_VERSION $MINOR_VERSION $PATCH_VERSION`)
 
-opt_dmalloc_mode=no
-AC_MSG_CHECKING([whether in dmalloc mode])
-AC_ARG_ENABLE(dmalloc-mode,
-       AS_HELP_STRING([--enable-dmalloc-mode], [enable dmalloc mode]),
-       opt_dmalloc_mode=$enableval)
-AC_MSG_RESULT($opt_dmalloc_mode)
-
-opt_efence_mode=no
-AC_MSG_CHECKING([whether in electric fence mode])
-AC_ARG_ENABLE(efence-mode,
-       AS_HELP_STRING([--enable-efence-mode], [enable electric fence mode]),
-opt_efence_mode=$enableval)
-AC_MSG_RESULT($opt_efence_mode)
-
 opt_developer_mode=no
 AC_MSG_CHECKING([whether to enable compiler warnings])
 AC_ARG_ENABLE(developer-mode,
@@ -125,16 +111,6 @@ if test $ac_cv_c_compiler_gnu != no; then
        AC_MSG_RESULT($_gcc_gnu89_inline)
        CFLAGS="$_gcc_cflags_save"
 
-       if test x$opt_dmalloc_mode = xyes; then
-         AC_CHECK_LIB(dmalloc, main)
-         AC_DEFINE(USE_DMALLOC, 1, [enable the use of dmalloc])
-       else
-               if test x$opt_efence_mode = xyes; then
-                 AC_CHECK_LIB(efence, main)
-                 AC_DEFINE(USE_EFENCE, 1, [use electric fence])
-               fi
-       fi
-
        AC_MSG_CHECKING([whether we have GNU assembler])
        GAS=`as --version < /dev/null 2>/dev/null | grep GNU`
        if test "$GAS"; then

diff --git a/lib/gnutls_mem.h b/lib/gnutls_mem.h
index 9af8543f3c83dbd1a9008c92bfa3b99083f19aea..8f32701de441f3fcb3553d802f09040d1b8aa68c 100644 (file)
--- a/lib/gnutls_mem.h
+++ b/lib/gnutls_mem.h
@@ -25,10 +25,6 @@
 #ifndef GNUTLS_MEM_H
 # define GNUTLS_MEM_H
 
-#ifdef USE_DMALLOC
-# include <dmalloc.h>
-#endif
-
 typedef void svoid;            /* for functions that allocate using gnutls_secure_malloc */
 
 extern int (*_gnutls_is_secure_memory) (const void *);