[Debburn-changes] r343 - in nonameyet/trunk: . include

[Eduard Bloch]

Author: blade
Date: 2006-09-26 23:17:22 +0000 (Tue, 26 Sep 2006)
New Revision: 343

Modified:
   nonameyet/trunk/INSTALL
   nonameyet/trunk/include/CMakeLists.txt
   nonameyet/trunk/include/xconfig.h.in
Log:
Better test for blksize_t mapping in xconfig.h, for xlc compiler

Modified: nonameyet/trunk/INSTALL
===================================================================
--- nonameyet/trunk/INSTALL	2006-09-26 22:19:12 UTC (rev 342)
+++ nonameyet/trunk/INSTALL	2006-09-26 23:17:22 UTC (rev 343)
@@ -4,7 +4,7 @@
 This software is compiled to binary form using a build system based on the
 CMake framework. Therefore, the requirements to build this package are:
 
- - cmake (recent version, available from http://www.cmake.org or maybe as a
+ - cmake 2.4.3 or newer (available from http://www.cmake.org or maybe as a
    package in your Linux distribution)
  - make (an implmentation supported by cmake, eg. GNU make, smake, ...)
  - working GCC compiler environment
@@ -19,5 +19,4 @@
 
 To force a custom target directory, use something like:
 
-cmake -DCMAKE_INSTALL_PREFIX=/opt/freeware build
-make install
+make install PREFIX=/opt/cdrkit

Modified: nonameyet/trunk/include/CMakeLists.txt
===================================================================
--- nonameyet/trunk/include/CMakeLists.txt	2006-09-26 22:19:12 UTC (rev 342)
+++ nonameyet/trunk/include/CMakeLists.txt	2006-09-26 23:17:22 UTC (rev 343)
@@ -52,6 +52,19 @@
 SET(HAVE_INET_NTOA false)
 ENDIF (WIN32) # workaround for cygwin 
 
+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)
 

Modified: nonameyet/trunk/include/xconfig.h.in
===================================================================
--- nonameyet/trunk/include/xconfig.h.in	2006-09-26 22:19:12 UTC (rev 342)
+++ nonameyet/trunk/include/xconfig.h.in	2006-09-26 23:17:22 UTC (rev 343)
@@ -431,7 +431,7 @@
 /* #undef dev_t */			/* To be used if dev_t is not present */
 /* #undef ino_t */			/* To be used if ino_t is not present */
 /* #undef nlink_t */			/* To be used if nlink_t is not present */
-#define blksize_t long		/* To be used if blksize_t is not present */
+ at HAVE_NATIVE_BLKSIZE_T@
 /* #undef blkcnt_t */			/* To be used if blkcnt_t is not present */
 /*
  * Important:	Next Step needs time.h for clock_t (because of a bug)