--- a/configure.in	Thu Aug 24 05:06:45 1995 +0000
+++ b/configure.in	Thu Aug 24 20:37:21 1995 +0000
@@ -20,7 +20,7 @@
 ### along with Octave; see the file COPYING.  If not, write to the Free
 ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-AC_REVISION($Revision: 1.127 $)
+AC_REVISION($Revision: 1.128 $)
 AC_PREREQ(2.0)
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h)
@@ -268,6 +268,8 @@
 
 ### See which C++ compiler to use (we expect to find g++).
 
+EXTERN_CXXFLAGS="$CXXFLAGS"
+
 AC_PROG_CXX
 AC_PROG_CXXCPP
 
@@ -280,9 +282,7 @@
 changequote(,)dnl
   2.[6789].*|2.[123456789][0123456789].*)
 changequote([,])dnl
-    if test -z "$CXXFLAGS"; then
-      CXXFLAGS="-g -O"
-      AC_MSG_RESULT([defining CXXFLAGS to be $CXXFLAGS])
+    if test -z "$EXTERN_CXXFLAGS"; then
       ADD_CXX_WALL=true
     fi
     NO_IMPLICIT_TEMPLATES="-fno-implicit-templates"
@@ -311,11 +311,12 @@
 esac
 
 AC_SUBST(HOST_CXXFLAGS)
-AC_SUBST(CXXFLAGS)
 AC_SUBST(NO_IMPLICIT_TEMPLATES)
 
 ### See which C compiler to use (we expect to find gcc).
 
+EXTERN_CFLAGS="$CFLAGS"
+
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_GCC_TRADITIONAL
@@ -326,9 +327,7 @@
 gcc_version=`$CC -v 2>&1 | grep "^.*gcc version" | sed 's/^.*gcc version *//'`
 case "$gcc_version" in
   2.*)
-    if test -z "$CFLAGS"; then
-      CFLAGS="-g -O"
-      AC_MSG_RESULT([defining CFLAGS to be $CFLAGS])
+    if test -z "$EXTERN_CFLAGS"; then
       ADD_CC_WALL=true
     fi
     if test -z "$LDFLAGS"; then
@@ -344,9 +343,6 @@
   ;;
 esac
 
-AC_SUBST(CFLAGS)
-AC_SUBST(LDFLAGS)
-
 ### On Linux systems we need to compile with -mieee-fp to get full
 ### support for IEEE floating point.