diff --git a/CMakeLists.txt b/CMakeLists.txt index 93d61eca..a18f7402 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,7 +40,6 @@ endif() option(BUILD_SHARED_LIBS "Build shared libraries" ON) option(LIBXSLT_WITH_DEBUGGER "Add the debugging support" ON) option(LIBXSLT_WITH_CRYPTO "Add crypto support to exslt" OFF) -option(LIBXSLT_WITH_MEM_DEBUG "Add the memory debugging module" OFF) option(LIBXSLT_WITH_MODULES "Add the module support" ON) option(LIBXSLT_WITH_PROFILER "Add the profiling support" ON) option(LIBXSLT_WITH_PYTHON "Build Python bindings" ON) @@ -76,7 +75,7 @@ if(LIBXSLT_WITH_THREADS) find_package(Threads REQUIRED) endif() -foreach(VARIABLE IN ITEMS WITH_CRYPTO WITH_DEBUGGER WITH_MEM_DEBUG WITH_MODULES WITH_PROFILER WITH_PYTHON WITH_TRIO WITH_XSLT_DEBUG) +foreach(VARIABLE IN ITEMS WITH_CRYPTO WITH_DEBUGGER WITH_MODULES WITH_PROFILER WITH_PYTHON WITH_TRIO WITH_XSLT_DEBUG) if(LIBXSLT_${VARIABLE}) set(${VARIABLE} 1) else() diff --git a/configure.ac b/configure.ac index 0131754f..bf9d8ec8 100644 --- a/configure.ac +++ b/configure.ac @@ -253,15 +253,6 @@ else fi AC_SUBST(WITH_XSLT_DEBUG) -AC_ARG_WITH(mem_debug, [ --with-mem-debug Add the memory debugging module (off)]) -if test "$with_mem_debug" = "yes" ; then - echo Enabling memory debug support - WITH_MEM_DEBUG=1 -else - WITH_MEM_DEBUG=0 -fi -AC_SUBST(WITH_MEM_DEBUG) - dnl dnl Is debugger support requested dnl diff --git a/libxslt/xsltconfig.h.in b/libxslt/xsltconfig.h.in index e115e496..c595b6ee 100644 --- a/libxslt/xsltconfig.h.in +++ b/libxslt/xsltconfig.h.in @@ -54,26 +54,6 @@ extern "C" { #define WITH_XSLT_DEBUG #endif -#if @WITH_MEM_DEBUG@ -/** - * DEBUG_MEMORY: - * - * should be activated only when debugging libxslt. It replaces the - * allocator with a collect and debug shell to the libc allocator. - * Use configure --with-mem-debug to activate it on both library - */ -#define DEBUG_MEMORY - -/** - * DEBUG_MEMORY_LOCATION: - * - * should be activated only when debugging libxslt. - * DEBUG_MEMORY_LOCATION should be activated only when libxml has - * been configured with --with-debug-mem too - */ -#define DEBUG_MEMORY_LOCATION -#endif - /** * XSLT_NEED_TRIO: * diff --git a/python/libxslt.c b/python/libxslt.c index c11dc57e..5445e4b6 100644 --- a/python/libxslt.c +++ b/python/libxslt.c @@ -51,13 +51,6 @@ __inline int c99_vsnprintf(char *outBuf, size_t size, const char *format, va_lis #define vsnprintf trio_vsnprintf #endif -/* #define DEBUG */ -/* #define DEBUG_XPATH */ -/* #define DEBUG_ERROR */ -/* #define DEBUG_MEMORY */ -/* #define DEBUG_EXTENSIONS */ -/* #define DEBUG_EXTENSIONS */ - #if PY_MAJOR_VERSION >= 3 PyObject* PyInit_libxsltmod(void); #else diff --git a/win32/configure.js b/win32/configure.js index 22f65593..53be2ba2 100644 --- a/win32/configure.js +++ b/win32/configure.js @@ -180,7 +180,6 @@ function discoverVersion() cf.Close(); vf.WriteLine("WITH_TRIO=" + (withTrio? "1" : "0")); vf.WriteLine("WITH_DEBUG=" + (withXsltDebug? "1" : "0")); - vf.WriteLine("WITH_MEM_DEBUG=" + (withMemDebug? "1" : "0")); vf.WriteLine("WITH_DEBUGGER=" + (withDebugger? "1" : "0")); vf.WriteLine("WITH_ICONV=" + (withIconv? "1" : "0")); vf.WriteLine("WITH_ZLIB=" + (withZlib? "1" : "0")); @@ -230,8 +229,6 @@ function configureXslt() of.WriteLine(s.replace(/\@WITH_TRIO\@/, withTrio? "1" : "0")); } else if (s.search(/\@WITH_XSLT_DEBUG\@/) != -1) { of.WriteLine(s.replace(/\@WITH_XSLT_DEBUG\@/, withXsltDebug? "1" : "0")); - } else if (s.search(/\@WITH_MEM_DEBUG\@/) != -1) { - of.WriteLine(s.replace(/\@WITH_MEM_DEBUG\@/, withMemDebug? "1" : "0")); } else if (s.search(/\@WITH_DEBUGGER\@/) != -1) { of.WriteLine(s.replace(/\@WITH_DEBUGGER\@/, withDebugger? "1" : "0")); } else if (s.search(/\@WITH_MODULES\@/) != -1) { @@ -303,8 +300,6 @@ function configureLibxsltPy() of.WriteLine(s.replace(/\@WITH_TRIO\@/, withTrio? "1" : "0")); } else if (s.search(/\@WITH_XSLT_DEBUG\@/) != -1) { of.WriteLine(s.replace(/\@WITH_XSLT_DEBUG\@/, withXsltDebug? "1" : "0")); - } else if (s.search(/\@WITH_MEM_DEBUG\@/) != -1) { - of.WriteLine(s.replace(/\@WITH_MEM_DEBUG\@/, withMemDebug? "1" : "0")); } else if (s.search(/\@WITH_DEBUGGER\@/) != -1) { of.WriteLine(s.replace(/\@WITH_DEBUGGER\@/, withDebugger? "1" : "0")); } else if (s.search(/\@WITH_MODULES\@/) != -1) {