mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-04-12 17:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r13645] Purpouse:

Browse Source 
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.
This commit is contained in:
Albert Cheng 2007-04-11 15:00:08 -05:00
parent 91a42e81cf
commit a286af4e0f
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bin/h5vers
View File

@ -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;
}
}