[svn-r1080] Disabled detection of hdf4 during the configuration because hawkwind

has old enough hdf4 libraries that the h5toh4 test always fails.

1 files changed, 8 insertions, 1 deletions

diff --git a/bin/snapshot b/bin/snapshot
index ef49c29..562f38d 100755
--- a/bin/snapshot
+++ b/bin/snapshot
@@ -23,6 +23,11 @@ fi
 # What compression methods to use?
 METHODS="gzip bzip2"
 
+# How to configure? We disable hdf4 because that's almost always the
+# culprit for tests failing -- hawkwind seems to have a version older
+# than what h5toh4 requires.
+CONFIGURE="./configure --without-hdf4"
+
 # Create a working directory.  Hopefully one is left over from last
 # time that still has the contents of the previous release.  But if
 # not, just create one and assume that a snapshot is necessary.
@@ -56,7 +61,9 @@ fi
 
 # Make sure all the serial tests work.
 if [ "$snapshot" = "yes" ]; then
-    if (cd ${COMPARE}/current; cp -p Makefile.dist Makefile; make _test); then
+    if (cd ${COMPARE}/current; \
+        ${CONFIGURE}; \
+        make _test); then
 	:
     else
 	snapshot=no