summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Wendling <wendling@ncsa.uiuc.edu>2002-04-29 17:24:50 (GMT)
committerBill Wendling <wendling@ncsa.uiuc.edu>2002-04-29 17:24:50 (GMT)
commit7065ac798266292941f99df56a6dbede7877689c (patch)
tree604f9195227f0e1059981b16ae02b01a9eb15ae1
parent73683e4380583563699330b8e32b1a34a476447a (diff)
downloadhdf5-7065ac798266292941f99df56a6dbede7877689c.zip
hdf5-7065ac798266292941f99df56a6dbede7877689c.tar.gz
hdf5-7065ac798266292941f99df56a6dbede7877689c.tar.bz2
[svn-r5280] Purpose:
Update Description: Changed so that the Fortran and C++ configures are named "HDF5 Fortran" and "HDF5 C++" resp. instead of just "HDF5. Solution: Add an extra parameter to the subroutine which generates the new configure.in files. Platforms tested: Linux
-rwxr-xr-xbin/h5vers10
-rwxr-xr-xc++/configure20
-rw-r--r--c++/configure.in2
-rwxr-xr-xfortran/configure20
-rw-r--r--fortran/configure.in2
5 files changed, 27 insertions, 27 deletions
diff --git a/bin/h5vers b/bin/h5vers
index 6b1ac5f..94111c2 100755
--- a/bin/h5vers
+++ b/bin/h5vers
@@ -269,7 +269,7 @@ if ($RELEASE) {
}
sub gen_configure {
- my ($conf) = @_;
+ my ($name, $conf) = @_;
open FILE, $conf or die "$conf: $!\n";
my @contents = <FILE>;
@@ -277,7 +277,7 @@ sub gen_configure {
for (my $i = 0; $i < $#contents; ++$i) {
if ($contents[$i] =~ /^AC_INIT/) {
- $contents[$i] = sprintf("AC_INIT([HDF5], [%d.%d.%d%s], [hdfhelp\@ncsa.uiuc.edu])\n",
+ $contents[$i] = sprintf("AC_INIT([$name], [%d.%d.%d%s], [hdfhelp\@ncsa.uiuc.edu])\n",
@newver[0,1,2],
$newver[3] eq "" ? "" : "-".$newver[3]);
last;
@@ -298,9 +298,9 @@ sub gen_configure {
}
# Update the configure.in files and regenerate them
-gen_configure $CONFIGURE if $CONFIGURE;
-gen_configure $FORTRAN_CONFIGURE if $FORTRAN_CONFIGURE;
-gen_configure $CXX_CONFIGURE if $CXX_CONFIGURE;
+gen_configure("HDF5", $CONFIGURE) if $CONFIGURE;
+gen_configure("HDF5 Fortran", $FORTRAN_CONFIGURE) if $FORTRAN_CONFIGURE;
+gen_configure("HDF5 C++", $CXX_CONFIGURE) if $CXX_CONFIGURE;
# Print the new version number
if ($verbose) {
diff --git a/c++/configure b/c++/configure
index 390fd75..cff6597 100755
--- a/c++/configure
+++ b/c++/configure
@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.in Id: configure.in.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.53 for HDF5 1.5.28.
+# Generated by GNU Autoconf 2.53 for HDF5 C++ 1.5.28.
#
# Report bugs to <hdfhelp@ncsa.uiuc.edu>.
#
@@ -414,10 +414,10 @@ SHELL=${CONFIG_SHELL-/bin/sh}
: ${ac_max_here_lines=38}
# Identity of this package.
-PACKAGE_NAME='HDF5'
-PACKAGE_TARNAME='hdf5'
+PACKAGE_NAME='HDF5 C++'
+PACKAGE_TARNAME='hdf5-c--'
PACKAGE_VERSION='1.5.28'
-PACKAGE_STRING='HDF5 1.5.28'
+PACKAGE_STRING='HDF5 C++ 1.5.28'
PACKAGE_BUGREPORT='hdfhelp@ncsa.uiuc.edu'
ac_unique_file="src/H5Library.cpp"
@@ -934,7 +934,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures HDF5 1.5.28 to adapt to many kinds of systems.
+\`configure' configures HDF5 C++ 1.5.28 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -995,7 +995,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of HDF5 1.5.28:";;
+ short | recursive ) echo "Configuration of HDF5 C++ 1.5.28:";;
esac
cat <<\_ACEOF
@@ -1093,7 +1093,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-HDF5 configure 1.5.28
+HDF5 C++ configure 1.5.28
generated by GNU Autoconf 2.53
Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@@ -1108,7 +1108,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by HDF5 $as_me 1.5.28, which was
+It was created by HDF5 C++ $as_me 1.5.28, which was
generated by GNU Autoconf 2.53. Invocation command line was
$ $0 $@
@@ -8491,7 +8491,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
-This file was extended by HDF5 $as_me 1.5.28, which was
+This file was extended by HDF5 C++ $as_me 1.5.28, which was
generated by GNU Autoconf 2.53. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -8545,7 +8545,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-HDF5 config.status 1.5.28
+HDF5 C++ config.status 1.5.28
configured by $0, generated by GNU Autoconf 2.53,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/c++/configure.in b/c++/configure.in
index da262ac..1a2a7c6 100644
--- a/c++/configure.in
+++ b/c++/configure.in
@@ -18,7 +18,7 @@ dnl
dnl NOTE: Don't forget to change the version number here when we do a
dnl release!!!
dnl
-AC_INIT([HDF5], [1.5.28], [hdfhelp@ncsa.uiuc.edu])
+AC_INIT([HDF5 C++], [1.5.28], [hdfhelp@ncsa.uiuc.edu])
AC_CONFIG_SRCDIR([src/H5Library.cpp])
AC_CONFIG_AUX_DIR([../bin])
diff --git a/fortran/configure b/fortran/configure
index 382eaec..5f7ce0e 100755
--- a/fortran/configure
+++ b/fortran/configure
@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.in Id: configure.in.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.53 for HDF5 1.5.28.
+# Generated by GNU Autoconf 2.53 for HDF5 Fortran 1.5.28.
#
# Report bugs to <hdfhelp@ncsa.uiuc.edu>.
#
@@ -414,10 +414,10 @@ SHELL=${CONFIG_SHELL-/bin/sh}
: ${ac_max_here_lines=38}
# Identity of this package.
-PACKAGE_NAME='HDF5'
-PACKAGE_TARNAME='hdf5'
+PACKAGE_NAME='HDF5 Fortran'
+PACKAGE_TARNAME='hdf5-fortran'
PACKAGE_VERSION='1.5.28'
-PACKAGE_STRING='HDF5 1.5.28'
+PACKAGE_STRING='HDF5 Fortran 1.5.28'
PACKAGE_BUGREPORT='hdfhelp@ncsa.uiuc.edu'
ac_unique_file="src/HDF5.f90"
@@ -922,7 +922,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures HDF5 1.5.28 to adapt to many kinds of systems.
+\`configure' configures HDF5 Fortran 1.5.28 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -983,7 +983,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of HDF5 1.5.28:";;
+ short | recursive ) echo "Configuration of HDF5 Fortran 1.5.28:";;
esac
cat <<\_ACEOF
@@ -1079,7 +1079,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-HDF5 configure 1.5.28
+HDF5 Fortran configure 1.5.28
generated by GNU Autoconf 2.53
Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@@ -1094,7 +1094,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by HDF5 $as_me 1.5.28, which was
+It was created by HDF5 Fortran $as_me 1.5.28, which was
generated by GNU Autoconf 2.53. Invocation command line was
$ $0 $@
@@ -8870,7 +8870,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
-This file was extended by HDF5 $as_me 1.5.28, which was
+This file was extended by HDF5 Fortran $as_me 1.5.28, which was
generated by GNU Autoconf 2.53. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -8932,7 +8932,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-HDF5 config.status 1.5.28
+HDF5 Fortran config.status 1.5.28
configured by $0, generated by GNU Autoconf 2.53,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/fortran/configure.in b/fortran/configure.in
index c9218a4..876f964 100644
--- a/fortran/configure.in
+++ b/fortran/configure.in
@@ -18,7 +18,7 @@ dnl
dnl NOTE: Don't forget to change the version number here when we do a
dnl release!!!
dnl
-AC_INIT([HDF5], [1.5.28], [hdfhelp@ncsa.uiuc.edu])
+AC_INIT([HDF5 Fortran], [1.5.28], [hdfhelp@ncsa.uiuc.edu])
AC_CONFIG_SRCDIR([src/HDF5.f90])
AC_CONFIG_HEADER([src/H5config_fortran.h])