summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@sol>2009-12-07 02:27:49 +0000
committerVladislav Vaintroub <wlad@sol>2009-12-07 02:27:49 +0000
commit41da7b156d38e6659e5bed74c92273df60e4ef3d (patch)
tree744ca96a5bf4b0b855864fafabd1de6fceb4c25a /extra
parent94659ffbb1befed802276cf3596213fc5456b045 (diff)
downloadmariadb-git-41da7b156d38e6659e5bed74c92273df60e4ef3d.tar.gz
fix solaris build - inet_aton is in non-default library
Diffstat (limited to 'extra')
-rwxr-xr-xextra/CMakeLists.txt10
1 files changed, 2 insertions, 8 deletions
diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt
index bf7232e4b0a..899e5ecf1fd 100755
--- a/extra/CMakeLists.txt
+++ b/extra/CMakeLists.txt
@@ -58,17 +58,11 @@ TARGET_LINK_LIBRARIES(perror mysys)
ADD_EXECUTABLE(resolveip resolveip.c)
TARGET_LINK_LIBRARIES(resolveip mysys)
-# On Solaris, inet_aton() function used by resolveip could be in resolv library
IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
INCLUDE(CheckFunctionExists)
INCLUDE(CheckLibraryExists)
- CHECK_FUNCTION_EXISTS(inet_aton HAVE_INET_ATON)
- IF(NOT HAVE_INET_ATON)
- CHECK_LIBRARY_EXISTS(resolv inet_aton "" HAVE_INET_ATON_IN_RESOLV)
- IF(HAVE_INET_ATON_IN_RESOLV)
- TARGET_LINK_LIBRARIES(resolveip resolv)
- ENDIF()
- ENDIF()
+ MY_SEARCH_LIBS(inet_aton "nsl;socket;resolv" SOLARIS_NSL)
+ TARGET_LINK_LIBRARIES(resolveip ${SOLARIS_NSL})
ENDIF()