diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2017-06-29 03:52:02 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2017-06-29 03:52:02 (GMT) |
| commit | 3da8951fb3fc3fa850558ba7ea4d44d507fc1664 (patch) | |
| tree | ad123f1cc4e6f602b84f8a1d63b26230359fe251 | |
| parent | 25727c4f2cfea0230f236bc62f295c9a59172cc3 (diff) | |
| parent | cbca178410215a1fd60e3de85c4810487e327f8d (diff) | |
| download | hdf5-3da8951fb3fc3fa850558ba7ea4d44d507fc1664.zip hdf5-3da8951fb3fc3fa850558ba7ea4d44d507fc1664.tar.gz hdf5-3da8951fb3fc3fa850558ba7ea4d44d507fc1664.tar.bz2 | |
Merge pull request #584 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:minor_develop_fixes to develop
* commit 'cbca178410215a1fd60e3de85c4810487e327f8d':
Updated the --enable-debug/production handling in configure.ac so that it more reliably indicates that the configure option can no longer be used. Previously, using --enable-debug="", etc. would not trigger an error (even though such usage is unlikely).
Added awk processing to remove extraneous whitespace from H5_ flags in configure.
| -rw-r--r-- | configure.ac | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 3eaf293..4decf82 100644 --- a/configure.ac +++ b/configure.ac @@ -1941,26 +1941,17 @@ AC_DEFINE_UNQUOTED([PRINTF_LL_WIDTH], ["$hdf5_cv_printf_ll"], [Width for printf() for type `long long' or `__int64', use `ll']) ## ---------------------------------------------------------------------- -## Deprecate old ways of determining debug/production build -## These can probably be removed in the future (1.10.1?) +## Remove old ways of determining debug/production build. +## These were used in 1.8.x and earlier. We should probably keep these checks +## around to help people migrate to 1.10.x and newer versions. ## AC_ARG_ENABLE([debug], - [AS_HELP_STRING([--enable-debug], - [DEPRECATED: use --enable-build-mode=debug])], - [DEPRECATED_DEBUG=$enableval]) - -if test "X-$DEPRECATED_DEBUG" != "X-" ; then - AC_MSG_ERROR([--enable-debug is deprecated, use --enable-build-mode=debug instead.]) -fi + [AS_HELP_STRING([--enable-debug], [DEPRECATED: use --enable-build-mode=debug])], + [AC_MSG_ERROR([--enable-debug is deprecated, use --enable-build-mode=debug instead.])]) AC_ARG_ENABLE([production], - [AS_HELP_STRING([--enable-production], - [DEPRECATED: use --enable-build-mode=production])], - [DEPRECATED_PRODUCTION=$enableval]) - -if test "X-$DEPRECATED_PRODUCTION" != "X-" ; then - AC_MSG_ERROR([--enable-production is deprecated, use --enable-build-mode=production instead.]) -fi + [AS_HELP_STRING([--enable-production], [DEPRECATED: use --enable-build-mode=production])], + [AC_MSG_ERROR([--enable-production is deprecated, use --enable-build-mode=production instead.])]) ## ---------------------------------------------------------------------- @@ -3352,6 +3343,14 @@ fi ## AM_CONDITIONAL([HAVE_SHARED_CONDITIONAL], [test "X$enable_shared" = "Xyes"]) +## The H5 flags go through multiple rounds of processing, which can introduce +## extra whitespace. Trim this for nicer output in the settings file. +H5_LDFLAGS=$(echo "$H5_LDFLAGS" | awk '$1=$1') +H5_CPPFLAGS=$(echo "$H5_CPPFLAGS" | awk '$1=$1') +H5_CFLAGS=$(echo "$H5_CFLAGS" | awk '$1=$1') +H5_FCFLAGS=$(echo "$H5_FCFLAGS" | awk '$1=$1') +H5_CXXFLAGS=$(echo "$H5_CXXFLAGS" | awk '$1=$1') + AC_CONFIG_FILES([src/libhdf5.settings Makefile src/Makefile |