Commit 4b9ce8b3 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

merge

parents 8c09ac87 dc798a48
...@@ -164,9 +164,6 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "Linux") ...@@ -164,9 +164,6 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
SET(LINK_FLAG_NO_UNDEFINED "--Wl,--no-undefined") SET(LINK_FLAG_NO_UNDEFINED "--Wl,--no-undefined")
ENDIF() ENDIF()
IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
SET(LINK_FLAG_NO_UNDEFINED "-z defs")
ENDIF()
#Some OS specific hacks #Some OS specific hacks
IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
...@@ -286,7 +283,7 @@ IF(UNIX) ...@@ -286,7 +283,7 @@ IF(UNIX)
FIND_PACKAGE(Threads) FIND_PACKAGE(Threads)
SET(CMAKE_REQUIRED_LIBRARIES SET(CMAKE_REQUIRED_LIBRARIES
${LIBNLS} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT}) ${LIBM} ${LIBNLS} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT})
LINK_LIBRARIES(${CMAKE_THREAD_LIBS_INIT}) LINK_LIBRARIES(${CMAKE_THREAD_LIBS_INIT})
......
...@@ -58,17 +58,11 @@ TARGET_LINK_LIBRARIES(perror mysys) ...@@ -58,17 +58,11 @@ TARGET_LINK_LIBRARIES(perror mysys)
ADD_EXECUTABLE(resolveip resolveip.c) ADD_EXECUTABLE(resolveip resolveip.c)
TARGET_LINK_LIBRARIES(resolveip mysys) TARGET_LINK_LIBRARIES(resolveip mysys)
# On Solaris, inet_aton() function used by resolveip could be in resolv library
IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS") IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
INCLUDE(CheckFunctionExists) INCLUDE(CheckFunctionExists)
INCLUDE(CheckLibraryExists) INCLUDE(CheckLibraryExists)
CHECK_FUNCTION_EXISTS(inet_aton HAVE_INET_ATON) MY_SEARCH_LIBS(inet_aton "nsl;socket;resolv" SOLARIS_NSL)
IF(NOT HAVE_INET_ATON) TARGET_LINK_LIBRARIES(resolveip ${SOLARIS_NSL})
CHECK_LIBRARY_EXISTS(resolv inet_aton "" HAVE_INET_ATON_IN_RESOLV)
IF(HAVE_INET_ATON_IN_RESOLV)
TARGET_LINK_LIBRARIES(resolveip resolv)
ENDIF()
ENDIF()
ENDIF() ENDIF()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment