[Debburn-changes] r533 - cdrkit/trunk/include

[Eduard Bloch]

Author: blade
Date: 2006-12-02 03:11:54 +0100 (Sat, 02 Dec 2006)
New Revision: 533

Modified:
   cdrkit/trunk/include/AddNetworkBits.cmake
Log:
Fallback to xnet if libnls does not work

Modified: cdrkit/trunk/include/AddNetworkBits.cmake
===================================================================
--- cdrkit/trunk/include/AddNetworkBits.cmake	2006-12-02 02:03:45 UTC (rev 532)
+++ cdrkit/trunk/include/AddNetworkBits.cmake	2006-12-02 02:11:54 UTC (rev 533)
@@ -1,5 +1,7 @@
 
 # various checks add additional of extra libs, most likely for SunOS
+# using own checks and not CHECK_SYMBOLE because of spurios problems seen with
+# it
 
 INCLUDE(CheckCSourceCompiles)
 
@@ -13,12 +15,13 @@
 ")
 
 SET(CMAKE_REQUIRED_LIBRARIES )
-CHECK_C_SOURCE_COMPILES("${TESTSRC}" LIBC_SOCKET)
+CHECK_C_SOURCE_COMPILES("${TESTSRC}" USE_LIBC_SOCKET)
 
-IF(NOT LIBC_SOCKET)
+IF(NOT USE_LIBC_SOCKET)
    LIST(APPEND EXTRA_LIBS socket)
    #MESSAGE("Using libsocket for socket functions")
-ENDIF(NOT LIBC_SOCKET)
+   # enough testing. If it breaks, then it breaks, end of story
+ENDIF(NOT USE_LIBC_SOCKET)
 
 SET(TESTSRC "
 #include <sys/types.h>
@@ -31,10 +34,16 @@
 }
 ")
 
-CHECK_C_SOURCE_COMPILES("${TESTSRC}" LIBC_NLS)
+CHECK_C_SOURCE_COMPILES("${TESTSRC}" USE_LIBC_NLS)
+IF(NOT USE_LIBC_NLS)
+   SET(CMAKE_REQUIRED_LIBRARIES nls)
+   CHECK_C_SOURCE_COMPILES("${TESTSRC}" USE_LIBNLS)
+   IF(USE_LIBNLS)
+      LIST(APPEND EXTRA_LIBS nls)
+   ELSE(USE_LIBNLS)
+      #      SET(CMAKE_REQUIRED_LIBRARIES xnet) # no more testing, enough
+      LIST(APPEND EXTRA_LIBS xnet)
+   ENDIF(USE_LIBNLS)
+ENDIF(NOT USE_LIBC_NLS)
+SET(CMAKE_REQUIRED_LIBRARIES )
 
-IF(NOT LIBC_NLS)
-   LIST(APPEND EXTRA_LIBS nls)
-   #MESSAGE("Using libsocket for socket functions")
-ENDIF(NOT LIBC_NLS)
-