From da5058310c324dcce93dc9328ef2bd53bf1fed02 Mon Sep 17 00:00:00 2001
From: Mike McGreevy <mamcgree@hdfgroup.org>
Date: Mon, 9 Mar 2009 12:50:53 -0500
Subject: [svn-r16554] Purpose:

    Bug Fix

Description:

    Removing the code from configure which strips the '-g' flag from CFLAGS
    when in production mode. The current default CFLAGS in production mode
    does not include '-g', as intended, but we should allow users to
    override this and enable '-g' by setting the CFLAGS environment variable
    if desired. Note that this applies to FCFLAGS and CXXFLAGS as well.

Tested:

    kagiso, linew, liberty
---
 configure                | 33 +--------------------------------
 configure.in             | 33 ---------------------------------
 release_docs/RELEASE.txt |  3 +++
 3 files changed, 4 insertions(+), 65 deletions(-)

diff --git a/configure b/configure
index 2807899..91201b7 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 16525 2009-03-01 15:35:48Z hdftest .
+# From configure.in Id: configure.in 16553 2009-03-08 12:53:10Z lrknox .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for HDF5 1.9.35.
 #
@@ -21620,37 +21620,6 @@ case "X-$enable_production" in
     enable_production="yes"
     { echo "$as_me:$LINENO: result: production" >&5
 echo "${ECHO_T}production" >&6; }
-
-            CFLAGS_temp=""
-    if test -n "$CFLAGS"; then
-      for d in $CFLAGS ; do
-        if test "X$d" != "X-g"; then
-          CFLAGS_temp="$CFLAGS_temp $d"
-        fi
-      done
-      CFLAGS=$CFLAGS_temp
-    fi
-
-    CXXFLAGS_temp=""
-    if test -n "$CXXFLAGS"; then
-      for d in $CXXFLAGS ; do
-        if test "X$d" != "X-g"; then
-          CXXFLAGS_temp="$CXXFLAGS_temp $d"
-        fi
-      done
-      CXXFLAGS=$CXXFLAGS_temp
-    fi
-
-    FCFLAGS_temp=""
-    if test -n "$FCFLAGS"; then
-      for d in $FCFLAGS ; do
-        if test "X$d" != "X-g"; then
-          FCFLAGS_temp="$FCFLAGS_temp $d"
-        fi
-      done
-      FCFLAGS=$FCFLAGS_temp
-    fi
-
     CONFIG_MODE=production
     H5_CFLAGS="$H5_CFLAGS $PROD_CFLAGS"
     H5_CPPFLAGS="$H5_CPPFLAGS $PROD_CPPFLAGS"
diff --git a/configure.in b/configure.in
index 32d9d59..229209d 100644
--- a/configure.in
+++ b/configure.in
@@ -1142,39 +1142,6 @@ case "X-$enable_production" in
   X-yes)
     enable_production="yes"
     AC_MSG_RESULT([production])
-
-    dnl Remove the "-g" flag from CFLAGS if it's in there.
-    dnl
-    CFLAGS_temp=""
-    if test -n "$CFLAGS"; then
-      for d in $CFLAGS ; do
-        if test "X$d" != "X-g"; then
-          CFLAGS_temp="$CFLAGS_temp $d"
-        fi
-      done
-      CFLAGS=$CFLAGS_temp
-    fi
-
-    CXXFLAGS_temp=""
-    if test -n "$CXXFLAGS"; then
-      for d in $CXXFLAGS ; do
-        if test "X$d" != "X-g"; then
-          CXXFLAGS_temp="$CXXFLAGS_temp $d"
-        fi
-      done
-      CXXFLAGS=$CXXFLAGS_temp
-    fi
-
-    FCFLAGS_temp=""
-    if test -n "$FCFLAGS"; then
-      for d in $FCFLAGS ; do
-        if test "X$d" != "X-g"; then
-          FCFLAGS_temp="$FCFLAGS_temp $d"
-        fi
-      done
-      FCFLAGS=$FCFLAGS_temp
-    fi
-
     CONFIG_MODE=production
     H5_CFLAGS="$H5_CFLAGS $PROD_CFLAGS"
     H5_CPPFLAGS="$H5_CPPFLAGS $PROD_CPPFLAGS"
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 1190df9..06a8108 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -230,6 +230,9 @@ Bug Fixes since HDF5-1.8.0 release
 
     Configuration
     -------------
+    - Configure no longer removes the '-g' flag from CFLAGS when in production
+      mode if it has been explicitly set in the CFLAGS environment variable 
+      prior to configuration. MAM - 2009/03/09 - BZ #1401.
     - Fixed error with 'make check install' failing due to h5dump
       needing other tools built first. MAM - 2008/10/24.
     - When using shared szip, it is no longer necessary to specify
-- 
cgit v0.12