diff --git a/Makefile.am b/Makefile.am
index 3af8ee06f7..c3493583b2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -239,7 +239,7 @@ libs/apr-util/libaprutil-1.la: libs/apr-util libs/apr-util/.update libs/apr/liba
 	@$(TOUCH_TARGET)
 
 libs/sqlite/libsqlite3.la: libs/sqlite libs/sqlite/.update
-	@cd libs/sqlite && $(MAKE)
+	@cd libs/sqlite && $(MAKE) CFLAGS="$(SWITCH_AM_CFLAGS)"
 	@$(TOUCH_TARGET)
 
 libs/pcre/libpcre.la: libs/pcre libs/pcre/.update
diff --git a/configure.in b/configure.in
index 2baac9ab11..5b1f780260 100644
--- a/configure.in
+++ b/configure.in
@@ -60,14 +60,6 @@ if test "${enable_optimizer}" = "yes" ; then
         AX_CC_MAXOPT
 fi
 
-#  Enable debugging
-AC_ARG_ENABLE(debug,
-[AC_HELP_STRING([--enable-debug],[build with debug information])],[enable_debug="$enable_debug"],[enable_debug="yes"])
-
-if test "${enable_debug}" = "yes"; then
-        AC_DEFINE([DEBUG],[],[Enable extra debugging.])
-        AX_CFLAGS_WARN_ALL_ANSI
-fi
 
 AM_CONDITIONAL([WANT_DEBUG],[test "${enable_debug}" = "yes"])
 
@@ -147,6 +139,21 @@ elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
     APR_ADDTO(SWITCH_AM_CFLAGS, -Werror)
 fi
 
+#  Enable debugging
+AC_ARG_ENABLE(debug,
+[AC_HELP_STRING([--enable-debug],[build with debug information])],[enable_debug="$enable_debug"],[enable_debug="yes"])
+
+if test "${enable_debug}" = "yes"; then
+        AC_DEFINE([DEBUG],[],[Enable extra debugging.])
+        AX_CFLAGS_WARN_ALL_ANSI
+
+	if test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
+	    APR_ADDTO(SWITCH_AM_CFLAGS, -g -ggdb)
+	fi
+
+fi
+
+
 # tweak platform specific flags
 case "$host" in
     *darwin*)
diff --git a/libs/sqlite/src/sqliteInt.h b/libs/sqlite/src/sqliteInt.h
index f638b5592e..64d0b9f50f 100644
--- a/libs/sqlite/src/sqliteInt.h
+++ b/libs/sqlite/src/sqliteInt.h
@@ -269,9 +269,18 @@ extern int sqlite3_iLine;            /* Line number for debug info */
 
 #else
 
+static inline void *zmalloc(size_t x)
+{
+	void *z = malloc(x);
+	assert(z);
+	memset(z, 0, x);
+	return z;
+}
+
+
 #define ENTER_MALLOC 0
-#define sqliteMalloc(x)          sqlite3Malloc(x,1)
-#define sqliteMallocRaw(x)       sqlite3MallocRaw(x,1)
+#define sqliteMalloc(x)          zmalloc(x)//sqlite3Malloc(x,1)
+#define sqliteMallocRaw(x)       malloc(x)//sqlite3MallocRaw(x,1)
 #define sqliteRealloc(x,y)       sqlite3Realloc(x,y)
 #define sqliteStrDup(x)          sqlite3StrDup(x)
 #define sqliteStrNDup(x,y)       sqlite3StrNDup(x,y)