diff --git a/Rules.make.in b/Rules.make.in
index 6167343bb..c7e00d82b 100644
--- a/Rules.make.in
+++ b/Rules.make.in
@@ -11,7 +11,7 @@
 
 # Compile commands
 CC=gcc
-CCLD=gcc
+CCLD=$(CC)
 RM=rm -f
 MAKE=make
 
diff --git a/configure.in b/configure.in
index e159df605..4a8ecb485 100644
--- a/configure.in
+++ b/configure.in
@@ -80,10 +80,7 @@ AC_ARG_ENABLE(debug,
 if test "$enable_debug" != "yes" -a "$enable_profile" != "yes"; then
     DEBUG_CFLAGS="-O2 -pipe -fsigned-char -fomit-frame-pointer -fexpensive-optimizations -ffast-math"
 else
-    DEBUG_CFLAGS="-g -O1 -fsigned-char -Wsign-compare"
-	if test "$enable_debug" == "yes"; then
-		DEBUG_CFLAGS="$DEBUG_CFLAGS -Werror -Wall -DDEBUG"
-	fi
+    DEBUG_CFLAGS="-g -O1 -fsigned-char -Wsign-compare -Werror -Wall -DDEBUG"
 fi
 AC_SUBST(DEBUG_CFLAGS)