diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2015-09-04 18:07:32 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2015-09-04 18:07:32 (GMT) |
| commit | 2b35b265e91dea7157347aa0a631cc35bcabf6c9 (patch) | |
| tree | c3c333a32c2aeb323c59ba971371e3bd2a3ae4cc /config/cmake | |
| parent | 9b6980687c8c9b208827773cb311bbc931d30782 (diff) | |
| download | hdf5-2b35b265e91dea7157347aa0a631cc35bcabf6c9.zip hdf5-2b35b265e91dea7157347aa0a631cc35bcabf6c9.tar.gz hdf5-2b35b265e91dea7157347aa0a631cc35bcabf6c9.tar.bz2 | |
[svn-r27680] Merge of r27675, 27641, and 27645 from trunk
- Changes AC_CONFIG_HEADER to AC_CONFIG_HEADERS
- Removes nsl and socket library checks on Solaris (no longer needed)
- Removes obsolete and/or unmaintained configuration files from config/
Fixes HDFFV-9284, HDFFV-9118, HDFFV-9116
Tested on: h5committest
Diffstat (limited to 'config/cmake')
| -rw-r--r-- | config/cmake/H5pubconf.h.in | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in index 39f3378..7b64821 100644 --- a/config/cmake/H5pubconf.h.in +++ b/config/cmake/H5pubconf.h.in @@ -184,15 +184,9 @@ /* Define to 1 if you have the `mpe' library (-lmpe). */ #cmakedefine H5_HAVE_LIBMPE @H5_HAVE_LIBMPE@ -/* Define to 1 if you have the `nsl' library (-lnsl). */ -#cmakedefine H5_HAVE_LIBNSL @H5_HAVE_LIBNSL@ - /* Define to 1 if you have the `pthread' library (-lpthread). */ #cmakedefine H5_HAVE_LIBPTHREAD @H5_HAVE_LIBPTHREAD@ -/* Define to 1 if you have the `socket' library (-lsocket). */ -#cmakedefine H5_HAVE_LIBSOCKET @H5_HAVE_LIBSOCKET@ - /* Define to 1 if you have the `sz' library (-lsz). */ #cmakedefine H5_HAVE_LIBSZ @H5_HAVE_LIBSZ@ |