summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac22
-rw-r--r--modules.c6
3 files changed, 18 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 5567f488..925feaa3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
---------------------------------------------------------------------------
Version 3.12.6 (rgerhards), 2008-04-??
+- bugfix: accidently set debug option in 3.12.5 reset to production
+ This option prevented dlclose() to be called. It had no real bad effects,
+ as the modules were otherwise correctly deinitialized and dlopen()
+ supports multiple opens of the same module without any memory footprint.
+- removed --enable-mudflap, added --enable-valgrind ./configure setting
---------------------------------------------------------------------------
Version 3.12.5 (rgerhards), 2008-03-28
- changed default for "last message repeated n times", which is now
diff --git a/configure.ac b/configure.ac
index 85c9bc56..e87ca184 100644
--- a/configure.ac
+++ b/configure.ac
@@ -291,20 +291,18 @@ if test "$enable_rtinst" = "yes"; then
AC_DEFINE(RTINST, 1, [Defined if runtime instrumentation mode is enabled.])
fi
-# mudflap
-AC_ARG_ENABLE(mudflap,
- [AS_HELP_STRING([--enable-mudflap],[Enable mudflap @<:@default=no@:>@])],
+# valgrind
+AC_ARG_ENABLE(valgrind,
+ [AS_HELP_STRING([--enable-valgrind],[Enable valgrind support settings @<:@default=no@:>@])],
[case "${enableval}" in
- yes) enable_mudflap="yes" ;;
- no) enable_mudflap="no" ;;
- *) AC_MSG_ERROR(bad value ${enableval} for --enable-mudflap) ;;
+ yes) enable_valgrind="yes" ;;
+ no) enable_valgrind="no" ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-valgrind) ;;
esac],
- [enable_mudflap="no"]
+ [enable_valgrind="no"]
)
-if test "$enable_mudflap" = "yes"; then
- # is there any way to just change the -O option in default CFLAGS? -- rgerhards, 2008-01-08
- CFLAGS="-fmudflapth $CFLAGS"
- LIBS="-lmudflapth $LIBS"
+if test "$enable_valgrind" = "yes"; then
+ AC_DEFINE(VALGRIND, 1, [Defined if valgrind support settings are to be enabled (e.g. prevents dlclose()).])
fi
@@ -555,5 +553,5 @@ echo "Networking support enabled: $enable_inet"
echo "Enable GSSAPI Kerberos 5 support: $want_gssapi_krb5"
echo "Debug mode enabled: $enable_debug"
echo "Runtime Instrumentation enabled: $enable_rtinst"
-echo "Mudflap enabled: $enable_mudflap"
+echo "valgrind support settings enabled: $enable_valgrind"
diff --git a/modules.c b/modules.c
index 9104ab7f..ad78e6e8 100644
--- a/modules.c
+++ b/modules.c
@@ -189,10 +189,10 @@ static void moduleDestruct(modInfo_t *pThis)
if(pThis->pszName != NULL)
free(pThis->pszName);
if(pThis->pModHdlr != NULL) {
-# if 0
- dlclose(pThis->pModHdlr);
+# ifdef VALGRIND
+# warning "dlclose disabled for valgrind"
# else
-# warning "dlclose disabled for valgrind, re-enable before release"
+ dlclose(pThis->pModHdlr);
# endif
}