[svn-r1151] Changes since 19990318

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

./Makefile.in
./configure.in
./configure		[REGENERATED]
./src/H5config.h.in	[REGENERATED]
./config/commence.in
./config/conclude.in
./config/dec-osf4.x
./config/depend.in
./config/freebsd
./config/linux-gnu
./config/linux-gnulibc1
./config/linux-gnulibc2
./config/solaris2.x
./examples/Makefile.in
./src/Makefile.in
./test/Makefile.in
./testpar/Makefile.in
./tools/Makefile.in
./tools/testh5dump.sh
	Changes that allow hdf5 to be configured and compiled in a
	directory other than the source directory. This is especially
	useful if you want to concurrently compile with different
	compilers and/or compile flags, or if the hdf5 source is on
	read-only media like a CDROM.  The changes were surprisingly
	easy ;-) Here's what you can do now...

		  $ mkdir /tmp/build1  # or something
		  $ cd /tmp/build1
		  $ /cdrom/hdf5/configure # where ever the source is
		  $ make

	Paul, you'll have to change the testh5toh4 script similar to
	the way I changed testh5dump.sh.  I started working on it but
	then gave up because of a number of problems: (1) I had to
	comment out all the tests that let h5toh4 choose the output
	file name because it always tried to put the output file in
	the same directory as the input file, (2) if path names are
	used during the h4 dump then they interfere with the
	diff. The test works fine when run in the source directory,
	but try this instead:

	    $ gunzip <hdf5-1.1.67.tar.gz |tar xf -
	    $ chmod -R ugo-w hdf5-1.1.67
	    $ mkdir build
	    $ cd build
	    $ ../hdf5-1.1.67/configure
	    $ make check

	Dan, I didn't modify the pablo/Makefile.in because I have no
	way to test it. I think all you need to do is add a couple
	lines before the @COMMENCE@ line and add a couple search
	directories for header files. Anyway, it seems like almost an
	exact duplicate of the src/Makefile.in, so it shouldn't be a
	problem...

./Makefile.in
	Removes a few more temporary files during make clean and
	distclean.

./configure.in
	I fixed the creation of the time-stamp files so that the
	initial make doesn't have to regenerated all the makefiles
	(only GNU make users will see any change).

./src/H5R.c
	Changed a return type from `intn' to `int' for an API
	function.

./src/H5detect.c
	Added the volatile qualifier to a couple more variables.

./tools/h5tools.c
	Fixed a compiler warning about an unused local.

./tools/h5toh4.c
	Initialized `optind' to 1 because it's zero on my system. It
	should always be one on a unix system.

./tools/testh5toh4
	Redirected "broken pipe" messages to /dev/null so outut is
	formatted correctly.

4 files changed, 20 insertions, 7 deletions

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 28ea50b..daed201 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -4,16 +4,19 @@
 #                    All rights reserved.
 #
 # 
-@COMMENCE@
 top_srcdir=@top_srcdir@
+top_builddir=..
+srcdir=@srcdir@
+VPATH=.:@srcdir@
+@COMMENCE@
 
 # Add include directory to the C preprocessor flags, add -lh5tools and
 # -lhdf5 to the list of libraries.
-CPPFLAGS=-I../src -I. @CPPFLAGS@
+CPPFLAGS=-I. -I$(srcdir) -I../src -I$(top_srcdir)/src @CPPFLAGS@
 
 # Test programs and scripts.
 TEST_PROGS=
-TEST_SCRIPTS=testh5dump.sh @TESTH5TOH4@
+TEST_SCRIPTS=$(srcdir)/testh5dump.sh @TESTH5TOH4@
 
 # These are our main targets: library and tools. We link this library
 # statically because some systems can only link executables to a single
diff --git a/tools/h5toh4.c b/tools/h5toh4.c
index 1568e5b..34cc1c8 100644
--- a/tools/h5toh4.c
+++ b/tools/h5toh4.c
@@ -78,6 +78,7 @@ main(int argc, char **argv)
 	int status = 0;
 	int status2 = 0;
 
+	optind = 1;
 	fargv = argv + optind;
 	argc -= optind;
 
diff --git a/tools/h5tools.c b/tools/h5tools.c
index d69a280..1067494 100644
--- a/tools/h5tools.c
+++ b/tools/h5tools.c
@@ -111,7 +111,9 @@ static void
 h5dump_sprint(char *s/*out*/, const h5dump_t *info, hid_t type, void *vp)
 {
     size_t	i, n, offset, size, dims[H5S_MAX_RANK], nelmts;
+#ifndef NDEBUG
     unsigned	overflow = 0xaaaaaaaa;
+#endif
     char	temp[8192];
     char	*name, quote='\0';
     hid_t	memb;
diff --git a/tools/testh5dump.sh b/tools/testh5dump.sh
index b33987c..c8026cd 100755
--- a/tools/testh5dump.sh
+++ b/tools/testh5dump.sh
@@ -7,6 +7,12 @@ diff='diff -c'
 nerrors=0
 verbose=yes
 
+# The build (current) directory might be different than the source directory.
+if test "X$srcdir" = X; then
+    srcdir=.
+fi
+mkdir testfiles >/dev/null 2>&1
+
 # Print a line-line message left justified in a field of 70 characters
 # beginning with the word "Testing".
 TESTING()
@@ -27,6 +33,7 @@ DUMP()
     expect=testfiles/$1
     actual="testfiles/`basename $1 .ddl`.out"
     shift
+    full=`pwd`/$h5dump
 
     # Run test.
     TESTING $h5dump $@
@@ -34,8 +41,8 @@ DUMP()
 	echo "#############################"
 	echo "Expected output for '$h5dump $@'" 
 	echo "#############################"
-	cd testfiles
-        ../$h5dump "$@" 2>/dev/null
+	cd $srcdir/testfiles
+        $full "$@" 2>/dev/null
     ) >$actual
     
     # Results. We normalize the result to account for different output 
@@ -43,7 +50,7 @@ DUMP()
     # differences are in white space. We have to do this the hard way
     # because diff isn't always smart enough.
     tr '\n' ' ' <$actual |tr -s ' \t' |fold >$actual-norm
-    tr '\n' ' ' <$expect |tr -s ' \t' |fold >$expect-norm
+    tr '\n' ' ' <$srcdir/$expect |tr -s ' \t' |fold >$expect-norm
 
     if $cmp $expect-norm $actual-norm; then
 	echo " PASSED"
@@ -51,7 +58,7 @@ DUMP()
 	echo "*FAILED*"
 	echo "    Actual result (*.out) differs from expected result (*.ddl)"
 	nerrors="`expr $nerrors + 1`"
-	test yes = "$verbose" && $diff $expect $actual |sed 's/^/    /'
+	test yes = "$verbose" && $diff $srcdir/$expect $actual |sed 's/^/    /'
     fi
 
     # Clean up output file