Browse Source

fix for nsl library and X11

Bill Hoffman 23 years ago
parent
commit
09b9a38ff3
2 changed files with 4 additions and 1 deletions
  1. 0 1
      Modules/CMakeBackwardCompatibilityC.cmake
  2. 4 0
      Modules/FindX11.cmake

+ 0 - 1
Modules/CMakeBackwardCompatibilityC.cmake

@@ -14,7 +14,6 @@ CHECK_FUNCTION_EXISTS(connect       CMAKE_HAVE_CONNECT)
 CHECK_FUNCTION_EXISTS(remove        CMAKE_HAVE_REMOVE)
 
 INCLUDE (${CMAKE_ROOT}/Modules/CheckLibraryExists.cmake)
-CHECK_LIBRARY_EXISTS("nsl" "gethostbyname" "" CMAKE_HAVE_GETHOSTBYNAME)
 CHECK_LIBRARY_EXISTS("ipc" "shmat" "" CMAKE_HAVE_GETHOSTBYNAME)
 
 INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)

+ 4 - 0
Modules/FindX11.cmake

@@ -89,6 +89,10 @@ IF (UNIX)
   ENDIF(CMAKE_X11_INCLUDE_PATH)
   IF(CMAKE_HAS_X)
     INCLUDE (${CMAKE_ROOT}/Modules/CheckLibraryExists.cmake)
+    CHECK_LIBRARY_EXISTS("nsl" "gethostbyname" "" CMAKE_HAVE_GETHOSTBYNAME) 
+    IF (CMAKE_HAVE_GETHOSTBYNAME)
+      SET (CMAKE_X_EXTRA_LIBS "${CMAKE_X_EXTRA_LIBS};-nsl")
+    ENDIF (CMAKE_HAVE_GETHOSTBYNAME)
     CHECK_LIBRARY_EXISTS("socket" "connect" "" CMAKE_HAVE_SOCKET_LIBRARY)
     IF (CMAKE_HAVE_SOCKET_LIBRARY)
       SET (CMAKE_X_EXTRA_LIBS "${CMAKE_X_EXTRA_LIBS};-lsocket")