philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn-r27680] Merge of r27675, 27641, and 27645 from trunk

Browse Source 
- 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
This commit is contained in:
Dana Robinson
2015-09-04 13:07:32 -05:00
parent 9b6980687c
commit 2b35b265e9
15 changed files with 31 additions and 1383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
config/cmake_ext_mod/ConfigureChecks.cmake
View File

@@ -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})