--- rxvt-unicode/autoconf/configure.in	2005/01/11 04:44:57	1.45
+++ rxvt-unicode/autoconf/configure.in	2005/01/17 00:59:23	1.46
@@ -2,6 +2,8 @@
 dnl#
 dnl# Process this file with autoconf to produce a configure script.
 dnl#
+orig_CXXFLAGS="$CXXFLAGS"
+
 AC_INIT
 AC_CONFIG_SRCDIR([src/feature.h])
 AC_CONFIG_AUX_DIR(autoconf)
@@ -35,6 +37,17 @@
 
 AC_LANG(C)
 
+dnl# --------------------------------------------------------------------------
+dnl# Supply default CFLAGS, if not specified by `CFLAGS=flags ./configure'
+dnl#
+if test -z "$orig_CXXFLAGS"; then
+  CXXFLAGS='-O'
+  if test x$GCC = xyes && test "x$GXX" = xyes; then
+    CXXFLAGS="-g -O3"
+  fi
+  CFLAGS="$CXXFLAGS"
+fi
+
 LINKER="$CXX"
 if test x$GCC = xyes && test x$GXX = xyes; then
    AC_CHECK_LIB(supc++, main, [
@@ -447,21 +460,6 @@
 
 AC_DEFINE(PROTOTYPES, 1, Define if you need function prototypes)
 
-dnl# --------------------------------------------------------------------------
-dnl# Supply default CFLAGS, if not specified by `CFLAGS=flags ./configure'
-dnl#
-if test -z "$CFLAGS"; then
-    if test -z "$CCOPTS"; then
-	CCOPTS='-O'
-dnl>	if test "x$GCC" = xyes; then
-dnl>	    if test x$system = xLinux; then
-dnl>		CCOPTS="$CCOPTS "'-O2 -fno-strength-reduce'
-dnl>	    fi
-dnl>	fi
-    fi
-    CFLAGS="$CCOPTS"
-fi
-
 AC_PATH_PROG(MV, mv, mv)
 AC_PATH_PROG(RM, rm, rm)
 AC_PATH_PROG(CP, cp, cp)