From 41f4c473dafd4cd1982d76cfb7b702426bb6067f Mon Sep 17 00:00:00 2001 From: bjarni Date: Thu, 23 Mar 2006 23:54:43 +0000 Subject: (svn r4074) -Feature: [Makefile] the makefile can now detect if iconv is present in the system if detected, WITH_ICONV will be defined in the C code WITH_ICONV is also added to Makefile.config OSX do not use this flag setting in Makefile.config, as it is set at compile time based on target OS version the actual C code is not changed as the current iconv code is hardcoded for OSX and would break if any other OS got iconv This detection system is by request of Darkvater --- os/macosx/Makefile.setup | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'os') diff --git a/os/macosx/Makefile.setup b/os/macosx/Makefile.setup index 159bf0aa5..92969ae43 100644 --- a/os/macosx/Makefile.setup +++ b/os/macosx/Makefile.setup @@ -84,3 +84,10 @@ $(shell $(CC) os/macosx/G5_detector.c -o os/macosx/G5_detector) endif endif endif + +# the OSX port need Apple's modified iconv to use the charset UTF-8-MAC. This was added by default in 10.3, but is not present in earlier versions +ifdef JAGUAR + WITH_ICONV:= +else + WITH_ICONV:=1 +endif -- cgit v1.2.3-70-g09d2