3 files changed, 7 insertions, 10 deletions
diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am
index 620d20d5..f6ad245c 100644
--- a/bindings/java/Makefile.am
+++ b/bindings/java/Makefile.am
@@ -41,9 +41,7 @@ com_entrouvert_lasso_LassoJNI.h: com/entrouvert/lasso/LassoJNI.class  $(java_las
 	$(JAVAH) $(JAVAH_FLAGS) -classpath . `echo $< | sed 'su/u.ug;su.classuu'`
 
 libjnilasso_la_CFLAGS = -fno-strict-aliasing $(LASSO_CORE_CFLAGS) -I$(top_srcdir) -I$(top_builddir) $(AM_CFLAGS) @JAVA_INCLUDE@
-if DEBUGGING
 libjnilasso_la_CFLAGS += -Wno-unused-parameter
-endif
 
 libjnilasso_la_LDFLAGS = -export-dynamic -prefer-pic -module -avoid-version
 libjnilasso_la_LIBADD = $(top_builddir)/lasso/liblasso.la $(LASSO_LIBS)
diff --git a/bindings/php5/Makefile.am b/bindings/php5/Makefile.am
index b40bf95a..205f72cf 100644
--- a/bindings/php5/Makefile.am
+++ b/bindings/php5/Makefile.am
@@ -16,9 +16,7 @@ php_configdir=@PHP5_CONFIG_DIR@
 php_config_DATA = lasso.ini
 
 lasso_la_CFLAGS = -fno-strict-aliasing $(LASSO_CORE_CFLAGS) -I$(top_srcdir) -I$(top_builddir) $(PHP5_INCLUDES) $(AM_CFLAGS)
-if DEBUGGING
 lasso_la_CFLAGS += -Wno-unused-parameter
-endif
 lasso_la_LDFLAGS = -export-dynamic -prefer-pic -module -avoid-version
 lasso_la_LIBADD = $(top_builddir)/lasso/liblasso.la $(LASSO_LIBS) $(PHP5_LDFLAGS)
 nodist_lasso_la_SOURCES = _lasso.c
diff --git a/bindings/python/wrapper_top.c b/bindings/python/wrapper_top.c
index 3a710ab7..b40c39f5 100644
--- a/bindings/python/wrapper_top.c
+++ b/bindings/python/wrapper_top.c
@@ -3,6 +3,7 @@
 #include <lasso/lasso.h>
 #include <config.h>
 #include "../ghashtable.h"
+#include "../../lasso/debug.h"
 
 GQuark lasso_wrapper_key;
 
@@ -375,12 +376,12 @@ failure:
 static void
 PyGObjectPtr_dealloc(PyGObjectPtr *self)
 {
-#ifdef LASSO_DEBUG
-	fprintf(stderr, "dealloc (%p ptr to %p (type:%s, rc:%d))\n",
-			self, self->obj,
-			G_OBJECT_TYPE_NAME(self->obj),
-			self->obj->ref_count);
-#endif
+	if (lasso_flag_memory_debug) {
+		fprintf(stderr, "dealloc (%p ptr to %p (type:%s, rc:%d))\n",
+				self, self->obj,
+				G_OBJECT_TYPE_NAME(self->obj),
+				self->obj->ref_count);
+	}
 	g_object_set_qdata_full(self->obj, lasso_wrapper_key, NULL, NULL);
 	g_object_unref(self->obj);
 	Py_XDECREF(self->typename);