[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.

27 files changed, 1668 insertions, 858 deletions

diff --git a/INSTALL b/INSTALL
index 239c621..8a2a377 100644
--- a/INSTALL
+++ b/INSTALL
@@ -86,6 +86,18 @@ Step 2. Configure.
       Debugging.html file.  To disable tracing support add
       `--disable-trace' to the configure command.
 
+    * Configure will look for the GNU zlib (a compression library) in
+      the standard places for your environment.  If it's installed in
+      a non-standard place then absolute path names can be specified
+      with `--with-zlib=INCDIR,LIBDIR' for the include file and/or
+      library. To prevent detection of zlib use `--without-zlib'.
+
+    * The HDF5-to-HDF4 conversion tool requires the HDF4 library and
+      header files which are auto-detected by configure.  If they are
+      in a non-standard place then absolute path names can be specified
+      with `--with-hdf4=INCDIR,LIBDIR' for the include file and/or
+      library. To prevent detection of hdf4 use `--without-hdf4'.
+
     * Old versions of gcc (<2.8.0) may experience register allocation
       problems on some architectures.  If this happens then the
       `--disable-hsizet' can be given but the resulting library will
@@ -169,10 +181,11 @@ Step 5. Install public files.
 	    ./tools/libh5tools.a
 
 	Some tools:
-	    ./tools/h5ls
-	    ./tools/h5repart
-	    ./tools/h5dump
-	    ./tools/h5debug
+	    ./tools/h5ls	(list file contents)
+	    ./tools/h5dump	(dump file contents)
+	    ./tools/h5repart	(repartition file families)
+	    ./tools/h5toh4	(hdf5 to hdf4 file converter)
+	    ./tools/h5debug	(low-level file debugging)
 	    ./tools/h5import	(a demo)
 
 Step 6. Subscribe to mailing lists.
diff --git a/MANIFEST b/MANIFEST
index 0401f1c..f23af24 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -341,6 +341,7 @@
 ./test/tstab.c
 ./test/unlink.c
 
+./testpar/Makefile.in
 ./testpar/Makefile.ascired
 ./testpar/Makefile.ibmsp
 ./testpar/Makefile.irix64
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'}
diff --git a/configure b/configure
index 7fb3ef5..6295dff 100755
--- a/configure
+++ b/configure
@@ -13,23 +13,27 @@ ac_help=
 ac_default_prefix=/usr/local
 # Any additions from configure.in:
 ac_help="$ac_help
---enable-production=yes|no  Determines how to run the compiler."
+  --enable-production     Determines how to run the compiler."
 ac_help="$ac_help
---disable-hsizet          Datasets can normally be larger than memory
-                             and/or files but some compilers are unable to
-                             handle this (including versions of GCC before
-                             2.8.0).  Disabling the feature causes dataset
-                             sizes to be restricted to the size of core memory,
-                             or 'size_t'."
+  --disable-hsizet        Datasets can normally be larger than memory
+                          and/or files but some compilers are unable to
+                          handle this (including versions of GCC before
+                          2.8.0).  Disabling the feature causes dataset
+                          sizes to be restricted to the size of core memory,
+                          or 'size_t'."
 ac_help="$ac_help
---enable-debug=all        Turn on debugging in all packages.  One may also
+  --with-zlib=INC,LIB     Use the GNU zlib compression"
+ac_help="$ac_help
+  --with-hdf4=INC,LIB     Use the HDF4 library"
+ac_help="$ac_help
+  --enable-debug[=all]    Turn on debugging in all packages.  One may also
                           specify a comma-separated list of package names
                           without the leading H5 or the word no.  The default
                           is most packages."
 ac_help="$ac_help
---disable-trace           Disable API tracing capability"
+  --disable-trace         Disable API tracing capability"
 ac_help="$ac_help
---enable-parallel=mpio    Enable parallel support with MPIO"
+  --enable-parallel=mpio  Enable parallel support with MPIO"
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -564,7 +568,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:568: checking host system type" >&5
+echo "configure:572: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -587,7 +591,7 @@ echo "$ac_t""$host" 1>&6
 
 
 echo $ac_n "checking for cached host""... $ac_c" 1>&6
-echo "configure:591: checking for cached host" >&5
+echo "configure:595: checking for cached host" >&5
 if eval "test \"`echo '$''{'hdf5_cv_host'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -604,9 +608,8 @@ elif test $hdf5_cv_host != $host; then
 fi
 
 
-
 echo $ac_n "checking for host config file""... $ac_c" 1>&6
-echo "configure:610: checking for host config file" >&5
+echo "configure:613: checking for host config file" >&5
 host_config="none"
 for f in $host \
          $host_vendor-$host_os \
@@ -622,14 +625,14 @@ for f in $host \
 done
 echo "$ac_t""$host_config" 1>&6
 if test $host_config != "none"; then
+   CC_BASENAME="`echo $CC |cut -f1 -d' ' |xargs basename 2>/dev/null`"
    . $host_config
 fi
 
-
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:633: checking for $ac_word" >&5
+echo "configure:636: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -658,7 +661,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:662: checking for $ac_word" >&5
+echo "configure:665: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -706,7 +709,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:710: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:713: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -716,11 +719,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS
 cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext <<EOF
-#line 720 "configure"
+#line 723 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -740,12 +743,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:744: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:747: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:749: checking whether we are using GNU C" >&5
+echo "configure:752: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -754,7 +757,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:758: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:761: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -769,7 +772,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:773: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:776: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -796,8 +799,9 @@ else
   test "${CFLAGS+set}" = set || CFLAGS="-g"
 fi
 
+CC_BASENAME="`echo $CC |cut -f1 -d' ' |xargs basename 2>/dev/null`"
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:801: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:805: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -834,7 +838,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:838: checking for a BSD compatible install" >&5
+echo "configure:842: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -886,7 +890,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:890: checking for $ac_word" >&5
+echo "configure:894: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -919,7 +923,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:923: checking for $ac_word" >&5
+echo "configure:927: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -952,7 +956,7 @@ fi
 
 
 echo $ac_n "checking for GNU Make""... $ac_c" 1>&6
-echo "configure:956: checking for GNU Make" >&5
+echo "configure:960: checking for GNU Make" >&5
 if test "`${MAKE-make} --version -f /dev/null 2>/dev/null |\
   sed -n 1p|cut -c1-8`" = "GNU Make"; then
    echo "$ac_t""yes" 1>&6
@@ -966,7 +970,7 @@ if test Xyes = "X$GCC"; then
 fi
 
 echo $ac_n "checking for production mode""... $ac_c" 1>&6
-echo "configure:970: checking for production mode" >&5
+echo "configure:974: checking for production mode" >&5
 # Check whether --enable-production or --disable-production was given.
 if test "${enable_production+set}" = set; then
   enableval="$enable_production"
@@ -995,9 +999,8 @@ case "X-$enableval" in
       ;;
 esac
 
-
 echo $ac_n "checking for ceil in -lm""... $ac_c" 1>&6
-echo "configure:1001: checking for ceil in -lm" >&5
+echo "configure:1004: checking for ceil in -lm" >&5
 ac_lib_var=`echo m'_'ceil | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1005,7 +1008,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1009 "configure"
+#line 1012 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1016,7 +1019,7 @@ int main() {
 ceil()
 ; return 0; }
 EOF
-if { (eval echo configure:1020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1044,7 +1047,7 @@ else
 fi
 
 echo $ac_n "checking for main in -lcoug""... $ac_c" 1>&6
-echo "configure:1048: checking for main in -lcoug" >&5
+echo "configure:1051: checking for main in -lcoug" >&5
 ac_lib_var=`echo coug'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1052,14 +1055,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcoug  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1056 "configure"
+#line 1059 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:1063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1085,56 +1088,9 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 fi
-	echo $ac_n "checking for compress2 in -lz""... $ac_c" 1>&6
-echo "configure:1090: checking for compress2 in -lz" >&5
-ac_lib_var=`echo z'_'compress2 | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lz  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 1098 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char compress2();
-
-int main() {
-compress2()
-; return 0; }
-EOF
-if { (eval echo configure:1109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo z | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-lz $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
+	
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1138: checking how to run the C preprocessor" >&5
+echo "configure:1094: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1149,13 +1105,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1153 "configure"
+#line 1109 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1159: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1115: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -1166,13 +1122,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1170 "configure"
+#line 1126 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1176: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1132: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -1195,12 +1151,12 @@ fi
 echo "$ac_t""$CPP" 1>&6
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1199: checking for ANSI C header files" >&5
+echo "configure:1155: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1204 "configure"
+#line 1160 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1208,7 +1164,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1212: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1168: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1225,7 +1181,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1229 "configure"
+#line 1185 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1243,7 +1199,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1247 "configure"
+#line 1203 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1264,7 +1220,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1268 "configure"
+#line 1224 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1275,7 +1231,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:1279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1299,12 +1255,12 @@ EOF
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:1303: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:1259: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1308 "configure"
+#line 1264 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -1313,7 +1269,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:1317: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1273: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -1333,21 +1289,21 @@ EOF
 
 fi
 
-for ac_hdr in io.h sys/resource.h sys/time.h unistd.h winsock.h zlib.h
+for ac_hdr in io.h sys/resource.h sys/time.h unistd.h winsock.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1341: checking for $ac_hdr" >&5
+echo "configure:1297: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1346 "configure"
+#line 1302 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1351: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1307: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1377,17 +1333,17 @@ for ac_hdr in sys/ioctl.h sys/stat.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1381: checking for $ac_hdr" >&5
+echo "configure:1337: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1386 "configure"
+#line 1342 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1391: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1415,12 +1371,12 @@ done
 
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:1419: checking for off_t" >&5
+echo "configure:1375: checking for off_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1424 "configure"
+#line 1380 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1448,12 +1404,12 @@ EOF
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:1452: checking for size_t" >&5
+echo "configure:1408: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1457 "configure"
+#line 1413 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1475,20 +1431,53 @@ fi
 echo "$ac_t""$ac_cv_type_size_t" 1>&6
 if test $ac_cv_type_size_t = no; then
   cat >> confdefs.h <<\EOF
-#define size_t unsigned
+#define size_t unsigned long
+EOF
+
+fi
+
+echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
+echo "configure:1441: checking for ssize_t" >&5
+if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1446 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "ssize_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_type_ssize_t=yes
+else
+  rm -rf conftest*
+  ac_cv_type_ssize_t=no
+fi
+rm -f conftest*
+
+fi
+echo "$ac_t""$ac_cv_type_ssize_t" 1>&6
+if test $ac_cv_type_ssize_t = no; then
+  cat >> confdefs.h <<\EOF
+#define ssize_t long
 EOF
 
 fi
 
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:1485: checking whether byte ordering is bigendian" >&5
+echo "configure:1474: checking whether byte ordering is bigendian" >&5
 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_bigendian=unknown
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat > conftest.$ac_ext <<EOF
-#line 1492 "configure"
+#line 1481 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -1499,11 +1488,11 @@ int main() {
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:1503: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat > conftest.$ac_ext <<EOF
-#line 1507 "configure"
+#line 1496 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -1514,7 +1503,7 @@ int main() {
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:1518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1507: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else
@@ -1534,7 +1523,7 @@ if test "$cross_compiling" = yes; then
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 1538 "configure"
+#line 1527 "configure"
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
@@ -1547,7 +1536,7 @@ main () {
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:1551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_bigendian=no
 else
@@ -1571,7 +1560,7 @@ EOF
 fi
 
 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:1575: checking size of short" >&5
+echo "configure:1564: checking size of short" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1579,7 +1568,7 @@ else
   ac_cv_sizeof_short=2
 else
   cat > conftest.$ac_ext <<EOF
-#line 1583 "configure"
+#line 1572 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -1590,7 +1579,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:1594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_short=`cat conftestval`
 else
@@ -1610,7 +1599,7 @@ EOF
 
 
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:1614: checking size of int" >&5
+echo "configure:1603: checking size of int" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1618,7 +1607,7 @@ else
   ac_cv_sizeof_int=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1622 "configure"
+#line 1611 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -1629,7 +1618,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:1633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -1649,7 +1638,7 @@ EOF
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:1653: checking size of long" >&5
+echo "configure:1642: checking size of long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1657,7 +1646,7 @@ else
   ac_cv_sizeof_long=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1661 "configure"
+#line 1650 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -1668,7 +1657,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:1672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -1688,7 +1677,7 @@ EOF
 
 
 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:1692: checking size of long long" >&5
+echo "configure:1681: checking size of long long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1696,7 +1685,7 @@ else
   ac_cv_sizeof_long_long=8
 else
   cat > conftest.$ac_ext <<EOF
-#line 1700 "configure"
+#line 1689 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -1707,7 +1696,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:1711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long_long=`cat conftestval`
 else
@@ -1727,7 +1716,7 @@ EOF
 
 
 echo $ac_n "checking size of __int64""... $ac_c" 1>&6
-echo "configure:1731: checking size of __int64" >&5
+echo "configure:1720: checking size of __int64" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof___int64'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1735,7 +1724,7 @@ else
   ac_cv_sizeof___int64=8
 else
   cat > conftest.$ac_ext <<EOF
-#line 1739 "configure"
+#line 1728 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -1746,7 +1735,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:1750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof___int64=`cat conftestval`
 else
@@ -1766,7 +1755,7 @@ EOF
 
 
 echo $ac_n "checking size of float""... $ac_c" 1>&6
-echo "configure:1770: checking size of float" >&5
+echo "configure:1759: checking size of float" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_float'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1774,7 +1763,7 @@ else
   ac_cv_sizeof_float=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1778 "configure"
+#line 1767 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -1785,7 +1774,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:1789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_float=`cat conftestval`
 else
@@ -1805,7 +1794,7 @@ EOF
 
 
 echo $ac_n "checking size of double""... $ac_c" 1>&6
-echo "configure:1809: checking size of double" >&5
+echo "configure:1798: checking size of double" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1813,7 +1802,7 @@ else
   ac_cv_sizeof_double=8
 else
   cat > conftest.$ac_ext <<EOF
-#line 1817 "configure"
+#line 1806 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -1824,7 +1813,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:1828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_double=`cat conftestval`
 else
@@ -1844,7 +1833,7 @@ EOF
 
 
 echo $ac_n "checking size of long double""... $ac_c" 1>&6
-echo "configure:1848: checking size of long double" >&5
+echo "configure:1837: checking size of long double" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long_double'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1852,7 +1841,7 @@ else
   ac_cv_sizeof_long_double=8
 else
   cat > conftest.$ac_ext <<EOF
-#line 1856 "configure"
+#line 1845 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -1863,7 +1852,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:1867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long_double=`cat conftestval`
 else
@@ -1883,7 +1872,7 @@ EOF
 
 
 echo $ac_n "checking size of size_t""... $ac_c" 1>&6
-echo "configure:1887: checking size of size_t" >&5
+echo "configure:1876: checking size of size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1891,7 +1880,7 @@ else
   ac_cv_sizeof_size_t=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1895 "configure"
+#line 1884 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -1902,7 +1891,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:1906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_size_t=`cat conftestval`
 else
@@ -1925,7 +1914,7 @@ cat >>confdefs.h <<\EOF
 #include <sys/types.h> /*for off_t definition*/
 EOF
 echo $ac_n "checking size of off_t""... $ac_c" 1>&6
-echo "configure:1929: checking size of off_t" >&5
+echo "configure:1918: checking size of off_t" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1933,7 +1922,7 @@ else
   ac_cv_sizeof_off_t=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1937 "configure"
+#line 1926 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -1944,7 +1933,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:1948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_off_t=`cat conftestval`
 else
@@ -1971,7 +1960,7 @@ if test "${enable_hsizet+set}" = set; then
 fi
 
 echo $ac_n "checking for sizeof hsize_t and hssize_t""... $ac_c" 1>&6
-echo "configure:1975: checking for sizeof hsize_t and hssize_t" >&5
+echo "configure:1964: checking for sizeof hsize_t and hssize_t" >&5
 case $HSIZET in
     no|small)
 	echo "$ac_t""small" 1>&6
@@ -1986,10 +1975,822 @@ EOF
 esac
 
 
+# Check whether --with-zlib or --without-zlib was given.
+if test "${with_zlib+set}" = set; then
+  withval="$with_zlib"
+  :
+else
+  withval=yes
+fi
+
+case $withval in
+    yes)
+	for ac_hdr in zlib.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:1993: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1998 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:2003: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+	echo $ac_n "checking for compress2 in -lz""... $ac_c" 1>&6
+echo "configure:2030: checking for compress2 in -lz" >&5
+ac_lib_var=`echo z'_'compress2 | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lz  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2038 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char compress2();
+
+int main() {
+compress2()
+; return 0; }
+EOF
+if { (eval echo configure:2049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo z | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lz $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+	;;
+    no)
+	echo $ac_n "checking for GNU zlib""... $ac_c" 1>&6
+echo "configure:2079: checking for GNU zlib" >&5
+	echo "$ac_t""suppressed" 1>&6
+	;;
+    *)
+	zlib_inc="`echo $withval |cut -f1 -d,`"
+	if test "X" != "$zlib_inc"; then
+	    saved_CPPFLAGS="$CPPFLAGS"
+	    CPPFLAGS="$CPPFLAGS -I$zlib_inc"
+	    for ac_hdr in zlib.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:2091: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2096 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:2101: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+CPPFLAGS="$saved_CPPFLAGS"
+fi
+done
+
+        else
+	    for ac_hdr in zlib.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:2133: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2138 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:2143: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+	fi
+
+	zlib_lib="`echo $withval |cut -f2 -d, -s`"
+	if test "X" != "$zlb_lib"; then
+	    saved_LDFLAGS="$LDFLAGS"
+	    LDFLAGS="$LDFLAGS -L$zlib_lib"
+	    echo $ac_n "checking for compress2 in -lz""... $ac_c" 1>&6
+echo "configure:2176: checking for compress2 in -lz" >&5
+ac_lib_var=`echo z'_'compress2 | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lz  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2184 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char compress2();
+
+int main() {
+compress2()
+; return 0; }
+EOF
+if { (eval echo configure:2195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo z | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lz $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+LDFLAGS="$saved_LDFLAGS"
+fi
+
+	else
+	    echo $ac_n "checking for compress2 in -lz""... $ac_c" 1>&6
+echo "configure:2225: checking for compress2 in -lz" >&5
+ac_lib_var=`echo z'_'compress2 | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lz  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2233 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char compress2();
+
+int main() {
+compress2()
+; return 0; }
+EOF
+if { (eval echo configure:2244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo z | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lz $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+	fi
+	;;
+esac
+	
+
+H5TOH4=h5toh4
+
+TESTH5TOH4=testh5toh4
+
+# Check whether --with-hdf4 or --without-hdf4 was given.
+if test "${with_hdf4+set}" = set; then
+  withval="$with_hdf4"
+  :
+else
+  withval=yes
+fi
+
+case $withval in
+    yes)
+	echo $ac_n "checking for main in -ljpeg""... $ac_c" 1>&6
+echo "configure:2291: checking for main in -ljpeg" >&5
+ac_lib_var=`echo jpeg'_'main | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-ljpeg  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2299 "configure"
+#include "confdefs.h"
+
+int main() {
+main()
+; return 0; }
+EOF
+if { (eval echo configure:2306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo jpeg | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-ljpeg $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+unset H5TOH4 TESTH5TOH4
+fi
+
+	for ac_hdr in mfhdf.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:2338: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2343 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:2348: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+unset H5TOH4 TESTH5TOH4
+fi
+done
+
+	echo $ac_n "checking for main in -lmfhdf""... $ac_c" 1>&6
+echo "configure:2376: checking for main in -lmfhdf" >&5
+ac_lib_var=`echo mfhdf'_'main | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lmfhdf  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2384 "configure"
+#include "confdefs.h"
+
+int main() {
+main()
+; return 0; }
+EOF
+if { (eval echo configure:2391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo mfhdf | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lmfhdf $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+unset H5TOH4 TESTH5TOH4
+fi
+
+	echo $ac_n "checking for main in -ldf""... $ac_c" 1>&6
+echo "configure:2420: checking for main in -ldf" >&5
+ac_lib_var=`echo df'_'main | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-ldf  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2428 "configure"
+#include "confdefs.h"
+
+int main() {
+main()
+; return 0; }
+EOF
+if { (eval echo configure:2435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo df | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-ldf $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+unset H5TOH4 TESTH5TOH4
+fi
+
+	;;
+    no)
+	echo $ac_n "checking for HDF4""... $ac_c" 1>&6
+echo "configure:2466: checking for HDF4" >&5
+	echo "$ac_t""suppressed" 1>&6
+	unset H5TOH4 TESTH5TOH4
+	;;
+    *)
+	echo "***************************** OTHER"
+	echo $ac_n "checking for main in -ljpeg""... $ac_c" 1>&6
+echo "configure:2473: checking for main in -ljpeg" >&5
+ac_lib_var=`echo jpeg'_'main | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-ljpeg  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2481 "configure"
+#include "confdefs.h"
+
+int main() {
+main()
+; return 0; }
+EOF
+if { (eval echo configure:2488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo jpeg | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-ljpeg $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+unset H5TOH4 TESTH5TOH4
+fi
+
+	hdf4_inc="`echo $withval |cut -f1 -d,`"
+	if test "X" != "$hdf4_inc"; then
+	    saved_CPPFLAGS="$CPPFLAGS"
+	    CPPFLAGS="$CPPFLAGS -I$hdf4_inc"
+	    for ac_hdr in mfhdf.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:2524: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2529 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:2534: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+CPPFLAGS="$saved_CPPFLAGS"
+	        unset H5TOH4 TESTH5TOH4
+            
+fi
+done
+
+	else
+	    for ac_hdr in mfhdf.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:2568: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2573 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:2578: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+	fi
+	
+	hdf4_lib="`echo $withval |cut -f2 -d, -s`"
+	if test "X" != "$hdf4_lib"; then
+	    saved_LDFLAGS="$LDFLAGS"
+	    LDFLAGS="$LDFLAGS -L$hdf4_lib"
+	    echo $ac_n "checking for main in -lmfhdf""... $ac_c" 1>&6
+echo "configure:2611: checking for main in -lmfhdf" >&5
+ac_lib_var=`echo mfhdf'_'main | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lmfhdf  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2619 "configure"
+#include "confdefs.h"
+
+int main() {
+main()
+; return 0; }
+EOF
+if { (eval echo configure:2626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo mfhdf | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lmfhdf $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+unset H5TOH4 TESTH5TOH4
+fi
+
+	    echo $ac_n "checking for main in -ldf""... $ac_c" 1>&6
+echo "configure:2655: checking for main in -ldf" >&5
+ac_lib_var=`echo df'_'main | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-ldf  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2663 "configure"
+#include "confdefs.h"
+
+int main() {
+main()
+; return 0; }
+EOF
+if { (eval echo configure:2670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo df | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-ldf $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+unset H5TOH4 TESTH5TOH4
+fi
+
+	else
+	    echo $ac_n "checking for main in -lmfhdf""... $ac_c" 1>&6
+echo "configure:2700: checking for main in -lmfhdf" >&5
+ac_lib_var=`echo mfhdf'_'main | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lmfhdf  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2708 "configure"
+#include "confdefs.h"
+
+int main() {
+main()
+; return 0; }
+EOF
+if { (eval echo configure:2715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo mfhdf | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lmfhdf $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+	    echo $ac_n "checking for main in -ldf""... $ac_c" 1>&6
+echo "configure:2743: checking for main in -ldf" >&5
+ac_lib_var=`echo df'_'main | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-ldf  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2751 "configure"
+#include "confdefs.h"
+
+int main() {
+main()
+; return 0; }
+EOF
+if { (eval echo configure:2758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo df | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-ldf $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+	fi
+	;;
+esac
+
+
+
 echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
-echo "configure:1991: checking for tm_gmtoff in struct tm" >&5
+echo "configure:2792: checking for tm_gmtoff in struct tm" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1993 "configure"
+#line 2794 "configure"
 #include "confdefs.h"
 
 #include <sys/time.h>
@@ -1998,7 +2799,7 @@ int main() {
 struct tm tm; tm.tm_gmtoff=0;
 ; return 0; }
 EOF
-if { (eval echo configure:2002: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2803: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define HAVE_TM_GMTOFF 1
@@ -2014,9 +2815,9 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking for global timezone variable""... $ac_c" 1>&6
-echo "configure:2018: checking for global timezone variable" >&5
+echo "configure:2819: checking for global timezone variable" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2020 "configure"
+#line 2821 "configure"
 #include "confdefs.h"
 
 #include <sys/time.h>
@@ -2025,7 +2826,7 @@ int main() {
 timezone=0;
 ; return 0; }
 EOF
-if { (eval echo configure:2029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define HAVE_TIMEZONE 1
@@ -2041,12 +2842,12 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:2045: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:2846: checking whether struct tm is in sys/time.h or time.h" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2050 "configure"
+#line 2851 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -2054,7 +2855,7 @@ int main() {
 struct tm *tp; tp->tm_sec;
 ; return 0; }
 EOF
-if { (eval echo configure:2058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2859: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
 else
@@ -2075,12 +2876,12 @@ EOF
 fi
 
 echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:2079: checking for tm_zone in struct tm" >&5
+echo "configure:2880: checking for tm_zone in struct tm" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2084 "configure"
+#line 2885 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_cv_struct_tm>
@@ -2088,7 +2889,7 @@ int main() {
 struct tm tm; tm.tm_zone;
 ; return 0; }
 EOF
-if { (eval echo configure:2092: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm_zone=yes
 else
@@ -2108,12 +2909,12 @@ EOF
 
 else
   echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:2112: checking for tzname" >&5
+echo "configure:2913: checking for tzname" >&5
 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2117 "configure"
+#line 2918 "configure"
 #include "confdefs.h"
 #include <time.h>
 #ifndef tzname /* For SGI.  */
@@ -2123,7 +2924,7 @@ int main() {
 atoi(*tzname);
 ; return 0; }
 EOF
-if { (eval echo configure:2127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_var_tzname=yes
 else
@@ -2145,9 +2946,9 @@ EOF
 fi
 
 echo $ac_n "checking for struct timezone""... $ac_c" 1>&6
-echo "configure:2149: checking for struct timezone" >&5
+echo "configure:2950: checking for struct timezone" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2151 "configure"
+#line 2952 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -2157,7 +2958,7 @@ int main() {
 struct timezone tz; tz.tz_minuteswest=0;
 ; return 0; }
 EOF
-if { (eval echo configure:2161: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2962: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define HAVE_STRUCT_TIMEZONE 1
@@ -2173,9 +2974,9 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6
-echo "configure:2177: checking for st_blocks in struct stat" >&5
+echo "configure:2978: checking for st_blocks in struct stat" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2179 "configure"
+#line 2980 "configure"
 #include "confdefs.h"
 
 #include <sys/stat.h>
@@ -2183,7 +2984,7 @@ int main() {
 struct stat sb; sb.st_blocks=0;
 ; return 0; }
 EOF
-if { (eval echo configure:2187: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2988: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define HAVE_STAT_ST_BLOCKS 1
@@ -2201,12 +3002,12 @@ rm -f conftest*
 for ac_func in _getvideoconfig gettextinfo GetConsoleScreenBufferInfo
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2205: checking for $ac_func" >&5
+echo "configure:3006: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2210 "configure"
+#line 3011 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2229,7 +3030,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2256,12 +3057,12 @@ done
 for ac_func in _scrsize ioctl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2260: checking for $ac_func" >&5
+echo "configure:3061: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2265 "configure"
+#line 3066 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2284,7 +3085,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2310,16 +3111,16 @@ done
 
 
 echo $ac_n "checking for struct videoconfig""... $ac_c" 1>&6
-echo "configure:2314: checking for struct videoconfig" >&5
+echo "configure:3115: checking for struct videoconfig" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2316 "configure"
+#line 3117 "configure"
 #include "confdefs.h"
 
 int main() {
 struct videoconfig w; w.numtextcols=0;
 ; return 0; }
 EOF
-if { (eval echo configure:2323: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define HAVE_STRUCT_VIDEOCONFIG 1
@@ -2335,16 +3136,16 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking for struct text_info""... $ac_c" 1>&6
-echo "configure:2339: checking for struct text_info" >&5
+echo "configure:3140: checking for struct text_info" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2341 "configure"
+#line 3142 "configure"
 #include "confdefs.h"
 
 int main() {
 struct text_info w; w.screenwidth=0;
 ; return 0; }
 EOF
-if { (eval echo configure:2348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3149: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define HAVE_STRUCT_TEXT_INFO 1
@@ -2360,16 +3161,16 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking for TIOCGWINSZ""... $ac_c" 1>&6
-echo "configure:2364: checking for TIOCGWINSZ" >&5
+echo "configure:3165: checking for TIOCGWINSZ" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2366 "configure"
+#line 3167 "configure"
 #include "confdefs.h"
 #include <sys/ioctl.h>
 int main() {
 int w=TIOCGWINSZ;
 ; return 0; }
 EOF
-if { (eval echo configure:2373: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3174: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define HAVE_TIOCGWINSZ 1
@@ -2385,16 +3186,16 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking for TIOCGGETD""... $ac_c" 1>&6
-echo "configure:2389: checking for TIOCGGETD" >&5
+echo "configure:3190: checking for TIOCGGETD" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2391 "configure"
+#line 3192 "configure"
 #include "confdefs.h"
 #include <sys/ioctl.h>
 int main() {
 int w=TIOCGETD;
 ; return 0; }
 EOF
-if { (eval echo configure:2398: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3199: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define HAVE_TIOCGETD 1
@@ -2413,12 +3214,12 @@ rm -f conftest*
 for ac_func in getpwuid gethostname system getrusage fork waitpid
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2417: checking for $ac_func" >&5
+echo "configure:3218: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2422 "configure"
+#line 3223 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2441,7 +3242,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2468,12 +3269,12 @@ done
 for ac_func in gettimeofday BSDgettimeofday difftime sigaction
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2472: checking for $ac_func" >&5
+echo "configure:3273: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2477 "configure"
+#line 3278 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2496,7 +3297,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2522,24 +3323,24 @@ done
 
 
 cat > conftest.$ac_ext <<EOF
-#line 2526 "configure"
+#line 3327 "configure"
 #include "confdefs.h"
 #include<sys/types.h>
 int main() {
 off64_t n = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:2533: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3334: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   for ac_func in lseek64 fseek64
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2538: checking for $ac_func" >&5
+echo "configure:3339: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2543 "configure"
+#line 3344 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2562,7 +3363,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2597,12 +3398,12 @@ rm -f conftest*
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:2601: checking for working const" >&5
+echo "configure:3402: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2606 "configure"
+#line 3407 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2651,7 +3452,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:2655: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3456: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -2672,21 +3473,21 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:2676: checking for inline" >&5
+echo "configure:3477: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 2683 "configure"
+#line 3484 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:2690: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -2713,16 +3514,16 @@ esac
 
 
 echo $ac_n "checking for __attribute__ extension""... $ac_c" 1>&6
-echo "configure:2717: checking for __attribute__ extension" >&5
+echo "configure:3518: checking for __attribute__ extension" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2719 "configure"
+#line 3520 "configure"
 #include "confdefs.h"
 
 int main() {
 int __attribute__((unused)) f(void){return 1;}
 ; return 0; }
 EOF
-if { (eval echo configure:2726: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3527: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define HAVE_ATTRIBUTE 1
@@ -2738,16 +3539,16 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking for __FUNCTION__ extension""... $ac_c" 1>&6
-echo "configure:2742: checking for __FUNCTION__ extension" >&5
+echo "configure:3543: checking for __FUNCTION__ extension" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2744 "configure"
+#line 3545 "configure"
 #include "confdefs.h"
 
 int main() {
 int f(void){return __FUNCTION__;}
 ; return 0; }
 EOF
-if { (eval echo configure:2751: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define HAVE_FUNCTION 1
@@ -2763,7 +3564,7 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking how to print long long""... $ac_c" 1>&6
-echo "configure:2767: checking how to print long long" >&5
+echo "configure:3568: checking how to print long long" >&5
 if eval "test \"`echo '$''{'hdf5_cv_printf_ll'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2772,7 +3573,7 @@ else
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 2776 "configure"
+#line 3577 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -2783,7 +3584,7 @@ else
 	             sprintf(s,"%${hdf5_cv_printf_ll}d",x);
 	             exit (strcmp(s,"1099511627776"));}
 EOF
-if { (eval echo configure:2787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   break
 else
@@ -2804,7 +3605,7 @@ EOF
 
 
 echo $ac_n "checking for debug flags""... $ac_c" 1>&6
-echo "configure:2808: checking for debug flags" >&5
+echo "configure:3609: checking for debug flags" >&5
 # Check whether --enable-debug or --disable-debug was given.
 if test "${enable_debug+set}" = set; then
   enableval="$enable_debug"
@@ -2836,7 +3637,7 @@ if test "X" != "X$DEBUG_PKG"; then
 fi
 
 echo $ac_n "checking for API tracing""... $ac_c" 1>&6
-echo "configure:2840: checking for API tracing" >&5;
+echo "configure:3641: checking for API tracing" >&5;
 # Check whether --enable-trace or --disable-trace was given.
 if test "${enable_trace+set}" = set; then
   enableval="$enable_trace"
@@ -2859,32 +3660,34 @@ if test "${enable_parallel+set}" = set; then
 fi
 
 echo $ac_n "checking for parallel support""... $ac_c" 1>&6
-echo "configure:2863: checking for parallel support" >&5;
+echo "configure:3664: checking for parallel support" >&5;
 
 
-case "X-$PARALLEL" in
 
-   X-|X-no)
-      # Parallel support is not enabled
-      echo "$ac_t""disabled" 1>&6
-      ;;
+if test "mpicc" = "$CC_BASENAME" -a "X-" = "X-$PARALLEL"; then
+    PARALLEL=mpio
+fi
 
-   X-mpio|X-yes)
-      # Use MPIO.  Define HAVE_PARALLEL in src/H5config.h (comes from
-      # ./acconfig.h) and augment the include and library search paths
-      # (it doesn't hurt to have extra paths).  Then check for header
-      # files and libraries. Some extra source files are added to the
-      # list also so we don't have to ifdef out the whole file.
-      echo "$ac_t""mpio" 1>&6
-      cat >> confdefs.h <<\EOF
+case "X-$PARALLEL" in
+
+    X-|X-no)
+        # Parallel support is not enabled
+        echo "$ac_t""disabled" 1>&6
+        ;;
+
+    X-mpio|X-yes)
+        # Use MPIO.  Define HAVE_PARALLEL in src/H5config.h (comes from
+        # ./acconfig.h) and augment the include and library search paths
+        # (it doesn't hurt to have extra paths).  Then check for header
+        # files and libraries. Some extra source files are added to the
+        # list also so we don't have to ifdef out the whole file.
+        echo "$ac_t""mpio" 1>&6
+        cat >> confdefs.h <<\EOF
 #define HAVE_PARALLEL 1
 EOF
 
-      CPPFLAGS="$CPPFLAGS $MPI_INC"
-      CFLAGS="$CFLAGS $MPI_LIB"
-      RUNTEST="$RUNTEST"
-      echo $ac_n "checking for main in -lmpi""... $ac_c" 1>&6
-echo "configure:2888: checking for main in -lmpi" >&5
+        echo $ac_n "checking for main in -lmpi""... $ac_c" 1>&6
+echo "configure:3691: checking for main in -lmpi" >&5
 ac_lib_var=`echo mpi'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2892,14 +3695,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lmpi  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2896 "configure"
+#line 3699 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:2903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2925,8 +3728,8 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 fi
-        echo $ac_n "checking for main in -lmpio""... $ac_c" 1>&6
-echo "configure:2930: checking for main in -lmpio" >&5
+          echo $ac_n "checking for main in -lmpio""... $ac_c" 1>&6
+echo "configure:3733: checking for main in -lmpio" >&5
 ac_lib_var=`echo mpio'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2934,14 +3737,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lmpio  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2938 "configure"
+#line 3741 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:2945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2967,11 +3770,19 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 fi
-       ;;
+ 	if test "X-" = "X-$RUNSERIAL" -o "X-none" = "X-$RUNSERIAL"; then
+	    RUNSERIAL=
+	fi
+	if test "X-" = "X-$RUNPARALLEL"; then
+	    RUNPARALLEL="mpirun -np 2"
+	elif test "X-none" = "X-$RUNPARALLEL"; then
+	    RUNPARALLEL=
+	fi
+        ;;
 
-   *)
-      { echo "configure: error: unknown parallel support: $PARALLEL" 1>&2; exit 1; }
-      ;;
+    *)
+        { echo "configure: error: unknown parallel support: $PARALLEL" 1>&2; exit 1; }
+        ;;
 esac
         
 
@@ -3104,7 +3915,8 @@ ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
 trap 'rm -fr `echo "config/depend config/commence config/conclude \
-          Makefile src/Makefile pablo/Makefile test/Makefile tools/Makefile examples/Makefile src/H5config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+          Makefile src/Makefile pablo/Makefile test/Makefile \
+          testpar/Makefile tools/Makefile examples/Makefile src/H5config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -3146,7 +3958,10 @@ s%@INSTALL_DATA@%$INSTALL_DATA%g
 s%@RANLIB@%$RANLIB%g
 s%@AR@%$AR%g
 s%@CPP@%$CPP%g
-s%@RUNTEST@%$RUNTEST%g
+s%@H5TOH4@%$H5TOH4%g
+s%@TESTH5TOH4@%$TESTH5TOH4%g
+s%@RUNSERIAL@%$RUNSERIAL%g
+s%@RUNPARALLEL@%$RUNPARALLEL%g
 /@COMMENCE@/r $COMMENCE
 s%@COMMENCE@%%g
 /@CONCLUDE@/r $CONCLUDE
@@ -3199,7 +4014,8 @@ EOF
 cat >> $CONFIG_STATUS <<EOF
 
 CONFIG_FILES=\${CONFIG_FILES-"config/depend config/commence config/conclude \
-          Makefile src/Makefile pablo/Makefile test/Makefile tools/Makefile examples/Makefile"}
+          Makefile src/Makefile pablo/Makefile test/Makefile \
+          testpar/Makefile tools/Makefile examples/Makefile"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
diff --git a/configure.in b/configure.in
index f744f50..9120fbd 100644
--- a/configure.in
+++ b/configure.in
@@ -28,8 +28,6 @@ elif test $hdf5_cv_host != $host; then
    AC_MSG_ERROR(config.cache file is invalid)
 fi
 
-
-
 dnl ----------------------------------------------------------------------
 dnl Source any special files that we need.  These files normally aren't
 dnl present but can be used by the maintainers to fine tune things like
@@ -44,6 +42,7 @@ dnl	OS
 dnl	VENDOR
 dnl	CPU
 dnl
+
 AC_MSG_CHECKING(for host config file)
 host_config="none"
 for f in $host \
@@ -60,14 +59,15 @@ for f in $host \
 done
 AC_MSG_RESULT($host_config)
 if test $host_config != "none"; then
+   CC_BASENAME="`echo $CC |cut -f1 -d' ' |xargs basename 2>/dev/null`"
    . $host_config
 fi
 
-
 dnl ----------------------------------------------------------------------
 dnl Check for programs.
 dnl
 AC_PROG_CC
+CC_BASENAME="`echo $CC |cut -f1 -d' ' |xargs basename 2>/dev/null`"
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_PROG_RANLIB
@@ -98,7 +98,7 @@ dnl Production flags?
 dnl
 AC_MSG_CHECKING(for production mode)
 AC_ARG_ENABLE(production,
-  [--enable-production=yes|no  Determines how to run the compiler.])
+  [  --enable-production     Determines how to run the compiler.])
 
 case "X-$enableval" in
    X-yes)
@@ -121,27 +121,27 @@ case "X-$enableval" in
       ;;
 esac
 
-
 dnl ----------------------------------------------------------------------
-dnl Check for libraries.
+dnl Check for system libraries.
 dnl
 AC_CHECK_LIB(m, ceil)
 AC_CHECK_LIB(coug, main)	dnl ...for ASCI/Red
-AC_CHECK_LIB(z, compress2)
+AC_CHECK_LIB(jpeg,main)		dnl ...required for linking hdf4 apps
 
 dnl ----------------------------------------------------------------------
-dnl Check for header files.
+dnl Check for system header files.
 dnl
 AC_HEADER_STDC
 AC_HEADER_TIME
-AC_CHECK_HEADERS(io.h sys/resource.h sys/time.h unistd.h winsock.h zlib.h)
+AC_CHECK_HEADERS(io.h sys/resource.h sys/time.h unistd.h winsock.h)
 AC_CHECK_HEADERS(sys/ioctl.h sys/stat.h)
 
 dnl ----------------------------------------------------------------------
 dnl Data types and their sizes.
 dnl
 AC_TYPE_OFF_T
-AC_TYPE_SIZE_T
+AC_CHECK_TYPE(size_t, unsigned long)
+AC_CHECK_TYPE(ssize_t, long)
 AC_C_BIGENDIAN
 AC_CHECK_SIZEOF(short, 2)
 AC_CHECK_SIZEOF(int, 4)
@@ -158,12 +158,12 @@ EOF
 AC_CHECK_SIZEOF(off_t, 4)
 
 AC_ARG_ENABLE(hsizet,
-  [--disable-hsizet          Datasets can normally be larger than memory
-                             and/or files but some compilers are unable to
-                             handle this (including versions of GCC before
-                             2.8.0).  Disabling the feature causes dataset
-                             sizes to be restricted to the size of core memory,
-                             or 'size_t'.],
+  [  --disable-hsizet        Datasets can normally be larger than memory
+                          and/or files but some compilers are unable to
+                          handle this (including versions of GCC before
+                          2.8.0).  Disabling the feature causes dataset
+                          sizes to be restricted to the size of core memory,
+                          or 'size_t'.],
   HSIZET=$enableval)
 AC_MSG_CHECKING(for sizeof hsize_t and hssize_t)
 case $HSIZET in
@@ -177,6 +177,94 @@ case $HSIZET in
 esac
 
 dnl ----------------------------------------------------------------------
+dnl Is the GNU zlib present?  It has a header file `zlib.h' and a library
+dnl `-lz' and their locations might be specified with the `--enable-zlib'
+dnl command-line switch.  The value is an include path and/or a library path.
+dnl If the library path is specified then it must be preceded by a comma.
+dnl
+
+AC_ARG_WITH(zlib,[  --with-zlib=INC,LIB     Use the GNU zlib compression],
+            ,withval=yes)
+case $withval in
+    yes)
+	AC_CHECK_HEADERS(zlib.h)
+	AC_CHECK_LIB(z, compress2)
+	;;
+    no)
+	AC_MSG_CHECKING(for GNU zlib)
+	AC_MSG_RESULT(suppressed)
+	;;
+    *)
+	zlib_inc="`echo $withval |cut -f1 -d,`"
+	if test "X" != "$zlib_inc"; then
+	    saved_CPPFLAGS="$CPPFLAGS"
+	    CPPFLAGS="$CPPFLAGS -I$zlib_inc"
+	    AC_CHECK_HEADERS(zlib.h,,CPPFLAGS="$saved_CPPFLAGS")
+        else
+	    AC_CHECK_HEADERS(zlib.h)
+	fi
+
+	zlib_lib="`echo $withval |cut -f2 -d, -s`"
+	if test "X" != "$zlb_lib"; then
+	    saved_LDFLAGS="$LDFLAGS"
+	    LDFLAGS="$LDFLAGS -L$zlib_lib"
+	    AC_CHECK_LIB(z, compress2,,LDFLAGS="$saved_LDFLAGS")
+	else
+	    AC_CHECK_LIB(z, compress2)
+	fi
+	;;
+esac
+	
+dnl ----------------------------------------------------------------------
+dnl Is HDF4 present?  If so then we can compile the h5toh4 converter. We
+dnl assume h5toh4 can be compiled and then prove otherwise when we don't find
+dnl a header file or library.
+dnl
+AC_SUBST(H5TOH4)
+H5TOH4=h5toh4
+AC_SUBST(TESTH5TOH4)
+TESTH5TOH4=testh5toh4
+
+AC_ARG_WITH(hdf4,[  --with-hdf4=INC,LIB     Use the HDF4 library],,withval=yes)
+case $withval in
+    yes)
+	AC_CHECK_HEADERS(mfhdf.h,,unset H5TOH4 TESTH5TOH4)
+	AC_CHECK_LIB(mfhdf,main,,unset H5TOH4 TESTH5TOH4)
+	AC_CHECK_LIB(df,main,,unset H5TOH4 TESTH5TOH4)
+	;;
+    no)
+	AC_MSG_CHECKING(for HDF4)
+	AC_MSG_RESULT(suppressed)
+	unset H5TOH4 TESTH5TOH4
+	;;
+    *)
+	hdf4_inc="`echo $withval |cut -f1 -d,`"
+	if test "X" != "$hdf4_inc"; then
+	    saved_CPPFLAGS="$CPPFLAGS"
+	    CPPFLAGS="$CPPFLAGS -I$hdf4_inc"
+	    AC_CHECK_HEADERS(mfhdf.h,,
+	        CPPFLAGS="$saved_CPPFLAGS"
+	        unset H5TOH4 TESTH5TOH4
+            )
+	else
+	    AC_CHECK_HEADERS(mfhdf.h)
+	fi
+	
+	hdf4_lib="`echo $withval |cut -f2 -d, -s`"
+	if test "X" != "$hdf4_lib"; then
+	    saved_LDFLAGS="$LDFLAGS"
+	    LDFLAGS="$LDFLAGS -L$hdf4_lib"
+	    AC_CHECK_LIB(mfhdf,main,,unset H5TOH4 TESTH5TOH4)
+	    AC_CHECK_LIB(df,main,,unset H5TOH4 TESTH5TOH4)
+	else
+	    AC_CHECK_LIB(mfhdf,main)
+	    AC_CHECK_LIB(df,main)
+	fi
+	;;
+esac
+
+
+dnl ----------------------------------------------------------------------
 dnl How does one figure out the local time zone?  Anyone know of a
 dnl Posix way to do this?
 dnl
@@ -309,7 +397,7 @@ dnl Turn on debugging by setting compiler flags
 dnl
 AC_MSG_CHECKING(for debug flags)
 AC_ARG_ENABLE(debug,
-  [--enable-debug=all        Turn on debugging in all packages.  One may also
+  [  --enable-debug[=all]    Turn on debugging in all packages.  One may also
                           specify a comma-separated list of package names
                           without the leading H5 or the word no.  The default
                           is most packages.],
@@ -343,7 +431,7 @@ dnl Enable tracing of the API
 dnl
 AC_MSG_CHECKING(for API tracing);
 AC_ARG_ENABLE(trace,
-  [--disable-trace           Disable API tracing capability],
+  [  --disable-trace         Disable API tracing capability],
   TRACE=$enableval)
 
 if test X = "X$TRACE" -o Xyes = "X$TRACE"; then
@@ -355,39 +443,51 @@ else
 fi
 
 dnl ----------------------------------------------------------------------
-dnl Check for parallel support
+dnl Check for parallel support.  If the base name of the compiler is `mpicc'
+dnl then assume parallel support is `mpio' unless specified otherwise by
+dnl the user.
 dnl
 AC_ARG_ENABLE(parallel,
-  --enable-parallel=mpio    Enable parallel support with MPIO,
+  [  --enable-parallel=mpio  Enable parallel support with MPIO],
   PARALLEL=$enableval)
 AC_MSG_CHECKING(for parallel support);
-AC_SUBST(RUNTEST)
+AC_SUBST(RUNSERIAL)
+AC_SUBST(RUNPARALLEL)
 
-case "X-$PARALLEL" in
+if test "mpicc" = "$CC_BASENAME" -a "X-" = "X-$PARALLEL"; then
+    PARALLEL=mpio
+fi
 
-   X-|X-no)
-      # Parallel support is not enabled
-      AC_MSG_RESULT(disabled)
-      ;;
+case "X-$PARALLEL" in
 
-   X-mpio|X-yes)
-      # Use MPIO.  Define HAVE_PARALLEL in src/H5config.h (comes from
-      # ./acconfig.h) and augment the include and library search paths
-      # (it doesn't hurt to have extra paths).  Then check for header
-      # files and libraries. Some extra source files are added to the
-      # list also so we don't have to ifdef out the whole file.
-      AC_MSG_RESULT(mpio)
-      AC_DEFINE(HAVE_PARALLEL)
-      CPPFLAGS="$CPPFLAGS $MPI_INC"
-      CFLAGS="$CFLAGS $MPI_LIB"
-      RUNTEST="$RUNTEST"
-      AC_CHECK_LIB(mpi,main)  dnl Replace `main' with some function
-      AC_CHECK_LIB(mpio,main) dnl Replace `main' with some function
-      ;;
+    X-|X-no)
+        # Parallel support is not enabled
+        AC_MSG_RESULT(disabled)
+        ;;
+
+    X-mpio|X-yes)
+        # Use MPIO.  Define HAVE_PARALLEL in src/H5config.h (comes from
+        # ./acconfig.h) and augment the include and library search paths
+        # (it doesn't hurt to have extra paths).  Then check for header
+        # files and libraries. Some extra source files are added to the
+        # list also so we don't have to ifdef out the whole file.
+        AC_MSG_RESULT(mpio)
+        AC_DEFINE(HAVE_PARALLEL)
+        AC_CHECK_LIB(mpi,main)  dnl Replace `main' with some function
+        AC_CHECK_LIB(mpio,main) dnl Replace `main' with some function
+	if test "X-" = "X-$RUNSERIAL" -o "X-none" = "X-$RUNSERIAL"; then
+	    RUNSERIAL=
+	fi
+	if test "X-" = "X-$RUNPARALLEL"; then
+	    RUNPARALLEL="mpirun -np 2"
+	elif test "X-none" = "X-$RUNPARALLEL"; then
+	    RUNPARALLEL=
+	fi
+        ;;
 
-   *)
-      AC_MSG_ERROR(unknown parallel support: $PARALLEL)
-      ;;
+    *)
+        AC_MSG_ERROR(unknown parallel support: $PARALLEL)
+        ;;
 esac
         
 
@@ -432,4 +532,5 @@ dnl before we generate them or the Makefiles.
 touch ./config/stamp1 ./config/stamp2
 
 AC_OUTPUT(config/depend config/commence config/conclude \
-          Makefile src/Makefile pablo/Makefile test/Makefile tools/Makefile examples/Makefile)
+          Makefile src/Makefile pablo/Makefile test/Makefile \
+          testpar/Makefile tools/Makefile examples/Makefile)
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 2d476db..5d24890 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -6,8 +6,10 @@
 # 
 @COMMENCE@
 
-# Add include directory to the C preprocessor flags.
+# Add include directory to the C preprocessor flags and the hdf5 library
+# to the library list.
 CPPFLAGS=-I. -I../src @CPPFLAGS@
+LIBS=../src/libhdf5.a @LIBS@
 
 # These are the programs that `make all' will build, `make install'
 # will copy to the binaries directory, and `make uninstall' will
@@ -29,59 +31,31 @@ PROG_SRC=h5_chunk_read.c h5_compound.c h5_extend_write.c h5_group.c \
 	 h5_read.c h5_write.c h5_select.c h5_attribute.c
 PROG_OBJ=$(PROG_SRC:.c=.o)
 
-# List the source files for each individual program.  Most programs
-# will have only one source file, but some might have more. We use
-# these variables instead of listing the object files directly in the
-# rules that build the executable so that we don't have to ever
-# duplicate a list of names.
-CHUNK_READ_SRC=h5_chunk_read.c
-CHUNK_READ_OBJ=$(CHUNK_READ_SRC:.c=.o)
 
-COMPOUND_SRC=h5_compound.c
-COMPOUND_OBJ=$(COMPOUND_SRC:.c=.o)
+# How to build the programs... they all depend on the hdf5 library
+$(PROGS): ../src/libhdf5.a
+h5_chunk_read: h5_chunk_read.o
+	$(CC) $(CFLAGS) -o $@ h5_chunk_read.o $(LDFLAGS) $(LIBS)
 
-EXTEND_WRITE_SRC=h5_extend_write.c
-EXTEND_WRITE_OBJ=$(EXTEND_WRITE_SRC:.c=.o)
+h5_compound: h5_compound.o
+	$(CC) $(CFLAGS) -o $@ h5_compound.o $(LDFLAGS) $(LIBS)
 
-GROUP_SRC=h5_group.c
-GROUP_OBJ=$(GROUP_SRC:.c=.o)
+h5_extend_write: h5_extend_write.o
+	$(CC) $(CFLAGS) -o $@ h5_extend_write.o $(LDFLAGS) $(LIBS)
 
-READ_SRC=h5_read.c
-READ_OBJ=$(READ_SRC:.c=.o)
+h5_group: h5_group.o
+	$(CC) $(CFLAGS) -o $@ h5_group.o $(LDFLAGS) $(LIBS)
 
-WRITE_SRC=h5_write.c
-WRITE_OBJ=$(WRITE_SRC:.c=.o)
+h5_write: h5_write.o
+	$(CC) $(CFLAGS) -o $@ h5_write.o $(LDFLAGS) $(LIBS)
 
-SELECT_SRC=h5_select.c
-SELECT_OBJ=$(SELECT_SRC:.c=.o)
+h5_read: h5_read.o
+	$(CC) $(CFLAGS) -o $@ h5_read.o $(LDFLAGS) $(LIBS)
 
+h5_select: h5_select.o
+	$(CC) $(CFLAGS) -o $@ h5_select.o $(LDFLAGS) $(LIBS)
 
-ATTRIBUTE_SRC=h5_attribute.c
-ATTRIBUTE_OBJ=$(ATTRIBUTE_SRC:.c=.o)
-
-# How to build the programs...
-h5_chunk_read: $(CHUNK_READ_OBJ) ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ $(CHUNK_READ_OBJ) ../src/libhdf5.a $(LIBS)
-
-h5_compound: $(COMPOUND_OBJ) ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ $(COMPOUND_OBJ) ../src/libhdf5.a $(LIBS)
-
-h5_extend_write: $(EXTEND_WRITE_OBJ) ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ $(EXTEND_WRITE_OBJ) ../src/libhdf5.a $(LIBS)
-
-h5_group: $(GROUP_OBJ) ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ $(GROUP_OBJ) ../src/libhdf5.a $(LIBS)
-
-h5_write: $(WRITE_OBJ) ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ $(WRITE_OBJ) ../src/libhdf5.a $(LIBS)
-
-h5_read: $(READ_OBJ) ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ $(READ_OBJ) ../src/libhdf5.a $(LIBS)
-
-h5_select: $(SELECT_OBJ) ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ $(SELECT_OBJ) ../src/libhdf5.a $(LIBS)
-
-h5_attribute: $(ATTRIBUTE_OBJ) ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ $(ATTRIBUTE_OBJ) ../src/libhdf5.a $(LIBS)
+h5_attribute: h5_attribute.o
+	$(CC) $(CFLAGS) -o $@ h5_attribute.o $(LDFLAGS) $(LIBS)
 
 @CONCLUDE@
diff --git a/src/H5config.h.in b/src/H5config.h.in
index 88b268d..3bdd638 100644
--- a/src/H5config.h.in
+++ b/src/H5config.h.in
@@ -155,6 +155,9 @@
 /* Define if you have the <io.h> header file.  */
 #undef HAVE_IO_H
 
+/* Define if you have the <mfhdf.h> header file.  */
+#undef HAVE_MFHDF_H
+
 /* Define if you have the <sys/ioctl.h> header file.  */
 #undef HAVE_SYS_IOCTL_H
 
@@ -179,9 +182,18 @@
 /* Define if you have the coug library (-lcoug).  */
 #undef HAVE_LIBCOUG
 
+/* Define if you have the df library (-ldf).  */
+#undef HAVE_LIBDF
+
+/* Define if you have the jpeg library (-ljpeg).  */
+#undef HAVE_LIBJPEG
+
 /* Define if you have the m library (-lm).  */
 #undef HAVE_LIBM
 
+/* Define if you have the mfhdf library (-lmfhdf).  */
+#undef HAVE_LIBMFHDF
+
 /* Define if you have the mpi library (-lmpi).  */
 #undef HAVE_LIBMPI
 
diff --git a/src/H5public.h b/src/H5public.h
index f72f386..da14914 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -76,7 +76,6 @@ typedef signed long long	hssize_t;
 #   elif SIZEOF___INT64==8
 typedef unsigned __int64	hsize_t;
 typedef signed __int64		hssize_t;
-typedef signed int ssize_t;
 #   endif
 #else
 typedef size_t			hsize_t;
diff --git a/src/Makefile.in b/src/Makefile.in
index b59f610..b9bc18f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -19,8 +19,9 @@ LIB_SRC=H5.c H5A.c H5AC.c H5B.c H5D.c H5E.c H5F.c H5Farray.c H5Fcore.c \
     H5Fstdio.c H5G.c H5Gent.c H5Gnode.c H5Gstab.c H5HG.c H5HL.c H5I.c H5MF.c \
     H5MM.c H5O.c H5Oattr.c H5Ocomp.c H5Ocont.c H5Odtype.c H5Oefl.c H5Ofill.c \
     H5Olayout.c H5Omtime.c H5Oname.c H5Onull.c H5Osdspace.c H5Oshared.c \
-    H5Ostab.c H5P.c H5R.c H5RA.c H5S.c H5Sall.c H5Shyper.c H5Smpio.c H5Snone.c \
-    H5Spoint.c H5Sselect.c H5T.c H5Tbit.c H5Tconv.c H5Tinit.c H5TB.c H5V.c H5Z.c
+    H5Ostab.c H5P.c H5R.c H5RA.c H5S.c H5Sall.c H5Shyper.c H5Smpio.c \
+    H5Spoint.c H5Sselect.c H5T.c H5Tbit.c H5Tconv.c H5Tinit.c H5TB.c H5V.c \
+    H5Z.c 
 
 LIB_OBJ=$(LIB_SRC:.c=.o)
 
@@ -43,7 +44,7 @@ PRIVATE_HDR=H5private.h H5Aprivate.h H5Apkg.h H5ACprivate.h H5Bprivate.h \
 
 # Number format detection
 H5Tinit.c: H5detect
-	$(RUNTEST) ./H5detect >H5Tinit.c
+	$(RUNSERIAL) ./H5detect >H5Tinit.c
 
 # no $(LIB) in the action below since that's being made now.
 H5detect: H5detect.o
diff --git a/test/Makefile.in b/test/Makefile.in
index 98f4af0..b52b95e 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -6,8 +6,10 @@
 # 
 @COMMENCE@
 
-# Add include directory to the C preprocessor flags.
+# Add include directory to the C preprocessor flags and the hdf5
+# library to the library list.
 CPPFLAGS=-I. -I../src @CPPFLAGS@
+LIBS=../src/libhdf5.a @LIBS@
 
 # These are our main targets. They should be listed in the order to be
 # executed, generally most specific tests to least specific tests.
@@ -52,78 +54,79 @@ timings _timings: $(TIMINGS)
 	   fi;								      \
 	done;
 
-# How to build the programs...
+# How to build the tests...  They all depend on the hdf5 library.
+$(TESTS): ../src/libhdf5.a
 TESTHDF5_OBJ=testhdf5.o tattr.o tfile.o theap.o tmeta.o tohdr.o trefer.o tselect.o tstab.o th5s.o
-testhdf5: $(TESTHDF5_OBJ) ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ $(TESTHDF5_OBJ) ../src/libhdf5.a $(LIBS)
+testhdf5: $(TESTHDF5_OBJ)
+	$(CC) $(CFLAGS) -o $@ $(TESTHDF5_OBJ) $(LDFLAGS) $(LIBS)
 
-gheap: gheap.o ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ gheap.o ../src/libhdf5.a $(LIBS)
+gheap: gheap.o
+	$(CC) $(CFLAGS) -o $@ gheap.o $(LDFLAGS) $(LIBS)
 
-dsets: dsets.o ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ dsets.o ../src/libhdf5.a $(LIBS)
+dsets: dsets.o
+	$(CC) $(CFLAGS) -o $@ dsets.o $(LDFLAGS) $(LIBS)
 
-bittests: bittests.o ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ bittests.o ../src/libhdf5.a $(LIBS)
+bittests: bittests.o
+	$(CC) $(CFLAGS) -o $@ bittests.o $(LDFLAGS) $(LIBS)
 
-dtypes: dtypes.o ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ dtypes.o ../src/libhdf5.a $(LIBS)
+dtypes: dtypes.o
+	$(CC) $(CFLAGS) -o $@ dtypes.o $(LDFLAGS) $(LIBS)
 
-hyperslab: hyperslab.o ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ hyperslab.o ../src/libhdf5.a $(LIBS)
+hyperslab: hyperslab.o
+	$(CC) $(CFLAGS) -o $@ hyperslab.o $(LDFLAGS) $(LIBS)
 
-istore: istore.o ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ istore.o ../src/libhdf5.a $(LIBS)
+istore: istore.o
+	$(CC) $(CFLAGS) -o $@ istore.o $(LDFLAGS) $(LIBS)
 
-cmpd_dset: cmpd_dset.o ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ cmpd_dset.o ../src/libhdf5.a $(LIBS)
+cmpd_dset: cmpd_dset.o
+	$(CC) $(CFLAGS) -o $@ cmpd_dset.o $(LDFLAGS) $(LIBS)
 
-extend: extend.o ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ extend.o ../src/libhdf5.a $(LIBS)
+extend: extend.o
+	$(CC) $(CFLAGS) -o $@ extend.o $(LDFLAGS) $(LIBS)
 
-external: external.o ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ external.o ../src/libhdf5.a $(LIBS)
+external: external.o
+	$(CC) $(CFLAGS) -o $@ external.o $(LDFLAGS) $(LIBS)
 
-shtype: shtype.o ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ shtype.o ../src/libhdf5.a $(LIBS)
+shtype: shtype.o
+	$(CC) $(CFLAGS) -o $@ shtype.o $(LDFLAGS) $(LIBS)
 
-iopipe: iopipe.o ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ iopipe.o ../src/libhdf5.a $(LIBS)
+iopipe: iopipe.o
+	$(CC) $(CFLAGS) -o $@ iopipe.o $(LDFLAGS) $(LIBS)
 
-grptime: grptime.o ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ grptime.o ../src/libhdf5.a $(LIBS)
+grptime: grptime.o
+	$(CC) $(CFLAGS) -o $@ grptime.o $(LDFLAGS) $(LIBS)
 
-big: big.o ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ big.o ../src/libhdf5.a $(LIBS)
+big: big.o
+	$(CC) $(CFLAGS) -o $@ big.o $(LDFLAGS) $(LIBS)
 
-links: links.o ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ links.o ../src/libhdf5.a $(LIBS)
+links: links.o
+	$(CC) $(CFLAGS) -o $@ links.o $(LDFLAGS) $(LIBS)
 
-chunk: chunk.o ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ chunk.o ../src/libhdf5.a $(LIBS)
+chunk: chunk.o
+	$(CC) $(CFLAGS) -o $@ chunk.o $(LDFLAGS) $(LIBS)
 
-mtime: mtime.o ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ mtime.o ../src/libhdf5.a $(LIBS)
+mtime: mtime.o
+	$(CC) $(CFLAGS) -o $@ mtime.o $(LDFLAGS) $(LIBS)
 
-ragged: ragged.o ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ ragged.o ../src/libhdf5.a $(LIBS)
+ragged: ragged.o
+	$(CC) $(CFLAGS) -o $@ ragged.o $(LDFLAGS) $(LIBS)
 
-unlink: unlink.o ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ unlink.o ../src/libhdf5.a $(LIBS)
+unlink: unlink.o
+	$(CC) $(CFLAGS) -o $@ unlink.o $(LDFLAGS) $(LIBS)
 
-overhead: overhead.o ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ overhead.o ../src/libhdf5.a $(LIBS)
+overhead: overhead.o
+	$(CC) $(CFLAGS) -o $@ overhead.o $(LDFLAGS) $(LIBS)
 
-fillval: fillval.o ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ fillval.o ../src/libhdf5.a $(LIBS)
+fillval: fillval.o
+	$(CC) $(CFLAGS) -o $@ fillval.o $(LDFLAGS) $(LIBS)
 
-mount: mount.o ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ mount.o ../src/libhdf5.a $(LIBS)
+mount: mount.o
+	$(CC) $(CFLAGS) -o $@ mount.o $(LDFLAGS) $(LIBS)
 
-flush1: flush1.o ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ flush1.o ../src/libhdf5.a $(LIBS)
+flush1: flush1.o
+	$(CC) $(CFLAGS) -o $@ flush1.o $(LDFLAGS) $(LIBS)
 
-flush2: flush2.o ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ flush2.o ../src/libhdf5.a $(LIBS)
+flush2: flush2.o
+	$(CC) $(CFLAGS) -o $@ flush2.o $(LDFLAGS) $(LIBS)
 
 @CONCLUDE@
diff --git a/testpar/Makefile.in b/testpar/Makefile.in
new file mode 100644
index 0000000..ee6bf46
--- /dev/null
+++ b/testpar/Makefile.in
@@ -0,0 +1,36 @@
+# hdf5 Parallel Library Test Makefile(.in)                     -*- makefile -*-
+#
+# Copyright (C) 1998 National Center for Supercomputing Applications
+#                    All rights reserved
+#
+#
+@COMMENCE@
+
+# Add the include directory to the C preprocessor flags the the hdf5 library
+# to the library list.  Also add the -DUSE_PAUSE to get the test files to
+# pause until a `go' file exists in order to attach a debugger.
+CPPFLAGS=-I. -I../src -DUSE_PAUSE @CPPFLAGS@
+LIBS=../src/libhdf5.a @LIBS@
+
+# These tests are parallel
+RUNTEST=$(RUNPARALLEL)
+
+# These are our main targets
+TESTS=testphdf5
+
+# Temporary files
+MOSTLYCLEAN=ParaEg[123].h5f
+DISTCLEAN=go
+
+# Test source files
+TEST_SRC=testphdf5.c t_dset.c t_file.c
+TEST_OBJ=$(TEST_SRC:.c=.o)
+PRIVATE_HDR=testphdf5.h
+
+# How to build the tests... They all depend on the hdf5 library
+$(TESTS): ../src/libhdf5.a
+
+testphdf5: testphdf5.o t_dset.o t_file.o
+	$(CC) $(CFLAGS) -o $@ testphdf5.o t_dset.o t_file.o $(LDFLAGS) $(LIBS)
+
+@CONCLUDE@
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 3de71b1..d6840bf 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -6,18 +6,20 @@
 # 
 @COMMENCE@
 
-# Add include directory to the C preprocessor flags.
+# Add include directory to the C preprocessor flags, add the -lh5tools to the
+# libraries.
 CPPFLAGS=-I../src -I. @CPPFLAGS@
+LIBS=../src/libhdf5.a libh5tools.a @LIBS@
 
 # Tools test targets.
 # Use /bin/sh to use because the test is actually a shell script file.
 TESTS=testh5dump
 RUNTEST=/bin/sh
 
-# These are our main targets:
-PROGS=h5debug h5import h5ls h5repart h5dump
+# These are our main targets: library, programs, and tests
 LIB=libh5tools.a
-LIBS=../src/libhdf5.a libh5tools.a @LIBS@
+PROGS=h5debug h5import h5ls h5repart h5dump @H5TOH4@
+TESTS=@TESTH5TOH4@
 
 # Source and object files for the library.
 LIB_SRC=h5tools.c
@@ -28,26 +30,39 @@ PROG_SRC=h5debug.c h5import.c h5ls.c h5repart.c h5dump.c h5dumputil.c
 PROG_OBJ=$(PROG_SRC:.c=.o)
 PRIVATE_HDR=h5tools.h
 
+# Source and object files for the tests
+TEST_SRC=testh5toh4.c
+TEST_OBJ=$(TEST_SRC:.c=.o)
+
 # Programs have to be built before they can be tested!
 test _test: $(PROGS)
 
-# How to build the programs...
-h5debug: h5debug.o $(LIB) ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ h5debug.o $(LIBS)
+# How to build the programs... They all depend on the hdf5 library and
+# the tools library compiled in this directory.
+$(PROGS): ../src/libhdf5.a $(LIB)
 
-h5import: h5import.o $(LIB) ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ h5import.o $(LIBS)
+h5debug: h5debug.o
+	$(CC) $(CFLAGS) -o $@ h5debug.o $(LDFLAGS) $(LIBS)
 
-h5ls: h5ls.o $(LIB) ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ h5ls.o $(LIBS)
+h5import: h5import.o
+	$(CC) $(CFLAGS) -o $@ h5import.o $(LDFLAGS) $(LIBS)
 
-h5repart: h5repart.o $(LIB) ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ h5repart.o $(LIBS)
+h5ls: h5ls.o
+	$(CC) $(CFLAGS) -o $@ h5ls.o $(LDFLAGS) $(LIBS)
 
-h5dump: h5dump.o h5dumputil.o $(LIB) ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ h5dump.o h5dumputil.o $(LIBS)
+h5repart: h5repart.o
+	$(CC) $(CFLAGS) -o $@ h5repart.o $(LDFLAGS) $(LIBS)
 
+h5dump: h5dump.o h5dumputil.o
+	$(CC) $(CFLAGS) -o $@ h5dump.o h5dumputil.o $(LDFLAGS) $(LIBS)
+
+# How to build the tests.  The testh5dump is a shell script that we
+# copy from its permanent home to a temporary name because `make
+# clean' will remove the temporary name.
 testh5dump: testh5dump.sh
 	cp testh5dump.sh $@
 
+testh5toh4: testh5toh4.o
+	$(CC) $(CFLAGS) -o $@ testh5toh4 $(LDFLAGS) $(LIBS)
+
 @CONCLUDE@