Merge pull request #588 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop

* commit 'd2c7df4ac005e461df3a486791560821ab7b4585':
  Revert "Partial removal of NDEBUG ifdefs from the library."
  Partial removal of NDEBUG ifdefs from the library.
  Removed compiler flag cleanup since Solaris chokes on it.
This commit is contained in:
Dana Robinson 2017-06-29 17:32:04 -05:00
commit dba4a60413

View File

@ -3343,14 +3343,6 @@ 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