From bcb3dd3a217c0a3314c69e06f30843468101b8d8 Mon Sep 17 00:00:00 2001
From: James Laird <jlaird@hdfgroup.org>
Date: Fri, 25 Feb 2005 13:09:19 -0500
Subject: [svn-r10085] Purpose: Bug fix

Description:
h5vers script called automake without using bin/reconfigure

Solution:
Altered h5vers script to use bin/reconfigure
Also:

***
CHANGED NAME OF reconfigure.sh TO reconfigure !
***

This matches the other scripts in the bin/ directory.  Also changed
permissions on reconfigure so it can be executed.

Platforms tested:
eirene

Misc. update:
---
 bin/h5vers         |  4 ++--
 bin/reconfigure    | 30 ++++++++++++++++++++++++++++++
 bin/reconfigure.sh | 30 ------------------------------
 3 files changed, 32 insertions(+), 32 deletions(-)
 create mode 100755 bin/reconfigure
 delete mode 100644 bin/reconfigure.sh

diff --git a/bin/h5vers b/bin/h5vers
index 201b243..26f8339 100755
--- a/bin/h5vers
+++ b/bin/h5vers
@@ -292,9 +292,9 @@ sub gen_configure {
   $conf =~ /^(.*?)\/?configure.in$/;
 
   if ($1) {
-    system("cd $1 && autoconf && rm -rf autom4te.cache");
+    system("cd $1 && bin/reconfigure && rm -rf autom4te.cache");
   } else {
-    system("autoconf && rm -rf autom4te.cache");
+    system("bin/reconfigure && rm -rf autom4te.cache");
   }
 }
 
diff --git a/bin/reconfigure b/bin/reconfigure
new file mode 100755
index 0000000..c739172
--- /dev/null
+++ b/bin/reconfigure
@@ -0,0 +1,30 @@
+#! /bin/sh
+# A simple script to reconfigure autotools for HDF5.
+# The autotools include a reconfigure script, but this script
+# has the paths of autoconf and automake hardcoded to work on HDF
+# machines.  Thus is enforces that HDF5 always uses the
+# same versions of autotools.
+# Uses automake version 1.6.3
+# Uses autoconf version 2.59
+# Includes macros from libtool version 1.4.2
+
+# The autotools live in AFS, so as long as their paths don't change
+# and this machine has the right version of m4, this script should
+# be able to run the autotools.
+
+
+  # Run commands in order
+  echo /afs/ncsa/projects/hdf/packages/automake_1.6.3/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal
+  /afs/ncsa/projects/hdf/packages/automake_1.6.3/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal
+
+  echo /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader
+  /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader
+
+  echo /afs/ncsa/projects/hdf/packages/automake_1.6.3/Linux_2.4/bin/automake --foreign
+  /afs/ncsa/projects/hdf/packages/automake_1.6.3/Linux_2.4/bin/automake --foreign
+
+  echo /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf
+  /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf
+
+
+exit 0
diff --git a/bin/reconfigure.sh b/bin/reconfigure.sh
deleted file mode 100644
index c739172..0000000
--- a/bin/reconfigure.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh
-# A simple script to reconfigure autotools for HDF5.
-# The autotools include a reconfigure script, but this script
-# has the paths of autoconf and automake hardcoded to work on HDF
-# machines.  Thus is enforces that HDF5 always uses the
-# same versions of autotools.
-# Uses automake version 1.6.3
-# Uses autoconf version 2.59
-# Includes macros from libtool version 1.4.2
-
-# The autotools live in AFS, so as long as their paths don't change
-# and this machine has the right version of m4, this script should
-# be able to run the autotools.
-
-
-  # Run commands in order
-  echo /afs/ncsa/projects/hdf/packages/automake_1.6.3/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal
-  /afs/ncsa/projects/hdf/packages/automake_1.6.3/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal
-
-  echo /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader
-  /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader
-
-  echo /afs/ncsa/projects/hdf/packages/automake_1.6.3/Linux_2.4/bin/automake --foreign
-  /afs/ncsa/projects/hdf/packages/automake_1.6.3/Linux_2.4/bin/automake --foreign
-
-  echo /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf
-  /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf
-
-
-exit 0
-- 
cgit v0.12