[svn-r29134] Updated config/solaris to use the latest configure option

and compiler flag scheme.

Tested on: Solaris 11.1 (emu) w/ SunPro 5.12 CC/FC/CXX
           autotools serial

1 files changed, 70 insertions, 21 deletions

diff --git a/config/solaris b/config/solaris
index 310c373..72d7423 100644
--- a/config/solaris
+++ b/config/solaris
@@ -32,16 +32,32 @@ fi
 # Try solaris native compiler flags
 if test "X-" = "X-$cc_flags_set"; then
   H5_CFLAGS="$H5_CFLAGS -erroff=%none -DBSD_COMP"
+
+  # Production
+  # NDEBUG is handled explicitly by the configure script
+  PROD_CFLAGS=
+
+  # Debug
+  # NDEBUG is handled explicitly by the configure script
+  # -g is hanled by the symbols flags
+  DEBUG_CFLAGS=
+
+  # Symbols
+  NO_SYMBOLS_CFLAGS="-s"
+  SYMBOLS_CFLAGS="-g"
+
+  # Profile
+  PROFILE_CFLAGS="-xpg"
+
+  # Optimization
   # -g produces rather slow code. "-g -O" produces much faster code with some
   # loss of debugger functions such as not able to print local variables.
-  DEBUG_CFLAGS="-g -O"
-  DEBUG_CPPFLAGS=
-  PROD_CFLAGS="-O -s"
-  PROD_CPPFLAGS=
-  PROFILE_CFLAGS=-xpg
-  PROFILE_CPPFLAGS=
+  HIGH_OPT_CFLAGS="-O"
+  DEBUG_OPT_CFLAGS="-O"
+  NO_OPT_CFLAGS=
+
   cc_flags_set=yes
-# Special linking flag is needed to build with Fortran on Solaris 5.9
+    # Special linking flag is needed to build with Fortran on Solaris 5.9
     system_version="`uname -r`"
     case "$system_version" in
 	5.9*)
@@ -52,10 +68,6 @@ if test "X-" = "X-$cc_flags_set"; then
 	    ;;
     esac
 
-  # Turn off optimization flag for SUNpro compiler versions 4.x which
-  # have an optimization bug.  Version 5.0 works.
-  ($CC -V 2>&1) | grep -s 'cc: .* C 4\.' >/dev/null 2>&1 \
-       && PROD_CFLAGS="`echo $PROD_CFLAGS | sed -e 's/-O//'`"
 fi
 
 LIBS="$LIBS"
@@ -69,12 +81,34 @@ fi
 if test "X-" = "X-$f9x_flags_set"; then
   F9XSUFFIXFLAG=""
   FSEARCH_DIRS=""
+
   H5_FCFLAGS="$H5_FCFLAGS"
+
+  # TODO: Revisit these flags.
+
+  # Production
+  # NDEBUG is handled explicitly by the configure script
+  PROD_FCFLAGS=
+
+  # Debug
+  # NDEBUG is handled explicitly by the configure script
+  # -g is hanled by the symbols flags
+  DEBUG_FCFLAGS=
+
+  # Symbols
+  NO_SYMBOLS_FCFLAGS=
+  SYMBOLS_FCFLAGS="-g"
+
+  # Profile
+  PROFILE_FCFLAGS=
+
+  # Optimization
   # -g produces rather slow code. "-g -O" produces much faster code with some
   # loss of debugger functions such as not able to print local variables.
-  DEBUG_FCFLAGS="-g -O"
-  PROD_FCFLAGS="-O2"
-  PROFILE_FCFLAGS=""
+  HIGH_OPT_FCFLAGS="-O2"
+  DEBUG_OPT_FCFLAGS="-O"
+  NO_OPT_FCFLAGS=
+
   f9x_flags_set=yes
 fi
 
@@ -107,14 +141,30 @@ fi
 if test -z "$cxx_flags_set"; then
   H5_CXXFLAGS="$H5_CXXFLAGS -instances=static"
   H5_CPPFLAGS="$H5_CPPFLAGS -LANG:std"
+
+  # Production
+  # NDEBUG is handled explicitly by the configure script
+  PROD_CXXFLAGS=
+
+  # Debug
+  # NDEBUG is handled explicitly by the configure script
+  # -g is hanled by the symbols flags
+  DEBUG_CXXFLAGS=
+
+  # Symbols
+  NO_SYMBOLS_CXXFLAGS="-s"
+  SYMBOLS_CXXFLAGS="-g"
+
+  # Profile
+  PROFILE_CXXFLAGS="-xpg"
+
+  # Optimization
   # -g produces rather slow code. "-g -O" produces much faster code with some
   # loss of debugger functions such as not able to print local variables.
-  DEBUG_CXXFLAGS="-g -O"
-  DEBUG_CPPFLAGS=
-  PROD_CXXFLAGS="-O -s"
-  PROD_CPPFLAGS=
-  PROFILE_CXXFLAGS=-xpg
-  PROFILE_CPPFLAGS=
+  HIGH_OPT_CXXFLAGS="-O"
+  DEBUG_OPT_CXXFLAGS="-O"
+  NO_OPT_CXXFLAGS=
+
   cxx_flags_set=yes
 fi
 
@@ -156,4 +206,3 @@ case $CXX in
         ;;
 esac
 
-