[svn-r907] Changes since 19981111

----------------------

./INSTALL
	Added instructions about specifying a path for GNU zlib and
	HDF4 headers and library.

	Added comments for each of the tool names.  Added h5toh4 as a
	tool name.

./configure.in
./conigure		[REGENERATED]
./src/H5config.h.in	[REGENERATED]
	The config/* scripts get invoked with $CC_BASENAME set the
	base name of the compiler in order to make it easier to handle
	setting compiler flags for different compilers in a big case
	statement.  For instance, if $CC has the value

	    /usr/local/mpi/bin/mpicc -ansi -64

	then $CC_BASENAME will be `mpicc'.  The $CC_BASENAME is not
	set if $CC is not set.

	Fixed alignment in `configure --help'.

	An include and/or library path can be specified for GNU zlib
	if configure can't find it in normal places.  The "normal"
	means wherever your compiler normally searches, including
	search paths you've added through environment variables like
	CPPFLAGS and LDFLAGS.  The INSTALL file has instructions.

	The `-ljpeg' library is detected.

	If `ssize_t' is not found then a #define is added to
	H5config.h similar to what we already do for `size_t'.

	We detect the hdf5 header file `mfhdf.h' and libraries
	`-lmfhdf' and `-ldf' and if found define the H5TOH4 and
	TESTH5TOH4 Makefile variables.  The user can specify an
	include and/or library path. The INSTALL file has
	instructions.

	The `RUNTEST' variable has been split into `RUNSERIAL' and
	`RUNPARALLEL' because these are different commands.  The
	makefile still uses `RUNTEST', which defaults to the RUNSERIAL
	value.  The new testpar/Makefile.in sets RUNTEST to the
	RUNPARALLEL value. The default RUNSERIAL value is empty and
	the default RUNPARALLEL value is `mpirun -np 2'.  These can
	both be overridden in the config/* files.  To make the value
	the empty string set it like `RUNPARALLEL=none' in the
	config/* file.

	The new testpar/Makefile is generated from testpar/Makefile.in

./config/commence.in
	Added the RUNSERIAL and RUNPARALLEL makefile definitions.

./src/Makefile.in
	The `H5detect' program is run with RUNSERIAL, which is empty
	on all platforms except intel-osf1 (ASCI/Red)

./config/conclude.in
	Removed the `.c.a:' implicit rule -- we don't use it any more.

./config/BlankForm
./config/alpha-dec
./config/alpha-dec-osf4.0
./config/freebsd2.2.7
./config/hpux10.20
./config/hpux9.03
./config/intel-osf1
./config/irix5.3
./config/irix6.2
./config/irix64
./config/linux
./config/powerpc-ibm-aix4.2.1.0
./config/rs6000-ibm-aix4.1.4.0
./config/solaris2.5
	All of these files have been updated to hande multiple
	compilers. Most of them assume `cc' if CC is not set. The
	documentation in `BlankForm' has been updated and
	documentation in the other files refer to `BlankForm'.

	The intel-osf1 uses LDFLAGS instead of LIBS to specify the extra
	library search paths.

./examples/Makefile.in
./test/Makefile.in
./tools/Makefile.in
	Simplified by grouping some dependency information together
	more succinctly.

	The tools Makefile.in has been modified to work with the
	`h5toh4' and `testh5toh4' programs.  Until Paul checks these
	in you may have problems compiling.  If so, just create files
	h5toh4.c and testh5toh4.c that contain:

	    #include <stdio.h>
	    int main(int argc, char *argv[]) {
	        fprintf(stderr, "%s: not implemented\n", argv[0]);
		return 1;
	    }

./src/H5public.h
	Removed definition for `ssize_t' since this is now handled by
	configure in H5config.h with a #define.


./MANIFEST
./testpar/Makefile.in	[NEW]
	Added a makefile for parallel tests.  As soon as we get this
	working properly we can remove the other four makefiles in
	that directory and maintain just one.

16 files changed, 284 insertions, 445 deletions

diff --git a/config/BlankForm b/config/BlankForm
index 6b76385..a0eaf92 100644
--- a/config/BlankForm
+++ b/config/BlankForm
@@ -15,15 +15,22 @@
 # Choosing a C Compiler
 # ---------------------
 #
-# Configre will use the value of environment variable `CC' if it is
-# set.  If not then configure checks for a working GNU `gcc' followed
-# by other common compiler names.  If a default compiler is desired
-# then uncomment the following line, replacing `gcc' with the name of
-# the default compiler.
-
-#CC=${CC:-gcc}
-
+# The user should be able to specify the compiler by setting the CC
+# environment variable to the name of the compiler and any switches it 
+# requires for proper operation.  If CC is unset then this script may
+# set it.  If CC is unset by time this script completes then configure 
+# will try `gcc' and `cc' in that order (perhaps some others too).
+#
+# Note: Code later in this file may depend on the value of $CC_BASENAME
+#       in order to distinguish between different compilers when
+#       deciding which compiler command-line switches to use.  This
+#       variable is set based on the incoming value of $CC and is only
+#       used within this file.
 
+if test "X-" =  "X-$CC"; then
+    CC="/some/default/compiler/named/foo -ansi"
+    CC_BASENAME=foo
+fi
 
 
 # C Compiler and Preprocessor Flags
@@ -60,24 +67,30 @@
 #			practices resulting in few if any
 #			warnings.
 #
-# Note:			Warning flags do not have to be added to CFLAGS
+#			Warning flags do not have to be added to CFLAGS
 #			variable if the compiler is the GNU gcc
-#			compiler or a descendent of gcc.
+#			compiler or a descendent of gcc such as EGCS or PGCC.
 #
-# Note:			The CFLAGS should contains *something* or else 
+#			The CFLAGS should contains *something* or else 
 #			configure will probably add `-g'.  For most
 #			systems this isn't a problem but some systems
 #			will disable optimizations in favor of the
 #			`-g'.
 #			
 #
-
-case "$CC" in
-    *gcc*)
+# These flags should be set according to the compiler being used.
+# There are two ways to check the compiler.  You can try using `-v' or 
+# `--version' to see if the compiler will print a version string.  You 
+# can use the value of $CC_BASENAME which is the base name of the
+# first word in $CC (note that the value of CC may have changed
+# above).
+
+case $CC_BASENAME in
+    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="-mcpu=pentiumpro -march=pentiumpro -O3 -finline-functions -malign-double -fomit-frame-pointer -fschedule-insns2"
+	PROD_CFLAGS="-O3 -fomit-frame-pointer"
 	PROD_CPPFLAGS=
 	PROFILE_CFLAGS="-pg"
 	PROFILE_CPPFLAGS=
diff --git a/config/alpha-dec b/config/alpha-dec
index 2c10695..e019ac0 100644
--- a/config/alpha-dec
+++ b/config/alpha-dec
@@ -3,16 +3,9 @@
 # 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.
-
-
-#----------------------------------------------------------------------------
-# Compiler flags. The CPPFLAGS values should not include package debug
-# flags like `-DH5G_DEBUG' since these are added with the
-# `--enable-debug' switch of configure.
-
-# What must *always* be present for things to compile correctly?
-#CFLAGS="$CFLAGS -ansi"
-#CPPFLAGS="$CPPFLAGS -I."
+#
+# See BlankForm in this directory for detailed information.
+#
 
 # What compiler flags should be used for code development?
 DEBUG_CFLAGS=-g
@@ -26,13 +19,3 @@ PROD_CPPFLAGS=
 # What compiler flags enable code profiling?
 PROFILE_CFLAGS=-pg
 PROFILE_CPPFLAGS=
-
-
-#----------------------------------------------------------------------------
-# Values for overriding configuration tests when cross compiling.
-# This includes compiling on some machines where the serial front end
-# compiles for a parallel back end.
-
-# Set this to `yes' or `no' depending on whether the target is big
-# endian or little endian.
-#ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}
diff --git a/config/alpha-dec-osf4.0 b/config/alpha-dec-osf4.0
index 4c9d0db..d439544 100644
--- a/config/alpha-dec-osf4.0
+++ b/config/alpha-dec-osf4.0
@@ -3,68 +3,20 @@
 # 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.
-
-
-#----------------------------------------------------------------------------
-# Compiler flags. The CPPFLAGS values should not include package debug
-# flags like `-DH5G_DEBUG' since these are added with the
-# `--enable-debug' switch of configure.
-#----------------------------------------------------------------------------
-
-
-# Choosing a C Compiler
-# ---------------------
 #
-# Configre will use the value of environment variable `CC' if it is
-# set.  If not then configure checks for a working GNU `gcc' followed
-# by other common compiler names.  If a default compiler is desired
-# then uncomment the following line, replacing `gcc' with the name of
-# the default compiler.
-
-#CC=${CC:-gcc}
+# See BlankForm in this directory for detailed information.
 
 
 
+# The default compiler is `cc'
+if test "X-" =  "X-$CC"; then
+    CC=cc
+    CC_BASENAME=cc
+fi
 
-# C Compiler and Preprocessor Flags
-# ---------------------------------
-#
-# Flags that end with `_CFLAGS' are always passed to the compiler.
-# Flags that end with `_CPPFLAGS' are passed to the compiler when
-# compiling but not when linking.
-#
-# DEBUG_CFLAGS		Flags to pass to the compiler to create a
-# DEBUG_CPPFLAGS	library suitable for use with debugging
-#			tools. Usually this list will exclude
-#			optimization switches (like `-O') and include
-#			switches that turn on symbolic debugging
-#			support (like `-g').
-#
-# PROD_CFLAGS		Flags to pass to the compiler to create a
-# PROD_CPPFLAGS		production version of the library.  These
-#			usualy exclude symbolic debugging switches
-#			(like `-g') and include optimization switches
-#			(like `-O').
-#
-# PROFILE_CFLAGS	Flags to pass to the compiler to create a
-# PROFILE_CPPFLAGS	library suitable for performance testing (like 
-# 			`-pg').  This may or may not include debugging 
-# 			or production flags.
-#			
-# CFLAGS		Flags can be added to this variable which
-#			might already be partially initialized.  These 
-#			flags will always be passed to the compiler
-#			and should include switches to turn on full
-#			warnings.  HDF5 attempts to be ANSI and Posix
-#			compliant and employ good programming
-#			practices resulting in few if any
-#			warnings. Note: warning flags do not have to
-#			be added to this variable if the compiler is
-#			the GNU gcc compiler or a descendent of gcc.
-#
-
-case "$CC" in
-    *gcc*)
+# Compiler flags
+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"
@@ -84,21 +36,3 @@ case "$CC" in
 	PROFILE_CPPFLAGS=
 	;;
 esac
-
-
-
-# Overriding Configure Tests
-# --------------------------
-#
-# Values for overriding configuration tests when cross compiling.
-# This includes compiling on some machines where the serial front end
-# compiles for a parallel back end.
-
-# Set this to `yes' or `no' depending on whether the target is big
-# endian or little endian.
-#ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}
-
-# Set this to the width required by printf() to print type `long
-# long'.  For instance, if the format would be `%lld' then set it to
-# `ll' or if the format would be `%qd' set it to `q'.
-#hdf5_cv_printf_ll=${hdf5_cv_printf_ll='ll'}
diff --git a/config/commence.in b/config/commence.in
index 60ddc69..3d67623 100644
--- a/config/commence.in
+++ b/config/commence.in
@@ -14,6 +14,7 @@ SHELL=/bin/sh
 CC=@CC@
 CFLAGS=@CFLAGS@
 CPPFLAGS=@CPPFLAGS@
+LDFLAGS=@LDFLAGS@
 LIBS=@LIBS@
 AR=@AR@
 RANLIB=@RANLIB@
@@ -22,7 +23,9 @@ CP=cp
 INSTALL=@INSTALL@
 INSTALL_PROGRAM=@INSTALL_PROGRAM@
 INSTALL_DATA=@INSTALL_DATA@
-RUNTEST=@RUNTEST@
+RUNSERIAL=@RUNSERIAL@
+RUNPARALLEL=@RUNPARALLEL@
+RUNTEST=$(RUNSERIAL)
 TRACE=:
 
 # Installation points
diff --git a/config/conclude.in b/config/conclude.in
index ff5f88b..8eab342 100644
--- a/config/conclude.in
+++ b/config/conclude.in
@@ -96,11 +96,6 @@ maintainer-clean: distclean
 	$(RM) *~ core core.* *.core *.bak *.contrib gmon.out
 
 # Implicit rules
-.c.a:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
-	$(AR) -rc $@ $*.o
-	$(RM) $*.o
-
 .c.o:
 	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
 
diff --git a/config/freebsd2.2.7 b/config/freebsd2.2.7
index 6a2d8cc..c709551 100644
--- a/config/freebsd2.2.7
+++ b/config/freebsd2.2.7
@@ -2,6 +2,8 @@
 # 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.
 
 . config/linux
 CPP=/usr/bin/cpp
diff --git a/config/hpux10.20 b/config/hpux10.20
index 65cf131..70085c7 100644
--- a/config/hpux10.20
+++ b/config/hpux10.20
@@ -3,36 +3,34 @@
 # 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.
-
-
-#----------------------------------------------------------------------------
-# Compiler flags. The CPPFLAGS values should not include package debug
-# flags like `-DH5G_DEBUG' since these are added with the
-# `--enable-debug' switch of configure.
-
-# What must *always* be present for things to compile correctly?
-CFLAGS="$CFLAGS -Ae"
-#CPPFLAGS="$CPPFLAGS -I."
-
-# What compiler flags should be used for code development?
-DEBUG_CFLAGS=-g
-DEBUG_CPPFLAGS=
-
-# What compiler flags should be used for building a production
-# library?
-PROD_CFLAGS=-O
-PROD_CPPFLAGS=
-
-# What compiler flags enable code profiling?
-PROFILE_CFLAGS=
-PROFILE_CPPFLAGS=
-
-
-#----------------------------------------------------------------------------
-# Values for overriding configuration tests when cross compiling.
-# This includes compiling on some machines where the serial front end
-# compiles for a parallel back end.
-
-# Set this to `yes' or `no' depending on whether the target is big
-# endian or little endian.
-#ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}
+#
+# See BlankForm in this directory for details.
+
+# Default compiler is `cc'
+if test "X-" =  "X-$CC"; then
+    CC=cc
+    CC_BASENAME=cc
+fi
+
+# Flags
+case "X-$CC" 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=
+	;;
+
+    *)
+	CFLAGS="$CFLAGS -Ae"
+	DEBUG_CFLAGS=-g
+	DEBUG_CPPFLAGS=
+	PROD_CFLAGS=-O
+	PROD_CPPFLAGS=
+	PROFILE_CFLAGS=
+	PROFILE_CPPFLAGS=
+	;;
+esac
diff --git a/config/hpux9.03 b/config/hpux9.03
index b593d0d..6b32e60 100644
--- a/config/hpux9.03
+++ b/config/hpux9.03
@@ -3,36 +3,34 @@
 # 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.
-
-
-#----------------------------------------------------------------------------
-# Compiler flags. The CPPFLAGS values should not include package debug
-# flags like `-DH5G_DEBUG' since these are added with the
-# `--enable-debug' switch of configure.
-
-# What must *always* be present for things to compile correctly?
-CFLAGS="$CFLAGS -Ae"
-#CPPFLAGS="$CPPFLAGS -I."
-
-# What compiler flags should be used for code development?
-DEBUG_CFLAGS=-g
-DEBUG_CPPFLAGS=
-
-# What compiler flags should be used for building a production
-# library?
-PROD_CFLAGS=
-PROD_CPPFLAGS=
-
-# What compiler flags enable code profiling?
-PROFILE_CFLAGS=
-PROFILE_CPPFLAGS=
-
-
-#----------------------------------------------------------------------------
-# Values for overriding configuration tests when cross compiling.
-# This includes compiling on some machines where the serial front end
-# compiles for a parallel back end.
-
-# Set this to `yes' or `no' depending on whether the target is big
-# endian or little endian.
-#ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}
+#
+# See BlankForm in this directory for details
+
+# Default compiler is `cc'
+if test "X-" =  "X-$CC"; then
+    CC=cc
+    CC_BASENAME=cc
+fi
+
+# Flags
+case "X-$CC" 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=
+	;;
+
+    *)
+	CFLAGS="$CFLAGS -Ae"
+	DEBUG_CFLAGS=-g
+	DEBUG_CPPFLAGS=
+	PROD_CFLAGS=
+	PROD_CPPFLAGS=
+	PROFILE_CFLAGS=
+	PROFILE_CPPFLAGS=
+	;;
+esac
diff --git a/config/intel-osf1 b/config/intel-osf1
index f110118..99e4835 100644
--- a/config/intel-osf1
+++ b/config/intel-osf1
@@ -3,21 +3,27 @@
 # 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 `cicc'
+if test "X-" =  "X-$CC"; then
+    CC=cicc
+    CC_BASENAME=cicc
+fi
 
-#----------------------------------------------------------------------------
-# Compiler flags. The CPPFLAGS values should not include package debug
-# flags like `-DH5G_DEBUG' since these are added with the
-# `--enable-debug' switch of configure.
+# The default archiver is `xar'
+AR="${AR:-xar}
 
-# Sometimes a particular compiler must be used.  If that's the case
-# then uncomment the following line.  Otherwise the main configure
-# script will try to detect the compiler automatically.
-CC=cicc
-AR=xar
+# There is no ranlib
 RANLIB=:
-LIBS="-L./ -L../ -lnoop_stubs"
-RUNTEST="yod -sz 1"
+
+# Additional libraries
+LDFLAGS="-L./ -L../ -lnoop_stubs"
+
+# How to run serial and parallel test programs
+RUNSERIAL="yod -sz 1"
+RUNPARALLEL="yod -sz 8"
 
 # What must *always* be present for things to compile correctly?
 CFLAGS="$CFLAGS -DDOS386"
@@ -37,15 +43,6 @@ PROFILE_CFLAGS=-pg
 PROFILE_CPPFLAGS=
 
 
-#----------------------------------------------------------------------------
-# Values for overriding configuration tests when cross compiling.
-# This includes compiling on some machines where the serial front end
-# compiles for a parallel back end.
-
-# Set this to `yes' or `no' depending on whether the target is big
-# endian or little endian.
-#ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}
-
 # Set this to the width required by printf() to print type `long
 # long'.  For instance, if the format would be `%lld' then set it to
 # `ll' or if the format would be `%qd' set it to `q'.
diff --git a/config/irix5.3 b/config/irix5.3
index cba1bbd..fe76210 100644
--- a/config/irix5.3
+++ b/config/irix5.3
@@ -4,25 +4,18 @@
 # after configure starts and defines, among other things, flags for
 # the various compile modes.
 #
-# Modifications:
-#	Robb Matzke, 1998-08-31
-#	Removed `-ansi' from the CFLAGS because it caused sigaction()
-#	to not be compiled.
+# See BlankForm in this directory for details
 
-
-#----------------------------------------------------------------------------
-# Compiler flags. The CPPFLAGS values should not include package debug
-# flags like `-DH5G_DEBUG' since these are added with the
-# `--enable-debug' switch of configure.
-
-# Sometimes a particular compiler must be used.  If that's the case
-# then uncomment the following line.  Otherwise the main configure
-# script will try to detect the compiler automatically.
-CC=${CC:-cc}
+# The default compiler is `cc' and there is no ranlib.
+if test "X-" =  "X-$CC"; then
+    CC=cc
+    CC_BASENAME=cc
+fi
 RANLIB=:
 
-case $CC in
-    *gcc*)
+# Compiler flags
+case "X-$CC_BASENAME" in
+    X-gcc)
 	CFLAGS="$CFLAGS -ansi"
 	DEBUG_CFLAGS="-g -fverbose-asm"
 	DEBUG_CPPFLAGS="-DH5F_LOW_DFLT=H5F_LOW_SEC2"
diff --git a/config/irix6.2 b/config/irix6.2
index f58977a..bff3a5f 100644
--- a/config/irix6.2
+++ b/config/irix6.2
@@ -3,48 +3,41 @@
 # 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.
-
-
-#----------------------------------------------------------------------------
-# Compiler flags. The CPPFLAGS values should not include package debug
-# flags like `-DH5G_DEBUG' since these are added with the
-# `--enable-debug' switch of configure.
-
-# Use SGI supplied C compiler
-CC="cc"
-RANLIB=:
-
-# What must *always* be present for things to compile correctly?
-# 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"
-#CPPFLAGS="$CPPFLAGS -I."
+# See BlankForm in this directory for details
 
-# What compiler flags should be used for code development?
-DEBUG_CFLAGS=-g
-DEBUG_CPPFLAGS=
-
-# What compiler flags should be used for building a production
-# library?
-PROD_CFLAGS=-O
-PROD_CPPFLAGS=
-
-# What compiler flags enable code profiling?
-PROFILE_CFLAGS=-pg
-PROFILE_CPPFLAGS=
-
-
-#----------------------------------------------------------------------------
-# Values for overriding configuration tests when cross compiling.
-# This includes compiling on some machines where the serial front end
-# compiles for a parallel back end.
+# The default compiler is `cc' and there is no ranlib.
+if test "X-" =  "X-$CC"; then
+    CC=cc
+    CC_BASENAME=cc
+fi
+RANLIB=:
 
-# Set this to `yes' or `no' depending on whether the target is big
-# endian or little endian.
-#ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}
+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/irix64 b/config/irix64
index 0b9a825..1bedb5d 100644
--- a/config/irix64
+++ b/config/irix64
@@ -3,50 +3,42 @@
 # 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.
-
-
-#----------------------------------------------------------------------------
-# Compiler flags. The CPPFLAGS values should not include package debug
-# flags like `-DH5G_DEBUG' since these are added with the
-# `--enable-debug' switch of configure.
-
-# Use SGI supplied C compiler
-CC="cc"
-RANLIB=:
-
-# What must *always* be present for things to compile correctly?
-# 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 -64 -woff 1174,1429,1209,1196 -Wl,-woff,84"
-#CPPFLAGS="$CPPFLAGS -I."
-
-# What compiler flags should be used for code development?
-DEBUG_CFLAGS="-g -fullwarn"
-DEBUG_CPPFLAGS=
+# See BlankForm in this directory for details.
 
-# What compiler flags should be used for building a production
-# library?
-PROD_CFLAGS=-O
-PROD_CPPFLAGS=
-
-# What compiler flags enable code profiling?
-PROFILE_CFLAGS=-pg
-PROFILE_CPPFLAGS=
-
-
-#----------------------------------------------------------------------------
-# Values for overriding configuration tests when cross compiling.
-# This includes compiling on some machines where the serial front end
-# compiles for a parallel back end.
-
-# Set this to `yes' or `no' depending on whether the target is big
-# endian or little endian.
-#ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}
-#!/bin/sh
+# Use SGI supplied C compiler by default.  There is no ranlib
+if test "X-" =  "X-$CC"; then
+    CC=cc
+    CC_BASENAME=cc
+fi
+RANLIB=:
 
+# Compiler flags
+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 -64 -woff 1174,1429,1209,1196 -Wl,-woff,84"
+	DEBUG_CFLAGS="-g -fullwarn"
+	DEBUG_CPPFLAGS=
+	PROD_CFLAGS=-O
+	PROD_CPPFLAGS=
+	PROFILE_CFLAGS=-pg
+	PROFILE_CPPFLAGS=
+	;;
+esac
diff --git a/config/linux b/config/linux
index 9e3bc5c..032bfb0 100644
--- a/config/linux
+++ b/config/linux
@@ -3,69 +3,73 @@
 # 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 `gcc'.
+if test "X-" =  "X-$CC"; then
+    CC=cc
+    CC_BASENAME=cc
+fi
 
-#----------------------------------------------------------------------------
-# Compiler flags. The CPPFLAGS values should not include package debug
-# flags like `-DH5G_DEBUG' since these are added with the
-# `--enable-debug' switch of configure.
-CC=${CC:-gcc}
-case `$CC -v 2>&1 |tail -1 |sed 's/gcc version //'` in
-   2.7.*)
-       echo "  +------------------------------------------------+"
-       echo "  | You have an old version of gcc. Please upgrade |"
-       echo "  | to 2.8.1 or better.  Continuing anyway, but    |"
-       echo "  | code generation may be wrong on some platforms.|"
-       echo "  +------------------------------------------------+"
-       sleep 5
-       CCVENDOR=gcc
-       ;;
-   2.8.*)
-       CFLAGS="$CFLAGS -Wsign-compare"
-       CCVENDOR=gcc
-       ;;
-   egcs-*)
-       CFLAGS="$CFLAGS -Wsign-compare"
-       CCVENDOR=egcs
-       ;;
-   pgcc-*)
-       CFLAGS="$CFLAGS -Wsign-compare"
-       CCVENDOR=pgcc
-       ;;
-esac
-
-# What must *always* be present for things to compile correctly?
-CFLAGS="$CFLAGS -ansi"
+ARCH="-mcpu=pentiumpro -march=pentiumpro -malign-double"
+NOFP="-fomit-frame-pointer"
 
-# What compiler flags should be used for code development?
-DEBUG_CFLAGS="-g -fverbose-asm"
-DEBUG_CPPFLAGS="-DH5F_OPT_SEEK=0 -DH5F_LOW_DFLT=H5F_LOW_SEC2"
+# Compiler flags.  We use `-v' to get the version number because it almost
+# always works on Linux systems.
+case `$CC -v 2>&1 |grep 'gcc version' |sed 's/.*gcc version //'` in
+    2.7.*)
+        echo "  +------------------------------------------------+"
+        echo "  | You have an old version of gcc. Please upgrade |"
+        echo "  | to 2.8.1 or better.  Continuing anyway, but    |"
+        echo "  | code generation may be wrong on some platforms.|"
+        echo "  +------------------------------------------------+"
+        sleep 5
+	CFLAGS="$CFLAGS -ansi"
+	PROD_CFLAGS="$ARCH -O3 $NOFP -finline-functions -fschedule-insns2"
+	PROD_CPPFLAGS=
+	DEBUG_CFLAGS="-g -fverbose-asm"
+	DEBUG_CPPFLAGS="-DH5F_OPT_SEEK=0 -DH5F_LOW_DFLT=H5F_LOW_SEC2"
+	PROFILE_CFLAGS=-pg
+	PROFILE_CPPFLAGS=
+	;;
 
-# What compiler flags should be used for building a production
-# library?
-if [ "gcc" = "$CCVENDOR" ]; then
-    PROD_CFLAGS="-mcpu=pentiumpro -march=pentiumpro -O3 -finline-functions -malign-double -fomit-frame-pointer -fschedule-insns2"
-    PROD_CPPFLAGS=
-elif [ "egcs" = "$CCVENDOR" ]; then
-    PROD_CFLAGS="-mcpu=pentiumpro -march=pentiumpro -O6 -malign-double"
-    PROD_CPPFLAGS=
-elif [ "pgcc" = "$CCVENDOR" ]; then
-    PROD_CFLAGS="-mcpu=pentiumpro -march=pentiumpro -O6 -malign-double"
-    PROD_CPPFLAGS=
-else
-    PROD_CFLAGS=
-    PROD_CPPFLAGS=
-fi
+    2.8.*)
+	CFLAGS="$CFLAGS -Wsign-compare"
+	PROD_CFLAGS="$ARCH -O3 $NOFP -finline-functions -fschedule-insns2"
+	PROD_CPPFLAGS=
+	DEBUG_CFLAGS="-g -fverbose-asm"
+	DEBUG_CPPFLAGS="-DH5F_OPT_SEEK=0 -DH5F_LOW_DFLT=H5F_LOW_SEC2"
+	PROFILE_CFLAGS=-pg
+	PROFILE_CPPFLAGS=
+	;;
 
-# What compiler flags enable code profiling?
-PROFILE_CFLAGS=-pg
-PROFILE_CPPFLAGS=
+    egcs-*)
+	CFLAGS="$CFLAGS -Wsign-compare"
+	PROD_CFLAGS="$ARCH -O6 $NOFP"
+	PROD_CPPFLAGS=
+	DEBUG_CFLAGS="-g -fverbose-asm"
+	DEBUG_CPPFLAGS="-DH5F_OPT_SEEK=0 -DH5F_LOW_DFLT=H5F_LOW_SEC2"
+	PROFILE_CFLAGS=-pg
+	PROFILE_CPPFLAGS=
+	;;
 
-#----------------------------------------------------------------------------
-# Values for overriding configuration tests when cross compiling.
-# This includes compiling on some machines where the serial front end
-# compiles for a parallel back end.
+    pgcc-*)
+	CFLAGS="$CFLAGS -Wsign-compare"
+	PROD_CFLAGS="$ARCH -O6 $NOFP"
+	PROD_CPPFLAGS=
+	DEBUG_CFLAGS="-g -fverbose-asm"
+	DEBUG_CPPFLAGS="-DH5F_OPT_SEEK=0 -DH5F_LOW_DFLT=H5F_LOW_SEC2"
+	PROFILE_CFLAGS=-pg
+	PROFILE_CPPFLAGS=
+	;;
 
-# Set this to `yes' or `no' depending on whether the target is big
-# endian or little endian.
-#ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}
+    *)
+	PROD_CFLAGS=-O
+	PROD_CPPFLAGS=
+	DEBUG_CFLAGS="-g"
+	DEBUG_CPPFLAGS="-DH5F_OPT_SEEK=0 -DH5F_LOW_DFLT=H5F_LOW_SEC2"
+	PROFILE_CFLAGS=-pg
+	PROFILE_CPPFLAGS=
+	;;
+esac
diff --git a/config/powerpc-ibm-aix4.2.1.0 b/config/powerpc-ibm-aix4.2.1.0
index 7eb77d5..24176a5 100644
--- a/config/powerpc-ibm-aix4.2.1.0
+++ b/config/powerpc-ibm-aix4.2.1.0
@@ -3,38 +3,10 @@
 # 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.
 
-
-#----------------------------------------------------------------------------
-# Compiler flags. The CPPFLAGS values should not include package debug
-# flags like `-DH5G_DEBUG' since these are added with the
-# `--enable-debug' switch of configure.
-
-# What must *always* be present for things to compile correctly?
-#CFLAGS="$CFLAGS -ansi"
-#CPPFLAGS="$CPPFLAGS -I."
-
-# What compiler flags should be used for code development?
-DEBUG_CFLAGS=
-DEBUG_CPPFLAGS=
-
-# What compiler flags should be used for building a production
-# library?
-PROD_CFLAGS=
-PROD_CPPFLAGS=
-
-# What compiler flags enable code profiling?
-PROFILE_CFLAGS=
-PROFILE_CPPFLAGS=
-
-
-#----------------------------------------------------------------------------
-# Values for overriding configuration tests when cross compiling.
-# This includes compiling on some machines where the serial front end
-# compiles for a parallel back end.
-
-# Set this to `yes' or `no' depending on whether the target is big
-# endian or little endian.
+# Cross compiling defaults
 ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}
 ac_cv_header_stdc=${ac_cv_header_stdc='yes'}
 ac_cv_sizeof_short=${ac_cv_sizeof_short=2}
diff --git a/config/rs6000-ibm-aix4.1.4.0 b/config/rs6000-ibm-aix4.1.4.0
index 522f50b..2f7cc86 100644
--- a/config/rs6000-ibm-aix4.1.4.0
+++ b/config/rs6000-ibm-aix4.1.4.0
@@ -3,37 +3,8 @@
 # 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.
 
-
-#----------------------------------------------------------------------------
-# Compiler flags. The CPPFLAGS values should not include package debug
-# flags like `-DH5G_DEBUG' since these are added with the
-# `--enable-debug' switch of configure.
-
-# What must *always* be present for things to compile correctly?
-#CFLAGS="$CFLAGS -ansi"
-#CPPFLAGS="$CPPFLAGS -I."
-
-# What compiler flags should be used for code development?
-DEBUG_CFLAGS=
-DEBUG_CPPFLAGS=
-
-# What compiler flags should be used for building a production
-# library?
-PROD_CFLAGS=
-PROD_CPPFLAGS=
-
-# What compiler flags enable code profiling?
-PROFILE_CFLAGS=
-PROFILE_CPPFLAGS=
-
-
-#----------------------------------------------------------------------------
-# Values for overriding configuration tests when cross compiling.
-# This includes compiling on some machines where the serial front end
-# compiles for a parallel back end.
-
-# Set this to `yes' or `no' depending on whether the target is big
-# endian or little endian.
+# Cross compiling defaults
 ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}
-
diff --git a/config/solaris2.5 b/config/solaris2.5
index 74561c2..686fc75 100644
--- a/config/solaris2.5
+++ b/config/solaris2.5
@@ -3,18 +3,18 @@
 # 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 `gcc'
+if test "X-" =  "X-$CC"; then
+    CC=gcc
+    CC_BASENAME=gcc
+fi
 
-#----------------------------------------------------------------------------
-# Compiler flags. The CPPFLAGS values should not include package debug
-# flags like `-DH5G_DEBUG' since these are added with the
-# `--enable-debug' switch of configure.
-
-# We use gcc unless something else is specified.
-CC=${CC:-gcc}
-
-case $CC in
-    *gcc*)
+# Compiler flags
+case "X-$CC_BASENAME" in
+    X-gcc)
 	CFLAGS="$CFLAGS -ansi"
 	DEBUG_CFLAGS="-g -fverbose-asm"
 	DEBUG_CPPFLAGS="-DH5F_LOW_DFLT=H5F_LOW_SEC2"
@@ -34,12 +34,3 @@ case $CC in
 	PROFILE_CPPFLAGS=
 	;;
 esac
-
-#----------------------------------------------------------------------------
-# Values for overriding configuration tests when cross compiling.
-# This includes compiling on some machines where the serial front end
-# compiles for a parallel back end.
-
-# Set this to `yes' or `no' depending on whether the target is big
-# endian or little endian.
-#ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}