From ee2b36ad7be6aed6fc14b04ff6aa9faacda78cd8 Mon Sep 17 00:00:00 2001
From: Albert Cheng <acheng@hdfgroup.org>
Date: Thu, 28 Jan 1999 19:16:36 -0500
Subject: [svn-r1037] All IRIX (old 32bit OS) version 6.x can use the same
 configuration. Replaced irix6.2 by irix6.x.

---
 MANIFEST         |  2 +-
 bin/config.guess |  5 ++++-
 config/irix6.2   | 43 -------------------------------------------
 config/irix6.x   | 43 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 48 insertions(+), 45 deletions(-)
 delete mode 100644 config/irix6.2
 create mode 100644 config/irix6.x

diff --git a/MANIFEST b/MANIFEST
index c842cd9..3400a2f 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -48,7 +48,7 @@
 ./config/hpux9.03
 ./config/intel-osf1
 ./config/irix5.3
-./config/irix6.2
+./config/irix6.x
 ./config/irix64
 ./config/linux
 ./config/powerpc-ibm-aix4.2.1.0
diff --git a/bin/config.guess b/bin/config.guess
index 03f0dcd..c036193 100755
--- a/bin/config.guess
+++ b/bin/config.guess
@@ -150,9 +150,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
 	echo m68k-tektronix-bsd
 	exit 0 ;;
-    *:IRIX64:*:*)
+    *:IRIX64:*:*)		# IRIX64 all versions
 	echo mips-sgi-irix64
 	exit 0 ;;
+    *:IRIX*:6.*:*)		# IRIX all 6.x versions
+	echo mips-sgi-irix6.x
+	exit 0 ;;
     *:IRIX*:*:*)
 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
 	exit 0 ;;
diff --git a/config/irix6.2 b/config/irix6.2
deleted file mode 100644
index bff3a5f..0000000
--- a/config/irix6.2
+++ /dev/null
@@ -1,43 +0,0 @@
-#							-*- shell-script -*-
-#
-# This file is part of the HDF5 build script.  It is processed shortly
-# after configure starts and defines, among other things, flags for
-# the various compile modes.
-#
-# See BlankForm in this directory for details
-
-# The default compiler is `cc' and there is no ranlib.
-if test "X-" =  "X-$CC"; then
-    CC=cc
-    CC_BASENAME=cc
-fi
-RANLIB=:
-
-case "X-$CC_BASENAME" in
-    X-gcc)
-	CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions
-	DEBUG_CFLAGS="-g -fverbose-asm"
-	DEBUG_CPPFLAGS="-DH5F_OPT_SEEK=0 -DH5F_LOW_DFLT=H5F_LOW_SEC2"
-	PROD_CFLAGS="-O3"
-	PROD_CPPFLAGS=
-	PROFILE_CFLAGS="-pg"
-	PROFILE_CPPFLAGS=
-	;;
-
-    *)
-	# Always turn off these compiler warnings:
-	#    1174:  function declared but not used
-	#    1429:  the `long long' type is not standard
-	#    1209:  constant expressions
-	#    1196:  __vfork() (this is an SGI config problem)
-	# Always turn off these loader warnings:
-	#      84:  a library is not used
-	CFLAGS="$CFLAGS -ansi -n32 -woff 1174,1429,1209,1196 -Wl,-woff,84"
-	DEBUG_CFLAGS=-g
-	DEBUG_CPPFLAGS=
-	PROD_CFLAGS=-O
-	PROD_CPPFLAGS=
-	PROFILE_CFLAGS=-pg
-	PROFILE_CPPFLAGS=
-	;;
-esac
diff --git a/config/irix6.x b/config/irix6.x
new file mode 100644
index 0000000..bff3a5f
--- /dev/null
+++ b/config/irix6.x
@@ -0,0 +1,43 @@
+#							-*- shell-script -*-
+#
+# This file is part of the HDF5 build script.  It is processed shortly
+# after configure starts and defines, among other things, flags for
+# the various compile modes.
+#
+# See BlankForm in this directory for details
+
+# The default compiler is `cc' and there is no ranlib.
+if test "X-" =  "X-$CC"; then
+    CC=cc
+    CC_BASENAME=cc
+fi
+RANLIB=:
+
+case "X-$CC_BASENAME" in
+    X-gcc)
+	CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions
+	DEBUG_CFLAGS="-g -fverbose-asm"
+	DEBUG_CPPFLAGS="-DH5F_OPT_SEEK=0 -DH5F_LOW_DFLT=H5F_LOW_SEC2"
+	PROD_CFLAGS="-O3"
+	PROD_CPPFLAGS=
+	PROFILE_CFLAGS="-pg"
+	PROFILE_CPPFLAGS=
+	;;
+
+    *)
+	# Always turn off these compiler warnings:
+	#    1174:  function declared but not used
+	#    1429:  the `long long' type is not standard
+	#    1209:  constant expressions
+	#    1196:  __vfork() (this is an SGI config problem)
+	# Always turn off these loader warnings:
+	#      84:  a library is not used
+	CFLAGS="$CFLAGS -ansi -n32 -woff 1174,1429,1209,1196 -Wl,-woff,84"
+	DEBUG_CFLAGS=-g
+	DEBUG_CPPFLAGS=
+	PROD_CFLAGS=-O
+	PROD_CPPFLAGS=
+	PROFILE_CFLAGS=-pg
+	PROFILE_CPPFLAGS=
+	;;
+esac
-- 
cgit v0.12