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

[Eduard Bloch]

Author: blade
Date: 2006-12-02 10:13:25 +0100 (Sat, 02 Dec 2006)
New Revision: 534

Modified:
   cdrkit/trunk/include/AddNetworkBits.cmake
Log:
More verbose and aborting network function tests

Modified: cdrkit/trunk/include/AddNetworkBits.cmake
===================================================================
--- cdrkit/trunk/include/AddNetworkBits.cmake	2006-12-02 02:11:54 UTC (rev 533)
+++ cdrkit/trunk/include/AddNetworkBits.cmake	2006-12-02 09:13:25 UTC (rev 534)
@@ -18,9 +18,15 @@
 CHECK_C_SOURCE_COMPILES("${TESTSRC}" USE_LIBC_SOCKET)
 
 IF(NOT USE_LIBC_SOCKET)
+
    LIST(APPEND EXTRA_LIBS socket)
-   #MESSAGE("Using libsocket for socket functions")
-   # enough testing. If it breaks, then it breaks, end of story
+
+   SET(CMAKE_REQUIRED_LIBRARIES socket)
+   CHECK_C_SOURCE_COMPILES("${TESTSRC}" USE_LIBSOCKET)
+   IF(NOT USE_LIBSOCKET)
+      MESSAGE(FATAL_ERROR "No working socket(...) found in libc or libsocket")
+   ENDIF(NOT USE_LIBSOCKET)
+
 ENDIF(NOT USE_LIBC_SOCKET)
 
 SET(TESTSRC "
@@ -41,8 +47,13 @@
    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)
+      SET(CMAKE_REQUIRED_LIBRARIES xnet)
+      CHECK_C_SOURCE_COMPILES("${TESTSRC}" USE_LIBXNET)
+      IF(NOT USE_LIBXNET)
+         MESSAGE(FATAL_ERROR "Error: Could not find a system library providing gethostbyname.")
+      ELSE(NOT USE_LIBXNET)
+         LIST(APPEND EXTRA_LIBS xnet)
+      ENDIF(NOT USE_LIBXNET)
    ENDIF(USE_LIBNLS)
 ENDIF(NOT USE_LIBC_NLS)
 SET(CMAKE_REQUIRED_LIBRARIES )