Merge branch 'maint'

Conflicts:
	lib/libalpm/dload.c

1 files changed, 1 insertions, 1 deletions

diff --git a/configure.ac b/configure.ac
index 90be362e..b2164b9e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -284,7 +284,7 @@ if test "x$debug" = "xyes" ; then
 	# Check for -fstack-protector availability
 	GCC_STACK_PROTECT_LIB
 	GCC_STACK_PROTECT_CC
-	CFLAGS="$CFLAGS -Wall -Werror"
+	CFLAGS="$CFLAGS -g -Wall -Werror"
 else
 	AC_MSG_RESULT(no)
 	CFLAGS="$CFLAGS -Wall"