[Debburn-changes] r526 - in cdrkit/trunk: icedax include netscsid

[Eduard Bloch]

Author: blade
Date: 2006-11-30 03:05:00 +0100 (Thu, 30 Nov 2006)
New Revision: 526

Added:
   cdrkit/trunk/include/AddNetworkBits.cmake
Modified:
   cdrkit/trunk/icedax/CMakeLists.txt
   cdrkit/trunk/netscsid/CMakeLists.txt
Log:
Checks for extra additional network libs factored out, added something for libnls

Modified: cdrkit/trunk/icedax/CMakeLists.txt
===================================================================
--- cdrkit/trunk/icedax/CMakeLists.txt	2006-11-29 11:03:47 UTC (rev 525)
+++ cdrkit/trunk/icedax/CMakeLists.txt	2006-11-30 02:05:00 UTC (rev 526)
@@ -2,6 +2,7 @@
 INCLUDE_DIRECTORIES(../include ../wodim ${CMAKE_BINARY_DIR})
 include(../include/AddScgBits.cmake)
 include(../include/AddSchilyBits.cmake)
+include(../include/AddNetworkBits.cmake)
 
 FIND_FILE (HAVE_SYS_SOUNDCARD_H sys/soundcard.h)
 IF(HAVE_SYS_SOUNDCARD_H)

Copied: cdrkit/trunk/include/AddNetworkBits.cmake (from rev 525, cdrkit/trunk/include/AddScgBits.cmake)
===================================================================
--- cdrkit/trunk/include/AddScgBits.cmake	2006-11-29 11:03:47 UTC (rev 525)
+++ cdrkit/trunk/include/AddNetworkBits.cmake	2006-11-30 02:05:00 UTC (rev 526)
@@ -0,0 +1,40 @@
+
+# various checks add additional of extra libs, most likely for SunOS
+
+INCLUDE(CheckCSourceCompiles)
+
+SET(TESTSRC "
+#include <sys/types.h>
+#include <sys/socket.h>
+
+int main(int argc, char **argv) {
+return socket(AF_INET, SOCK_STREAM, 0);
+}
+")
+
+SET(CMAKE_REQUIRED_LIBRARIES )
+CHECK_C_SOURCE_COMPILES("${TESTSRC}" LIBC_SOCKET)
+
+IF(NOT LIBC_SOCKET)
+   LIST(APPEND EXTRA_LIBS socket)
+   #MESSAGE("Using libsocket for socket functions")
+ENDIF(NOT LIBC_SOCKET)
+
+SET(TESTSRC "
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+
+int main(int argc, char **argv) {
+struct hostent *h = gethostbyname(argv[0]);
+return sizeof(h);
+}
+")
+
+CHECK_C_SOURCE_COMPILES("${TESTSRC}" LIBC_GETHOSTBYNAME)
+
+IF(NOT LIBC_SOCKET)
+   LIST(APPEND EXTRA_LIBS nls)
+   #MESSAGE("Using libsocket for socket functions")
+ENDIF(NOT LIBC_SOCKET)
+

Modified: cdrkit/trunk/netscsid/CMakeLists.txt
===================================================================
--- cdrkit/trunk/netscsid/CMakeLists.txt	2006-11-29 11:03:47 UTC (rev 525)
+++ cdrkit/trunk/netscsid/CMakeLists.txt	2006-11-30 02:05:00 UTC (rev 526)
@@ -2,6 +2,7 @@
 INCLUDE_DIRECTORIES(../include ../wodim ${CMAKE_BINARY_DIR} )
 INCLUDE(../include/AddScgBits.cmake)
 INCLUDE(../include/AddSchilyBits.cmake)
+INCLUDE(../include/AddNetworkBits.cmake)
 
 LINK_DIRECTORIES(../librols ../libusal ../libdeflt)
 ADD_EXECUTABLE (netscsid netscsid.c)