From d01db8617489daf208f8a788184263fe65ec1ec3 Mon Sep 17 00:00:00 2001
From: Bill Wendling <wendling@ncsa.uiuc.edu>
Date: Wed, 19 Nov 2003 10:21:17 -0500
Subject: [svn-r7857] Purpose:     Bug fix

Description:
    If using g++ on HP-UX, the flags for aCC would be placed on the
    command line. This was causing g++ to fail the configuration test.

Solution:
    CHanged the test so that it's a case statement. If it's the aCC
    compiler, then use those flags. Otherwise, don't specify flags. This
    case statement can be modified to provide compiler-specific flags in
    a similar way to other config/* files.

Platforms tested:
    Hp-UX (Hp-UX specific change.)

Misc. update:
---
 config/hpux11.00 | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/config/hpux11.00 b/config/hpux11.00
index 6fd2ccc..574c209 100644
--- a/config/hpux11.00
+++ b/config/hpux11.00
@@ -74,14 +74,25 @@ if test -z "$CXX"; then
   CXX_BASENAME=aCC
 fi
 
-if test -z "$cxx_flags_set"; then
-  # +Z for PIC, +A for using archived libraries
-  CXXFLAGS="$CXXFLAGS +Z +A"
-  CFLAGS="$CFLAGS -g +O2"
-  DEBUG_CXXFLAGS=-g
-  DEBUG_CPPFLAGS=
-  PROD_CXXFLAGS="-O -s"
-  PROD_CPPFLAGS=
-  PROFILE_CPPFLAGS=
-  cxx_flags_set=yes
-fi
+case "X-$CXX" in
+  X-aCC)
+    # +Z for PIC, +A for using archived libraries
+    CXXFLAGS="$CXXFLAGS +Z +A"
+    CFLAGS="$CFLAGS -g +O2"
+    DEBUG_CXXFLAGS=-g
+    DEBUG_CPPFLAGS=
+    PROD_CXXFLAGS="-O -s"
+    PROD_CPPFLAGS=
+    PROFILE_CPPFLAGS=
+    ;;
+
+  *)
+    CXXFLAGS="$CXXFLAGS"
+    CFLAGS="$CFLAGS"
+    DEBUG_CXXFLAGS=
+    DEBUG_CPPFLAGS=
+    PROD_CXXFLAGS=
+    PROD_CPPFLAGS=
+    PROFILE_CPPFLAGS=
+    ;;
+esac
-- 
cgit v0.12