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

[Eduard Bloch]

Author: blade
Date: 2006-11-23 11:48:50 +0100 (Thu, 23 Nov 2006)
New Revision: 423

Modified:
   cdrkit/trunk/include/AddScgBits.cmake
   cdrkit/trunk/include/CMakeLists.txt
Log:
Dynamic checks for -lrt and -lsocket requierement (SunOS)


Modified: cdrkit/trunk/include/AddScgBits.cmake
===================================================================
--- cdrkit/trunk/include/AddScgBits.cmake	2006-11-23 09:58:31 UTC (rev 422)
+++ cdrkit/trunk/include/AddScgBits.cmake	2006-11-23 10:48:50 UTC (rev 423)
@@ -1,4 +1,8 @@
 
+IF(NOT GUARD_SCGCONFIG)
+   SET(GUARD_SCGCONFIG 1)
+
+
 LIST(APPEND EXTRA_LIBS "scg")
 
 INCLUDE(CheckIncludeFiles)
@@ -21,35 +25,41 @@
    LIST(APPEND SCG_SELF_LIBS "volmgt")
 ENDIF(HAVE_LIBVOLMGT)
 
-IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
-   LIST(APPEND EXTRA_LIBS -lrt -lsocket)
-      # reason below, FIXME: add proper checks
-      ##   CMakeFiles/cdda2wav.dir/cdda2wav.o(.text+0x19cc): In function
-      ##   `switch_to_realtime_priority':
-      ##   : undefined reference to `sched_get_priority_min'
-      ##   CMakeFiles/cdda2wav.dir/cdda2wav.o(.text+0x19e0): In function
-      ##   `switch_to_realtime_priority':
-      ##   : undefined reference to `sched_get_priority_max'
-      ##   CMakeFiles/cdda2wav.dir/cdda2wav.o(.text+0x1a2c): In function
-      ##   `switch_to_realtime_priority':
-      ##   : undefined reference to `sched_setscheduler'
-      ##   CMakeFiles/cdda2wav.dir/toc.o(.text+0x3fd8): In function
-      ##   `request_titles':
-      ##   : undefined reference to `socket'
-      ##   CMakeFiles/cdda2wav.dir/toc.o(.text+0x403c): In function
-      ##   `request_titles':
-      ##   : undefined reference to `gethostbyname'
-      ##   CMakeFiles/cdda2wav.dir/toc.o(.text+0x405c): In function
-      ##   `request_titles':
-      ##   : undefined reference to `gethostbyname'
-      ##   CMakeFiles/cdda2wav.dir/toc.o(.text+0x418c): In function
-      ##   `request_titles':
-      ##   : undefined reference to `getservbyname'
-      ##   CMakeFiles/cdda2wav.dir/toc.o(.text+0x41d4): In function
-      ##   `request_titles':
-      ##   : undefined reference to `getservbyname'
-      ##   CMakeFiles/cdda2wav.dir/toc.o(.text+0x427c): In function
-      ##   `request_titles':
-      ##   : undefined reference to `connect'
-      ENDIF(CMAKE_SYSTEM_NAME MATCHES "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 -lsocket)
+   #MESSAGE("Using libsocket for socket functions")
+ENDIF(NOT LIBC_SOCKET)
+
+
+   SET(TESTSRC "
+#include <sched.h>
+struct sched_param scp;
+         int main(int argc, char **argv) {
+         return sched_setscheduler(0, SCHED_RR, &scp);
+         }
+")
+
+
+SET(CMAKE_REQUIRED_LIBRARIES )
+   CHECK_C_SOURCE_COMPILES("${TESTSRC}" LIBC_SCHED)
+
+IF(NOT LIBC_SCHED)
+   LIST(APPEND EXTRA_LIBS -lrt)
+   #MESSAGE("Using librt for realtime functions")
+ENDIF(NOT LIBC_SCHED)
+
+ENDIF(NOT GUARD_SCGCONFIG)

Modified: cdrkit/trunk/include/CMakeLists.txt
===================================================================
--- cdrkit/trunk/include/CMakeLists.txt	2006-11-23 09:58:31 UTC (rev 422)
+++ cdrkit/trunk/include/CMakeLists.txt	2006-11-23 10:48:50 UTC (rev 423)
@@ -55,11 +55,6 @@
 FIND_FILE(HAVE_SYS_DKIO_H "sys/dkio.h")
 FIND_FILE(HAVE_SUN_DKIO_H "sun/dkio.h")
 FIND_FILE(HAVE_NAN_H "nan.h")
-
-FIND_FILE(HAVE_SYS_DKIO_H "sys/dkio.h")
-FIND_FILE(HAVE_SUN_DKIO_H "sun/dkio.h")
-FIND_FILE(HAVE_NAN_H "nan.h")
-
 FIND_FILE(HAVE_STDARG_H "stdarg.h")
 FIND_FILE(HAVE_STDLIB_H "stdlib.h")
 FIND_FILE(HAVE_STRING_H "string.h")
@@ -85,7 +80,6 @@
 FIND_FILE(HAVE_SYS_UTSNAME_H "sys/utsname.h")
 FIND_FILE(HAVE_SYS_MTIO_H "sys/mtio.h")
 FIND_FILE(HAVE_SYS_MMAN_H "sys/mman.h")
-FIND_FILE(HAVE_SYS_DKIO_H "sys/dkio.h")
 FIND_FILE(HAVE_POLL_H "poll.h")
 FIND_FILE(HAVE_SYS_POLL_H "sys/poll.h")
 FIND_FILE(HAVE_NETDB_H "netdb.h")
@@ -96,11 +90,7 @@
 FIND_FILE(HAVE_AOUTHDR_H "aouthdr.h")
 FIND_FILE(HAVE_A_OUT_H "a.out.h")
 FIND_FILE(HAVE_SYS_IPC_H "sys/ipc.h")
-FIND_FILE(HAVE_SYS_IPC_H "sys/ipc.h")
 
-
-
-
 INCLUDE(CheckCSourceCompiles)
 
    SET(TESTSRC " 
@@ -110,20 +100,5 @@
 SET(CMAKE_REQUIRED_LIBRARIES )
    CHECK_C_SOURCE_COMPILES("${TESTSRC}" HAVE_ISINF)
 
-
-##INCLUDE(CheckCSourceCompiles)
-##SET(TESTSRC "
-###include <sys/types.h>
-##int main() { return sizeof(blksize_t); }
-##")
-##CHECK_C_SOURCE_COMPILES("${TESTSRC}" HAVE_NATIVE_BLKSIZE_T)
-##IF(HAVE_NATIVE_BLKSIZE_T)
-##   SET(HAVE_NATIVE_BLKSIZE_T "/* <sys/types.h> provides blksize_t*/")
-##ELSE(HAVE_NATIVE_BLKSIZE_T)
-##   SET(HAVE_NATIVE_BLKSIZE_T "
-###define blksize_t long
-##")
-##ENDIF(HAVE_NATIVE_BLKSIZE_T)
-
 CONFIGURE_FILE( xconfig.h.in xconfig.h)