[Debburn-changes] r530 - in cdrkit/trunk: genisoimage include
Eduard Bloch
blade at alioth.debian.org
Fri Dec 1 21:27:43 CET 2006
Author: blade
Date: 2006-12-01 21:27:42 +0100 (Fri, 01 Dec 2006)
New Revision: 530
Modified:
cdrkit/trunk/genisoimage/genisoimage.c
cdrkit/trunk/include/CMakeLists.txt
Log:
kick iconv.h again from the test includes
Modified: cdrkit/trunk/genisoimage/genisoimage.c
===================================================================
--- cdrkit/trunk/genisoimage/genisoimage.c 2006-12-01 19:19:02 UTC (rev 529)
+++ cdrkit/trunk/genisoimage/genisoimage.c 2006-12-01 20:27:42 UTC (rev 530)
@@ -1278,7 +1278,7 @@
int warn_violate = 0;
int have_cmd_line_pathspec = 0;
int rationalize_all = 0;
- int mkisofs_call=0;
+ char *mkisofs_call = 0; /* use as pointer and boolean */
#ifdef APPLE_HYB
char *afpfile = ""; /* mapping file for TYPE/CREATOR */
@@ -1286,10 +1286,10 @@
char *root_info = 0;
#endif /* APPLE_HYB */
- if(argc && strstr(argv[0], "mkisofs")) { /* lame cheater detected */
+ /* abusing arg */
+ mkisofs_call=strstr(argv[0], "mkisofs");
+ if(mkisofs_call && '\0' == mkisofs_call[7]) /* lame cheater detected */
argv[0]="genisoimage";
- mkisofs_call=1;
- }
#ifdef __EMX__
/* This gives wildcard expansion with Non-Posix shells with EMX */
@@ -3338,6 +3338,7 @@
*/
goof += sort_tree(root);
+#error hier warne wie "Note: multiple source directories have been specified and merged to the root filesystem. Check your program arguments. genisoimage is not tar."
if (goof) {
#ifdef USE_LIBSCHILY
comerrno(EX_BAD, "ISO9660/Rock Ridge tree sort failed.\n");
Modified: cdrkit/trunk/include/CMakeLists.txt
===================================================================
--- cdrkit/trunk/include/CMakeLists.txt 2006-12-01 19:19:02 UTC (rev 529)
+++ cdrkit/trunk/include/CMakeLists.txt 2006-12-01 20:27:42 UTC (rev 530)
@@ -112,10 +112,10 @@
message("ERROR: no library providing iconv found")
ENDIF(NOT USE_LIBICONV)
ENDIF(NOT USE_LIBC_ICONV)
+SET(CMAKE_REQUIRED_INCLUDES )
-
#CHECK_C_SOURCE_COMPILES("${TESTSRC}" USE_LIBICONV)
#IF(NOT USE_LIBICONV)
# FIND_FILE(ICONV_H_LOCATION "iconv.h")
More information about the Debburn-changes
mailing list