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_ext_mod | |
| 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_ext_mod')
| -rw-r--r-- | config/cmake_ext_mod/ConfigureChecks.cmake | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/config/cmake_ext_mod/ConfigureChecks.cmake b/config/cmake_ext_mod/ConfigureChecks.cmake index e058b10..6885187 100644 --- a/config/cmake_ext_mod/ConfigureChecks.cmake +++ b/config/cmake_ext_mod/ConfigureChecks.cmake @@ -117,13 +117,8 @@ if (NOT WINDOWS) CHECK_LIBRARY_EXISTS_CONCAT ("wsock32" gethostbyname ${HDF_PREFIX}_HAVE_LIBWSOCK32) endif (NOT WINDOWS) +# UCB (BSD) compatibility library CHECK_LIBRARY_EXISTS_CONCAT ("ucb" gethostname ${HDF_PREFIX}_HAVE_LIBUCB) -CHECK_LIBRARY_EXISTS_CONCAT ("socket" connect ${HDF_PREFIX}_HAVE_LIBSOCKET) -CHECK_LIBRARY_EXISTS ("c" gethostbyname "" NOT_NEED_LIBNSL) - -if (NOT NOT_NEED_LIBNSL) - CHECK_LIBRARY_EXISTS_CONCAT ("nsl" gethostbyname ${HDF_PREFIX}_HAVE_LIBNSL) -endif (NOT NOT_NEED_LIBNSL) # For other tests to use the same libraries set (CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${LINK_LIBS}) |