[Debburn-changes] r537 - in cdrkit/trunk: . include libunls
Eduard Bloch
blade at alioth.debian.org
Sat Dec 2 12:10:06 CET 2006
Author: blade
Date: 2006-12-02 12:10:05 +0100 (Sat, 02 Dec 2006)
New Revision: 537
Removed:
cdrkit/trunk/include/test_HAVE_MLOCKALL.c
cdrkit/trunk/include/test_SYS_UNION_WAIT.c
cdrkit/trunk/include/test_UNION_WAIT.c
cdrkit/trunk/libunls/Targets
Modified:
cdrkit/trunk/TODO
cdrkit/trunk/include/CMakeLists.txt
cdrkit/trunk/include/xconfig.h.in
Log:
Some cleanups and test consolidation in configuration
Modified: cdrkit/trunk/TODO
===================================================================
--- cdrkit/trunk/TODO 2006-12-02 10:09:56 UTC (rev 536)
+++ cdrkit/trunk/TODO 2006-12-02 11:10:05 UTC (rev 537)
@@ -4,15 +4,8 @@
OR
Stop supporting it, add a warning to libusal (scsi-remote.c or so) to not
use it, add an appropriate comment to a BUGS file
- - try again with FIND_LIBRARY(iconv_open,libiconv),
- FIND_LIBRARY(iconv_open,c), FIND_LIBRARY(gethostbyname,xnet),
- FIND_LIBRARY(gethostbyname,nls), FIND_LIBRARY(gethostbyname,c) (in that order?!)
- Shall work on AIX or BSD and on Cygwin
- - disable boot-mipsel with non-GCC?
- fix nread() callers, see toc.c:835
- check libparanoia, we may link dynamicaly with it. Quality? Portability?
- - check documentation, debian/* documentation, FAQ, etc.pp.
- - proper getnameinfo/inet_ntoa checks, see include/CMakeLists.txt
- check notes in help output, drop advisories, notes about future plans...
- find out why spawn.c breaks in WAIT_H while the WAIT_UNION check works quite well on sys/wait.h. See include/CMakeLists.txt comments.
- add better detection for various functions. Eg. have_mlockall on cygwin. (volunteers?)
Modified: cdrkit/trunk/include/CMakeLists.txt
===================================================================
--- cdrkit/trunk/include/CMakeLists.txt 2006-12-02 10:09:56 UTC (rev 536)
+++ cdrkit/trunk/include/CMakeLists.txt 2006-12-02 11:10:05 UTC (rev 537)
@@ -23,7 +23,6 @@
CONFIGURE_FILE( align.h.in align.h)
#SET_SOURCE_FILES_PROPERTIES(align.h PROPERTIES GENERATED 1)
-
TRY_COMPILE(VA_LIST_IS_ARRAY ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/test_VA_LIST_IS_ARRAY.c)
# invert the result, has the condition IFF compiler fails. There must be a simple way to say a=!b... but how?
IF(VA_LIST_IS_ARRAY)
@@ -32,27 +31,15 @@
SET(VA_LIST_IS_ARRAY TRUE)
endif(VA_LIST_IS_ARRAY)
-TRY_COMPILE(HAVE_MLOCKALL ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/test_HAVE_MLOCKALL.c)
INCLUDE(TestBigEndian)
TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
TRY_RUN(BITFIELDS_HTOL TEST_DUMMY ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/test_BITFIELDS_HTOL.c)
-FIND_FILE(HAVE_WAIT_H "wait.h")
-FIND_FILE(HAVE_SYS_WAIT_H "sys/wait.h")
-TRY_COMPILE(HAVE_UNION_WAIT ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/test_UNION_WAIT.c )
-# disabled, though the alternative works on cygwin and both headers are present
-# there.
-#IF(NOT HAVE_UNION_WAIT)
-# TRY_COMPILE(HAVE_UNION_WAIT ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/test_SYS_UNION_WAIT.c )
-#MESSAGE("syswait: ${HAVE_UNION_WAIT}")
-#ENDIF(NOT HAVE_UNION_WAIT)
-
INCLUDE(CheckIncludeFiles)
#SET(CMAKE_REQUIRED_INCLUDES "/usr/include;/usr/local/include")
-
CHECK_INCLUDE_FILES("stdarg.h" HAVE_STDARG_H)
CHECK_INCLUDE_FILES("stdlib.h" HAVE_STDLIB_H)
CHECK_INCLUDE_FILES("string.h" HAVE_STRING_H)
@@ -155,6 +142,25 @@
")
CHECK_C_SOURCE_COMPILES("${TESTSRC}" HAVE_INET_NTOA)
+SET(TESTSRC "
+#include <sys/types.h>
+#include <wait.h>
+int main() {
+union wait w;
+return 0;
+}
+")
+# FIXME: try the same with #include <sys/wait.h>... may work, if yes, integrate properly
+CHECK_C_SOURCE_COMPILES("${TESTSRC}" HAVE_UNION_WAIT)
+SET(TESTSRC "
+#include <sys/types.h>
+#include <sys/mman.h>
+int main() {
+if (mlockall(MCL_CURRENT|MCL_FUTURE) < 0)
+ return(0);
+ }
+")
+CHECK_C_SOURCE_COMPILES("${TESTSRC}" HAVE_MLOCKALL)
CONFIGURE_FILE( xconfig.h.in xconfig.h)
Deleted: cdrkit/trunk/include/test_HAVE_MLOCKALL.c
===================================================================
--- cdrkit/trunk/include/test_HAVE_MLOCKALL.c 2006-12-02 10:09:56 UTC (rev 536)
+++ cdrkit/trunk/include/test_HAVE_MLOCKALL.c 2006-12-02 11:10:05 UTC (rev 537)
@@ -1,31 +0,0 @@
-/*
- * This file has been modified for the cdrkit suite.
- *
- * The behaviour and appearence of the program code below can differ to a major
- * extent from the version distributed by the original author(s).
- *
- * For details, see Changelog file distributed with the cdrkit package. If you
- * received this file from another source then ask the distributing person for
- * a log of modifications.
- *
- */
-
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <errno.h>
-#ifndef HAVE_ERRNO_DEF
-extern int errno;
-#endif
-
- int
-main()
-{
- if (mlockall(MCL_CURRENT|MCL_FUTURE) < 0) {
- if (errno == EINVAL || errno == ENOMEM ||
- errno == EPERM || errno == EACCES)
- return(0);
- return(-1);
- }
- return(0);
-}
-
Deleted: cdrkit/trunk/include/test_SYS_UNION_WAIT.c
===================================================================
--- cdrkit/trunk/include/test_SYS_UNION_WAIT.c 2006-12-02 10:09:56 UTC (rev 536)
+++ cdrkit/trunk/include/test_SYS_UNION_WAIT.c 2006-12-02 11:10:05 UTC (rev 537)
@@ -1,7 +0,0 @@
-#include <sys/types.h>
-#include <sys/wait.h>
-int main() {
- union wait w;
- return 0;
-}
-
Deleted: cdrkit/trunk/include/test_UNION_WAIT.c
===================================================================
--- cdrkit/trunk/include/test_UNION_WAIT.c 2006-12-02 10:09:56 UTC (rev 536)
+++ cdrkit/trunk/include/test_UNION_WAIT.c 2006-12-02 11:10:05 UTC (rev 537)
@@ -1,7 +0,0 @@
-#include <sys/types.h>
-#include <wait.h>
-int main() {
- union wait w;
- return 0;
-}
-
Modified: cdrkit/trunk/include/xconfig.h.in
===================================================================
--- cdrkit/trunk/include/xconfig.h.in 2006-12-02 10:09:56 UTC (rev 536)
+++ cdrkit/trunk/include/xconfig.h.in 2006-12-02 11:10:05 UTC (rev 537)
@@ -230,13 +230,12 @@
/*
* Byteorder/Bitorder
*/
-#define HAVE_C_BIGENDIAN /* Flag that WORDS_BIGENDIAN test was done */
/* If using network byte order */
#cmakedefine WORDS_BIGENDIAN
/* If high bits come first in structures */
#cmakedefine BITFIELDS_HTOL
-/* Flag that BITFIELDS_HTOL test was done */
-#define HAVE_C_BITFIELDS
+#define HAVE_C_BIGENDIAN /* Flag that WORDS_BIGENDIAN test was done */
+#define HAVE_C_BITFIELDS /* Flag that BITFIELDS_HTOL test was done */
/*
* Types/Keywords
@@ -279,10 +278,9 @@
/*
* Misc CC / LD related stuff
*/
+/* If the compiler allows dynamic sized arrays */
+#cmakedefine HAVE_DYN_ARRAYS
-// #warning FIXME, add a test
-#define HAVE_DYN_ARRAYS 1 */ /* If the compiler allows dynamic sized arrays */
-
#define HOST_SYSTEM "@CMAKE_SYSTEM_NAME@"
#cmakedefine CDRKIT_VERSION "@CDRKIT_VERSION@"
/*[$Rev: 467 $]" */
Deleted: cdrkit/trunk/libunls/Targets
===================================================================
--- cdrkit/trunk/libunls/Targets 2006-12-02 10:09:56 UTC (rev 536)
+++ cdrkit/trunk/libunls/Targets 2006-12-02 11:10:05 UTC (rev 537)
@@ -1,43 +0,0 @@
-#ident @(#)Targets 1.7 02/12/03
-#
-CFILES= nls_base.c \
- nls_config.c \
- nls_cp437.c \
- nls_cp737.c \
- nls_cp775.c \
- nls_cp850.c \
- nls_cp852.c \
- nls_cp855.c \
- nls_cp857.c \
- nls_cp860.c \
- nls_cp861.c \
- nls_cp862.c \
- nls_cp863.c \
- nls_cp864.c \
- nls_cp865.c \
- nls_cp866.c \
- nls_cp869.c \
- nls_cp874.c \
- nls_cp1250.c \
- nls_cp1251.c \
- nls_iso8859-1.c \
- nls_iso8859-2.c \
- nls_iso8859-3.c \
- nls_iso8859-4.c \
- nls_iso8859-5.c \
- nls_iso8859-6.c \
- nls_iso8859-7.c \
- nls_iso8859-8.c \
- nls_iso8859-9.c \
- nls_iso8859-14.c \
- nls_iso8859-15.c \
- nls_koi8-r.c \
- nls_koi8-u.c \
- nls_cp10000.c \
- nls_cp10006.c \
- nls_cp10007.c \
- nls_cp10029.c \
- nls_cp10079.c \
- nls_cp10081.c \
- nls_file.c \
- nls_iconv.c
More information about the Debburn-changes
mailing list