[svn-r1154] Changes since 19990322

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

./configure.in
./configure		[REGENERATED]
./config/commence.in
	A few tweaks to the makefile rules for rebuilding makefiles.

./src/H5detect.c
	Fixed a really stupid mistake: resetting the signal handler
	after a longjmp(). This should fix Bob's SIGBUS on Solaris.

6 files changed, 57 insertions, 35 deletions

diff --git a/README b/README
index 06eea52..231747d 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is hdf5-1.1.66 released on Sat Mar 20 04:23:05 CST 1999
+This is hdf5-1.1.67 released on Mon Mar 22 10:43:33 CST 1999
 Please refer to the INSTALL file for installation instructions.
 ------------------------------------------------------------------------------
 
diff --git a/config/commence.in b/config/commence.in
index 41103bc..4303cbe 100644
--- a/config/commence.in
+++ b/config/commence.in
@@ -62,22 +62,25 @@ all:
 #
 # Graphically, the dependencies are:
 #
-#			    configure.in
-#                              |  |
-#         +--------------------+  +-------------------+
-#         |                                           |
-#      stamp1                                     configure
-#         |                                           |
-#         |                                     config.status
-#         |                                       |   |
-#         | +-------------------------------------+   |
-#         | |                                         |
-#       stamp2          Makefile.in et al             |
-#          |                    |                     |
-#          |                    +-----------+  +------+
-#          +-----------------------------+  |  |
-#                                        |  |  |
-#                                        Makefile
+#		         configure.in
+#                           |  |
+#         +-----------------+  +------------+
+#         |                                 |
+#      stamp1                           configure
+#   (H5config.h.in)                         |
+#       |  |                                |
+#       |  +---------------+    +-----------+
+#       |                  |    |
+#       |               config.status
+#       |                     |
+#       |  +------------------+
+#       |  |
+#      stamp2
+#    (H5config.h)                   Makefile.in et al
+#         |                                 |
+#         +------------------+  +-----------+
+#                            |  |
+#                          Makefile
 #
 # A side effect of updating stamp1 is to generate H5config.h.in and a
 # side effect of updating stamp2 is to generate H5config.h.  When using
@@ -105,10 +108,10 @@ $(STAMP2): $(STAMP1) $(top_builddir)/config.status
 $(top_srcdir)/configure: $(top_srcdir)/configure.in
 	-cd $(top_srcdir); autoconf
 
-$(top_srcdir)/config.status: $(top_builddir)/configure
+$(top_builddir)/config.status: $(top_srcdir)/configure $(STAMP1)
 	-cd $(top_builddir); ./config.status --recheck
 
-Makefile: $(MAKEFILE_PARTS) $(top_builddir)/config.status $(STAMP2)
+Makefile: $(MAKEFILE_PARTS) $(STAMP2)
 	-cd $(top_builddir); CONFIG_HEADERS= ./config.status
 
 #------------------------------------------------------------------------------
diff --git a/configure b/configure
index 422d363..027d7f2 100755
--- a/configure
+++ b/configure
@@ -4788,6 +4788,13 @@ fi
 
 rm -f conftest conftest.o conftest.c dummy.o
 
+
+# First the stamp1 file for H5config.h.in
+mkdir ./config >/dev/null 2>&1
+touch ./config/stamp1
+
+# Then the config.status file (but not makefiles)
+saved_no_create=$no_create
 no_create=yes
 trap '' 1 2 15
 cat > confcache <<\EOF
@@ -5177,8 +5184,10 @@ chmod +x $CONFIG_STATUS
 rm -fr confdefs* $ac_clean_files
 test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
 
-sleep 1
-mkdir ./config >/dev/null 2>&1
-touch ./config/stamp1 ./config/stamp2
-sleep 1
-${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
+no_create=$saved_no_create
+
+# Then the stamp2 file for H5config.h
+touch ./config/stamp2
+
+# Finally the makefiles
+test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
diff --git a/configure.in b/configure.in
index 9caff6c..b596222 100644
--- a/configure.in
+++ b/configure.in
@@ -737,15 +737,25 @@ AC_SUBST(ROOT) ROOT=`$pwd`
 dnl Some cleanup stuff
 rm -f conftest conftest.o conftest.c dummy.o
 
-dnl Build config.status, then touch the stamp files, then build all
-dnl the Makefiles.  The order is such that the first `make' does not
-dnl need to call config.status.
+dnl Build config.status, touch the stamp files, and build all the Makefiles.
+dnl The order is such that the first `make' does not need to update any
+dnl configuration information. See config/commence.in for the order in which
+dnl things need to be done.
+
+# First the stamp1 file for H5config.h.in
+mkdir ./config >/dev/null 2>&1
+touch ./config/stamp1
+
+# Then the config.status file (but not makefiles)
+saved_no_create=$no_create
 no_create=yes
 AC_OUTPUT(config/depend config/commence config/conclude \
           Makefile src/Makefile pablo/Makefile test/Makefile \
           testpar/Makefile tools/Makefile examples/Makefile)
-sleep 1
-mkdir ./config >/dev/null 2>&1
-touch ./config/stamp1 ./config/stamp2
-sleep 1
-${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
+no_create=$saved_no_create
+
+# Then the stamp2 file for H5config.h
+touch ./config/stamp2
+
+# Finally the makefiles
+test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
diff --git a/src/H5detect.c b/src/H5detect.c
index 00f8ac4..84b5401 100644
--- a/src/H5detect.c
+++ b/src/H5detect.c
@@ -334,8 +334,8 @@ precision (detected_t *d)
 static void
 sigbus_handler(int __unused__ signo)
 {
-    longjmp(jbuf_g, 1);
     signal(SIGBUS, sigbus_handler);
+    longjmp(jbuf_g, 1);
 }
     
 
diff --git a/tools/testh5toh4 b/tools/testh5toh4
index 14809b2..e9b813d 100644
--- a/tools/testh5toh4
+++ b/tools/testh5toh4
@@ -49,7 +49,7 @@ CONVERT()
 	    	expect=`echo $h4file | $SED -e s/\.hdf/.dmp/`
 
 		if test "testfiles/tloop.hdf" = "$h4file"; then
-			$H4DUMP dumpvg $h4file | head -50 > $actual
+			($H4DUMP dumpvg $h4file |head -50 >$actual) 2>/dev/null
 		else
 			$H4DUMP dumpvg $h4file > $actual
 		fi
@@ -104,7 +104,7 @@ CONVERT()
 	expect=`echo $h4file | $SED -e s/\.hdf/.dmp/`
 
 	if test "testfiles/tloop.hdf" = "$h4file"; then
-		$H4DUMP dumpvg $h4file | head -50 > $actual
+		($H4DUMP dumpvg $h4file |head -50 >$actual) 2>/dev/null
 	else
 		$H4DUMP dumpvg $h4file > $actual
 	fi