[Debburn-changes] r491 - in cdrkit/trunk: genisoimage include libunls

[Eduard Bloch]

Author: blade
Date: 2006-11-26 16:02:56 +0100 (Sun, 26 Nov 2006)
New Revision: 491

Modified:
   cdrkit/trunk/genisoimage/CMakeLists.txt
   cdrkit/trunk/include/CMakeLists.txt
   cdrkit/trunk/include/xconfig.h.in
   cdrkit/trunk/libunls/CMakeLists.txt
   cdrkit/trunk/libunls/nls_iconv.c
Log:
Smarter iconv.h detection, moved to xconfig stuff

Modified: cdrkit/trunk/genisoimage/CMakeLists.txt
===================================================================
--- cdrkit/trunk/genisoimage/CMakeLists.txt	2006-11-26 14:40:42 UTC (rev 490)
+++ cdrkit/trunk/genisoimage/CMakeLists.txt	2006-11-26 15:02:56 UTC (rev 491)
@@ -11,17 +11,15 @@
 	SET(MAGICLIBS magic)
 ENDIF(USE_MAGIC)
 
-FIND_FILE (USE_ICONV iconv.h)
-IF(USE_ICONV)
-	ADD_DEFINITIONS(-DUSE_ICONV)
-ENDIF(USE_ICONV)
-# iconv may be provided by the 3rd party library
+# iconv may be provided by an additional library ; cludge, should test with a compile/link test
+IF(HAVE_ICONV_H)
 FIND_LIBRARY (USE_LIBICONV iconv)
 IF(USE_LIBICONV)
 	SET(EXTRA_LIBICONV iconv)
-endif(USE_LIBICONV)
-	
+ENDIF(USE_LIBICONV)
+ENDIF(HAVE_ICONV_H)
 
+
 ADD_DEFINITIONS(-DUSE_LARGEFILES -DABORT_DEEP_ISO_ONLY -DAPPLE_HYB -DUDF -DDVD_VIDEO -DSORTING -DHAVE_CONFIG_H -DUSE_LIBSCHILY -DUSE_SCG -DJIGDO_TEMPLATE)
 
 SET(MKISOFS_MOST_SRCS apple.c boot.c cd_misc.c defaults.c desktop.c dvd_file.c dvd_reader.c eltorito.c exclude.c files.c fnmatch.c getnum.c getopt.c getopt1.c hash.c ifo_read.c joliet.c mac_label.c match.c modes.c multi.c name.c rock.c scsi.c scsi_cdr.c stream.c tree.c udf.c vms.c volume.c write.c boot-alpha.c boot-hppa.c boot-mips.c md5.c jte.c rsync.c

Modified: cdrkit/trunk/include/CMakeLists.txt
===================================================================
--- cdrkit/trunk/include/CMakeLists.txt	2006-11-26 14:40:42 UTC (rev 490)
+++ cdrkit/trunk/include/CMakeLists.txt	2006-11-26 15:02:56 UTC (rev 491)
@@ -86,6 +86,7 @@
 CHECK_INCLUDE_FILES("aouthdr.h" HAVE_AOUTHDR_H)
 CHECK_INCLUDE_FILES("a.out.h" HAVE_A_OUT_H)
 CHECK_INCLUDE_FILES("sys/ipc.h" HAVE_SYS_IPC_H)
+CHECK_INCLUDE_FILES("iconv.h" HAVE_ICONV_H)
 CHECK_INCLUDE_FILES("sys/types.h;sys/mman.h" HAVE_SYS_MMAN_H)
 CHECK_INCLUDE_FILES("sys/types.h;sys/dkio.h" HAVE_SYS_DKIO_H)
 CHECK_INCLUDE_FILES("sys/types.h;sun/dkio.h" HAVE_SUN_DKIO_H)

Modified: cdrkit/trunk/include/xconfig.h.in
===================================================================
--- cdrkit/trunk/include/xconfig.h.in	2006-11-26 14:40:42 UTC (rev 490)
+++ cdrkit/trunk/include/xconfig.h.in	2006-11-26 15:02:56 UTC (rev 491)
@@ -110,6 +110,14 @@
 		/* if we have arpa/inet.h (missing on BeOS) */
 				/* BeOS has inet_ntoa() in <netdb.h> */
 
+#cmakedefine HAVE_ICONV_H
+  /* iconv() available on this system */
+
+/* Force iconv usage where possible */
+#ifdef HAVE_ICONV_H
+#define USE_ICONV
+#endif
+
 /*
  * Convert to SCHILY name
  */

Modified: cdrkit/trunk/libunls/CMakeLists.txt
===================================================================
--- cdrkit/trunk/libunls/CMakeLists.txt	2006-11-26 14:40:42 UTC (rev 490)
+++ cdrkit/trunk/libunls/CMakeLists.txt	2006-11-26 15:02:56 UTC (rev 491)
@@ -2,11 +2,6 @@
 INCLUDE_DIRECTORIES(../include ../libhfs_iso ../wodim ${CMAKE_BINARY_DIR})
 ADD_DEFINITIONS(-DHAVE_CONFIG_H)
 
-FIND_FILE (USE_ICONV iconv.h)
-IF(USE_ICONV)
-	ADD_DEFINITIONS(-DUSE_ICONV)
-ENDIF(USE_ICONV)
-
 SET(LIBunls_SRCS nls_base.c nls_config.c nls_cp10000.c nls_cp10006.c nls_cp10007.c nls_cp10029.c nls_cp10079.c nls_cp10081.c nls_cp1250.c nls_cp1251.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_file.c nls_iso8859-1.c nls_iso8859-14.c nls_iso8859-15.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_koi8-r.c nls_koi8-u.c nls_iconv.c) 
 #SET_SOURCE_FILES_PROPERTIES(${LIBunls_SRCS} PROPERTIES )
 ADD_LIBRARY (unls STATIC ${LIBunls_SRCS})

Modified: cdrkit/trunk/libunls/nls_iconv.c
===================================================================
--- cdrkit/trunk/libunls/nls_iconv.c	2006-11-26 14:40:42 UTC (rev 490)
+++ cdrkit/trunk/libunls/nls_iconv.c	2006-11-26 15:02:56 UTC (rev 491)
@@ -41,8 +41,9 @@
  * Jungshik Shin (jshin at mailaps.org) 04-Feb-2002
  */
 
+#include <mconfig.h>
+
 #ifdef USE_ICONV
-#include <mconfig.h>
 #include <stdio.h>
 #include <stdxlib.h>
 #include <strdefs.h>