diff --git a/configure b/configure
index 41d08a5876..ac712aadba 100755
--- a/configure
+++ b/configure
@@ -2860,13 +2860,13 @@ if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
-    CFLAGS="-O3"
+    CFLAGS="-g -O2"
   else
-    CFLAGS=
+    CFLAGS="-g"
   fi
 else
   if test "$GCC" = yes; then
-    CFLAGS="-O3"
+    CFLAGS="-O2"
   else
     CFLAGS=
   fi
@@ -6297,6 +6297,10 @@ fi
 # Debug
 #
 case $enable_debug in
+	"no")
+		# default value
+		CPPFLAGS="$CPPFLAGS"
+		;;
 	"yes")
 		if test $ac_cv_prog_cc_g = yes; then
 		    CPPFLAGS="$CPPFLAGS -g -DDEBUG"
@@ -6309,15 +6313,12 @@ case $enable_debug in
 	"gdb")
 		if test $ac_cv_prog_cc_g = yes; then
 		    CPPFLAGS="$CPPFLAGS -ggdb -DDEBUG"
-		    LDFLAGS="$LDFLAGS -ggdb"
+		    LDFLAGS="$LDFLAGS -g"
 		else
 		    echo "error: --enable-debug flag=$enable_debug entered but the compiler does not support -g"
 		    exit 1
                 fi
 		;;
-	*) # default value
-		CPPFLAGS="$CPPFLAGS"
-		;;
 esac
 
 #
@@ -7378,8 +7379,8 @@ else
 $as_echo "no" >&6; }
 fi
 
-CFLAGS_AR="$OPT_LTO_AR $CFLAGS"
 CFLAGS="$OPT_LTO $CFLAGS"
+CFLAGS_AR="$OPT_LTO_AR $CFLAGS"
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: Configure finish" >&5
diff --git a/configure.in b/configure.in
index 80fee172d4..3d55d504f0 100644
--- a/configure.in
+++ b/configure.in
@@ -962,6 +962,10 @@ fi
 # Debug
 #
 case $enable_debug in
+	"no")
+		# default value
+		CPPFLAGS="$CPPFLAGS"
+		;;
 	"yes")
 		if test $ac_cv_prog_cc_g = yes; then
 		    CPPFLAGS="$CPPFLAGS -g -DDEBUG"
@@ -974,15 +978,12 @@ case $enable_debug in
 	"gdb")
 		if test $ac_cv_prog_cc_g = yes; then
 		    CPPFLAGS="$CPPFLAGS -ggdb -DDEBUG"
-		    LDFLAGS="$LDFLAGS -ggdb"
+		    LDFLAGS="$LDFLAGS -g"
 		else
 		    echo "error: --enable-debug flag=$enable_debug entered but the compiler does not support -g"
 		    exit 1
                 fi
 		;;
-	*) # default value
-		CPPFLAGS="$CPPFLAGS"
-		;;
 esac
 
 #
@@ -1260,8 +1261,8 @@ else
 	AC_MSG_RESULT([no])
 fi
 
-CFLAGS_AR="$OPT_LTO_AR $CFLAGS"
 CFLAGS="$OPT_LTO $CFLAGS" 
+CFLAGS_AR="$OPT_LTO_AR $CFLAGS"
 AC_SUBST([CFLAGS_AR])
 
 AC_MSG_NOTICE([Configure finish])