From a286af4e0fd4930da8e31d3b5335e6961380c365 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Wed, 11 Apr 2007 15:00:08 -0500 Subject: [svn-r13645] Purpouse: Bug fix (851) Description: h5vers calls bin/reconfigure which may fail but h5vers does not check its return value. This will result in discrepency between files such as configure and configure.in. Solution: Fixed it by checking exit code of bin/reconfigure and return error if it fails. Tested: osage and kagiso. --- bin/h5vers | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/bin/h5vers b/bin/h5vers index 2c0061c..e68a4de 100755 --- a/bin/h5vers +++ b/bin/h5vers @@ -72,7 +72,7 @@ use strict; # one directory above the H5public.h file is also modified so it looks # something like: This is hdf5-1.2.3-pre1 currently under development. # The AC_INIT macro in configure.in will also change in this case to be -# something like: AC_INIT([HDF5], [hdf5-1.2.3-pre1], [hdfhelp@ncsa.uiuc.edu]) +# something like: AC_INIT([HDF5], [hdf5-1.2.3-pre1], [help@hdfgroup.org]) # # Whenever the version changes, this script will increment the revision # field in HDF5's libtool shared library version in config/lt_vers.am, @@ -126,7 +126,7 @@ EOF } # Parse arguments -my ($verbose, $set, $inc, $file); +my ($verbose, $set, $inc, $file, $rc); my (@files) = ("H5public.h", "src/H5public.h", "../src/H5public.h"); while ($_ = shift) { $_ eq "-s" && do { @@ -328,9 +328,13 @@ sub gen_configure { $conf =~ /^(.*?)\/?configure.in$/; if ($1) { - system("cd $1 && bin/reconfigure >/dev/null 2>/dev/null && rm -rf autom4te.cache"); + $rc = system("cd $1 && bin/reconfigure >/dev/null 2>/dev/null && rm -rf autom4te.cache"); } else { - system("bin/reconfigure >/dev/null 2>/dev/null && rm -rf autom4te.cache"); + $rc = system("bin/reconfigure >/dev/null 2>/dev/null && rm -rf autom4te.cache"); + } + if ($rc) { + printf("bin/reconfigure failed with exit code %d. Aborted.\n", $rc); + exit 1; } } -- cgit v0.12