diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2015-09-04 14:23:45 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2015-09-04 14:23:45 (GMT) |
| commit | 971149543722caf93ec9108dcbc4c78590ab0e3e (patch) | |
| tree | 6f2944cc7fde8b24496cedad84514862b91bd41b | |
| parent | 77525ea95d9a63e6a006fed055d964568eb9df93 (diff) | |
| download | hdf5-971149543722caf93ec9108dcbc4c78590ab0e3e.zip hdf5-971149543722caf93ec9108dcbc4c78590ab0e3e.tar.gz hdf5-971149543722caf93ec9108dcbc4c78590ab0e3e.tar.bz2 | |
[svn-r27677] Merge of r27675 from trunk
Removed library checks for nsl and socket from the autotools configure on
Solaris.
The nsl and socket libraries are no longer used by the library. Fixes
HDFFV-9118.
Tested on: jam w/ autotools and CMake
emu w/ autotools
| -rw-r--r-- | config/cmake/H5pubconf.h.in | 6 | ||||
| -rw-r--r-- | config/cmake_ext_mod/ConfigureChecks.cmake | 7 | ||||
| -rw-r--r-- | configure.ac | 6 |
3 files changed, 1 insertions, 18 deletions
diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in index 37bcfbf..0faf92e 100644 --- a/config/cmake/H5pubconf.h.in +++ b/config/cmake/H5pubconf.h.in @@ -185,15 +185,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@ 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}) diff --git a/configure.ac b/configure.ac index ff88830..73d69d4 100644 --- a/configure.ac +++ b/configure.ac @@ -934,12 +934,6 @@ esac AC_CHECK_LIB([m], [ceil]) AC_CHECK_LIB([dl], [dlopen]) -if test "`uname`" = "SunOS" -o "`uname -sr`" = "HP-UX B.11.00"; then - ## ...for Solaris - AC_CHECK_LIB([socket], [socket]) - AC_CHECK_LIB([nsl], [xdr_int]) -fi - ## ---------------------------------------------------------------------- ## Check for system header files. ## |