[svn-r7269] Purpose:

    Update

Description:
    Revamped the configuration system. The configurations for the Fortran
    and C++ libraries are no longer separate from the "main"
    configuration system. This involved removing the "configure*" and
    "aclocal.m4" files from the fortran/ and c++/ subdirectories. Also
    merging settings in the config/ subdirectories into the main config/
    subdirectory.

    Fortran header files had to be modified a little for Linux. It was
    checking if it was a Linux machine by some #defines, however with the
    -std=c99 switch, these defines weren't there. I added a check for
    some other ones which should be there whether the -std=c99 switch is
    used or not.

Platforms tested:
    Verbena (Fortran & C++)
    Sol (Fortran & C++)
    Copper (Fortran & C++)
    Modi4 (Parallel, Fortran, & C++)

Misc. update:

1 files changed, 127 insertions, 68 deletions

diff --git a/config/irix6.x b/config/irix6.x
index a79613a..a8a6b6f 100644
--- a/config/irix6.x
+++ b/config/irix6.x
@@ -7,77 +7,136 @@
 # See BlankForm in this directory for details.
 
 # Use SGI supplied C compiler by default.  There is no ranlib
-if test "X-" =  "X-$CC"; then
-    CC='cc'
-    CC_BASENAME=cc
+if test "X-" = "X-$CC"; then
+  CC='cc'
+  CC_BASENAME=cc
 fi
 RANLIB=:
 
 # Compiler flags
 case "X-$CC_BASENAME" in
-    X-gcc)
-	. $srcdir/config/gnu-flags
-	;;
-
-    *)
-	if [ "$CC_BASENAME" = cc ] || 
-	    ($CC -version 2>&1 | grep -s "MIPSpro Compilers") 2>&1 > /dev/null
-	then
-	    # use these flags if this is the SGI cc compiler or some compiler
-	    # command that eventually uses the SGI cc compiler.
-
-	    # Check for old versions of the compiler that don't work right.
-	    case "`$CC -version 2>&1 |head -1`" in
-		"Mongoose Compilers: Version 7.00")
-		    echo "  +---------------------------------------------------+"
-		    echo "  | You have an old version of cc (Mongoose Compilers |"
-		    echo "  | version 7.00).  Please upgrade to MIPSpro version |"
-		    echo "  | 7.2.1.2m (patches are available from the SGI web  |"
-		    echo "  | site).  The 7.00 version may generate incorrect   |"
-		    echo "  | code, especially when optimizations are enabled.  |"
-		    echo "  +---------------------------------------------------+"
-		    sleep 5
-		    ;;
-	    esac
-
-	    # Always turn off these compiler warnings for the -64 compiler:
-	    #    1174:  function declared but not used
-	    #    1196:  __vfork() (this is an SGI config problem)
-	    #    1209:  constant expressions
-	    #    1429:  the `long long' type is not standard
-	    #    1685:  turn off warnings about turning off invalid warnings
-	    #    3201:  remark - parameter not referenced
-#	    CFLAGS="$CFLAGS -woff 1174,1429,1209,1196,1685,3201"
-	    CFLAGS="$CFLAGS -woff 1209,3201"
-
-	    # Always turn off these compiler warnings for the old compiler:
-	    #    799:   the `long long' type is not standard
-	    #    803:   turn off warnings about turning off invalid warnings
-	    #    835:   __vfork() (this is an SGI config problem)
-#	    CFLAGS="$CFLAGS -woff 799,803,835"
-
-	    # Always turn off these loader warnings:
-	    # (notice the peculiar syntax)
-	    #      47:  branch instructions that degrade performance on R4000
-	    #      84:  a library is not used
-	    #      85:  duplicate definition preemption (from -lnsl)
-	    #     134:  duplicate weak definition preemption (from -lnsl)
-	    CFLAGS="$CFLAGS -Wl,-woff,47,-woff,84,-woff,85,-woff,134"
-
-            # Always turn on full warnings
-	    CFLAGS="$CFLAGS -fullwarn"
-	fi
-
-	# Extra debugging flags
-	DEBUG_CFLAGS="-g"
-	DEBUG_CPPFLAGS=
-
-	# Extra production flags
-	PROD_CFLAGS="-O -s"
-	PROD_CPPFLAGS=
-
-	# Extra profiling flags
-	PROFILE_CFLAGS=-pg
-	PROFILE_CPPFLAGS=
-	;;
+  X-gcc)
+    . $srcdir/config/gnu-flags
+    ;;
+
+  *)
+    if [ "$CC_BASENAME" = "cc" ] || ($CC -version 2>&1 | grep -s "MIPSpro Compilers") 2>&1 > /dev/null; then
+      # use these flags if this is the SGI cc compiler or some compiler
+      # command that eventually uses the SGI cc compiler.
+
+      # Check for old versions of the compiler that don't work right.
+      case "`$CC -version 2>&1 |head -1`" in
+        "Mongoose Compilers: Version 7.00")
+          echo "  +---------------------------------------------------+"
+          echo "  | You have an old version of cc (Mongoose Compilers |"
+          echo "  | version 7.00).  Please upgrade to MIPSpro version |"
+          echo "  | 7.2.1.2m (patches are available from the SGI web  |"
+          echo "  | site).  The 7.00 version may generate incorrect   |"
+          echo "  | code, especially when optimizations are enabled.  |"
+          echo "  +---------------------------------------------------+"
+          sleep 5
+          ;;
+      esac
+
+      # Always turn off these compiler warnings for the -64 compiler:
+      #    1174:  function declared but not used
+      #    1196:  __vfork() (this is an SGI config problem)
+      #    1209:  constant expressions
+      #    1429:  the `long long' type is not standard
+      #    1685:  turn off warnings about turning off invalid warnings
+      #    3201:  remark - parameter not referenced
+      #CFLAGS="$CFLAGS -woff 1174,1429,1209,1196,1685,3201"
+      CFLAGS="$CFLAGS -woff 1209,3201"
+
+      # Always turn off these compiler warnings for the old compiler:
+      #    799:   the `long long' type is not standard
+      #    803:   turn off warnings about turning off invalid warnings
+      #    835:   __vfork() (this is an SGI config problem)
+      #CFLAGS="$CFLAGS -woff 799,803,835"
+
+      # Always turn off these loader warnings:
+      # (notice the peculiar syntax)
+      #      47:  branch instructions that degrade performance on R4000
+      #      84:  a library is not used
+      #      85:  duplicate definition preemption (from -lnsl)
+      #     134:  duplicate weak definition preemption (from -lnsl)
+      CFLAGS="$CFLAGS -Wl,-woff,47,-woff,84,-woff,85,-woff,134"
+
+      # Always turn on full warnings
+      CFLAGS="$CFLAGS -fullwarn"
+    fi
+
+    # Extra debugging flags
+    DEBUG_CFLAGS="-g"
+    DEBUG_CPPFLAGS=
+
+    # Extra production flags
+    PROD_CFLAGS="-O -s"
+    PROD_CPPFLAGS=
+
+    # Extra profiling flags
+    PROFILE_CFLAGS=-pg
+    PROFILE_CPPFLAGS=
+    ;;
 esac
+
+# The default Fortran 90 compiler
+
+#
+# HDF5 integers
+#
+# 	R_LARGE is the number of digits for the bigest integer supported.
+#	R_INTEGER is the number of digits in INTEGER
+#
+# (for the IRIX architechture)
+#
+R_LARGE=18
+R_INTEGER=9
+HSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HSSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HID_T='SELECTED_INT_KIND(R_INTEGER)'
+SIZE_T='SELECTED_INT_KIND(R_LARGE)'
+OBJECT_NAMELEN_DEFAULT_F=-1
+
+if test "X-" = "X-$F9X"; then
+  F9X="f90"
+fi
+
+if test "X-" = "X-$f9x_flags_set"; then
+  F9XSUFFIXFLAG=""
+  FSEARCH_DIRS=""
+  FFLAGS="-64 -mips4 -O -s"
+  DEBUG_FFLAGS="-64 -mips4 -O -s"
+  PROD_FFLAGS="-64 -mips4 -O -s"
+  PROFILE_FFLAGS="-64 -mips4 -O -s"
+  f9x_flags_set=yes
+fi
+
+# The default C++ compiler
+
+# The default compiler is `MIPSpro CC'
+if test -z "$CXX"; then
+  CXX=CC
+  CXX_BASENAME=CC
+fi
+
+# Try native compiler flags
+if test -z "$cxx_flags_set"; then
+  # -LANG:std required for std use; -ptused causes templates used to be
+  # instantiated
+  CPPFLAGS="-LANG:std -ptused"
+
+  # libCio is a default library, since libtool before 1.5 doesn't fully 
+  # support C++ yet, default libraries must be explicitly specified.
+  # A new macro is used for this temporary and specific task so it 
+  # won't polute the existing configuration 
+  DEFAULT_LIBS="-lCio"
+
+  DEBUG_CXXFLAGS=-g
+  DEBUG_CPPFLAGS=
+  PROD_CXXFLAGS="-O -s"
+  PROD_CPPFLAGS=
+  PROFILE_CXXFLAGS=-xpg
+  PROFILE_CPPFLAGS=
+  cxx_flags_set=yes
+fi