From fca71f44066327864cf717beee598df224523b10 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 14 Oct 2003 00:48:09 +0000
Subject: [PATCH] Add compile -O flag only for non-debug mode, per Tom

---
 configure    |  9 +++++----
 configure.in | 11 ++++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/configure b/configure
index 0ee499a304..f376dc92ef 100755
--- a/configure
+++ b/configure
@@ -2393,12 +2393,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test "$ac_env_CFLAGS_set" = set; then
   CFLAGS=$ac_env_CFLAGS_value
 fi
-# configure sets CFLAGS to -O2 for gcc, so this is only for non-gcc
-if test x"$CFLAGS" = x""; then
-	CFLAGS="-O"
-fi
 if test "$enable_debug" = yes && test "$ac_cv_prog_cc_g" = yes; then
   CFLAGS="$CFLAGS -g"
+else
+  # configure sets CFLAGS to -O2 for gcc, so this is only for non-gcc
+  if test x"$CFLAGS" = x""; then
+    CFLAGS="-O"
+  fi
 fi
 { echo "$as_me:$LINENO: using CFLAGS=$CFLAGS" >&5
 echo "$as_me: using CFLAGS=$CFLAGS" >&6;}
diff --git a/configure.in b/configure.in
index 18d612729b..5a6d855826 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $Header: /cvsroot/pgsql/configure.in,v 1.294 2003/10/09 03:20:33 momjian Exp $
+dnl $Header: /cvsroot/pgsql/configure.in,v 1.295 2003/10/14 00:48:09 momjian Exp $
 dnl
 dnl Developers, please strive to achieve this order:
 dnl
@@ -238,12 +238,13 @@ AC_PROG_CC([$pgac_cc_list])
 if test "$ac_env_CFLAGS_set" = set; then
   CFLAGS=$ac_env_CFLAGS_value
 fi
-# configure sets CFLAGS to -O2 for gcc, so this is only for non-gcc
-if test x"$CFLAGS" = x""; then	
-	CFLAGS="-O"
-fi
 if test "$enable_debug" = yes && test "$ac_cv_prog_cc_g" = yes; then
   CFLAGS="$CFLAGS -g"
+else
+  # configure sets CFLAGS to -O2 for gcc, so this is only for non-gcc
+  if test x"$CFLAGS" = x""; then	
+    CFLAGS="-O"
+  fi
 fi
 AC_MSG_NOTICE([using CFLAGS=$CFLAGS])