From ec2c0bc6fe1f23815b8f56cd765aadc0b79fe5ec Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Sat, 10 Oct 2015 23:23:38 -0500 Subject: [svn-r28028] Description: Merge r27339, 27372, 27412, 27432, 27511, 27551, 27622, 27690 from trunk to branch (snapshots) Tested on: MacOSX/64 10.10.5 (amazon) w/serial (h5committest not required on this branch) --- README.txt | 2 +- c++/src/cpp_doc_config | 2 +- config/lt_vers.am | 2 +- configure.ac | 12 +++++++++++- release_docs/RELEASE.txt | 2 +- src/H5public.h | 4 ++-- 6 files changed, 17 insertions(+), 7 deletions(-) diff --git a/README.txt b/README.txt index 58ccb4a..232be86 100644 --- a/README.txt +++ b/README.txt @@ -1,4 +1,4 @@ -HDF5 version 1.9.223-swmr1 currently under development +HDF5 version 1.9.231-swmr1 currently under development Please refer to the release_docs/INSTALL file for installation instructions. ------------------------------------------------------------------------------ diff --git a/c++/src/cpp_doc_config b/c++/src/cpp_doc_config index 3422116..978abcb 100644 --- a/c++/src/cpp_doc_config +++ b/c++/src/cpp_doc_config @@ -38,7 +38,7 @@ PROJECT_NAME = "HDF5 C++ API" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = HDF5 version 1.9.223-swmr1 currently under development +PROJECT_NUMBER = "1.9.231-swmr1 currently under development" # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/config/lt_vers.am b/config/lt_vers.am index 7a4cd7a..21395cf 100644 --- a/config/lt_vers.am +++ b/config/lt_vers.am @@ -19,7 +19,7 @@ # After making changes, run bin/reconfigure to update other configure related # files like Makefile.in. LT_VERS_INTERFACE = 6 -LT_VERS_REVISION = 213 +LT_VERS_REVISION = 221 LT_VERS_AGE = 0 ## If the API changes *at all*, increment LT_VERS_INTERFACE and diff --git a/configure.ac b/configure.ac index b2d977a..bf0e79f 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,17 @@ AC_PREREQ([2.69]) ## NOTE: Do not forget to change the version number here when we do a ## release!!! ## -AC_INIT([HDF5], [1.9.223-swmr1], [help@hdfgroup.org]) +AC_INIT([HDF5], [1.9.231-swmr1], [help@hdfgroup.org]) + +## PLACE CHECKS FOR REQUIRED PACKAGES NEEDED TO INSTALL HDF5 AT THE BEGINNING +## -------------------------------------------------------------------------- +## Requirement #1: Check if Perl is installed. +## +AC_SUBST([PERL]) PERL="" +AC_CHECK_PROG([PERL], [perl], true, false, [$PATH]) +if test "x$PERL" != "xtrue"; then + AC_MSG_ERROR([*** Perl is required for installing HDF5, but Perl could not be found!]) +fi AC_CONFIG_SRCDIR([src/H5.c]) AC_CONFIG_HEADERS([src/H5config.h]) diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index c32e3d4..3ecaba6 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -1,4 +1,4 @@ -HDF5 version 1.9.223-swmr1 currently under development +HDF5 version 1.9.231-swmr1 currently under development ================================================================================ diff --git a/src/H5public.h b/src/H5public.h index a93fdfc..d9612c2 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -94,10 +94,10 @@ extern "C" { /* Version numbers */ #define H5_VERS_MAJOR 1 /* For major interface/format changes */ #define H5_VERS_MINOR 9 /* For minor interface/format changes */ -#define H5_VERS_RELEASE 223 /* For tweaks, bug-fixes, or development */ +#define H5_VERS_RELEASE 231 /* For tweaks, bug-fixes, or development */ #define H5_VERS_SUBRELEASE "swmr1" /* For pre-releases like snap0 */ /* Empty string for real releases. */ -#define H5_VERS_INFO "HDF5 library version: 1.9.223-swmr1" /* Full version string */ +#define H5_VERS_INFO "HDF5 library version: 1.9.231-swmr1" /* Full version string */ #define H5check() H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR, \ H5_VERS_RELEASE) -- cgit v0.12