# HG changeset patch
# User tron
# Date 1143182449 0
# Node ID 735b30b93dc26016f769e02f1865e2ff80feb54d
# Parent  d28f88dc55875882afb115e28dc79042a88365d7
(svn r4076) Back out r4074. It doesn't work and leads to make endlessly calling itself. NOTE: Delete Makefile.config to recover.

diff -r d28f88dc5587 -r 735b30b93dc2 Makefile
--- a/Makefile	Fri Mar 24 00:42:35 2006 +0000
+++ b/Makefile	Fri Mar 24 06:40:49 2006 +0000
@@ -130,7 +130,7 @@
 
 # Makefile version tag
 # it checks if the version tag in Makefile.config is the same and force update outdated config files
-MAKEFILE_VERSION:=10
+MAKEFILE_VERSION:=9
 
 # CONFIG_WRITER has to be found even for manual configuration
 CONFIG_WRITER=makefiledir/Makefile.config_writer
@@ -485,9 +485,10 @@
 endif
 endif
 
-ifdef WITH_ICONV
+ifdef OSX
+ifndef JAGUAR
 LIBS += -liconv
-CFLAGS += -DWITH_ICONV
+endif
 endif
 
 # enables/disables assert()
diff -r d28f88dc5587 -r 735b30b93dc2 makefiledir/Makefile.config_writer
--- a/makefiledir/Makefile.config_writer	Fri Mar 24 00:42:35 2006 +0000
+++ b/makefiledir/Makefile.config_writer	Fri Mar 24 06:40:49 2006 +0000
@@ -64,11 +64,9 @@
 	$(call CONFIG_LINE,)
 
 	$(call CONFIG_LINE,\# Libs)
-	$(call CONFIG_LINE,\# WITH_ICONV is not used on OSX since the flag is overwritten. It is always used unless the target OS is 10.2.8)
 	$(call CONFIG_LINE,WITH_ZLIB:=$(WITH_ZLIB))
 	$(call CONFIG_LINE,WITH_SDL:=$(WITH_SDL))
 	$(call CONFIG_LINE,WITH_PNG:=$(WITH_PNG))
-	$(call CONFIG_LINE,WITH_ICONV:=$(WITH_ICONV))
 	$(call CONFIG_LINE,STATIC_ZLIB_PATH:=$(STATIC_ZLIB_PATH))
 	$(call CONFIG_LINE,WITH_COCOA:=$(WITH_COCOA))
 	$(call CONFIG_LINE,)
diff -r d28f88dc5587 -r 735b30b93dc2 makefiledir/Makefile.libdetection
--- a/makefiledir/Makefile.libdetection	Fri Mar 24 00:42:35 2006 +0000
+++ b/makefiledir/Makefile.libdetection	Fri Mar 24 06:40:49 2006 +0000
@@ -121,12 +121,3 @@
 endif
 
 endif
-
-ifeq ($(shell expr $(CONFIG_VERSION) \< 10), 1)
-# we need to test if iconv is present on the current system
-# even though we test on OSX, the read data is actually not used since it relies on target OS and this flag will be overwritten later
-
-$(shell $(CC) -liconv -o makefiledir/iconv_detector makefiledir/iconv_detector.c 2>/dev/null)
-WITH_ICONV:=$(shell makefiledir/iconv_detector 2>/dev/null)
-$(shell rm makefiledir/iconv_detector 2>/dev/null)
-endif
diff -r d28f88dc5587 -r 735b30b93dc2 makefiledir/iconv_detector.c
--- a/makefiledir/iconv_detector.c	Fri Mar 24 00:42:35 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-/* $Id$ */
-
-#include <stdlib.h>
-#include <iconv.h>
-#include <stdio.h>
-
-/* this is a pretty simple app, that will return 1 if it manages to compile and execute
- * This means that it can be used by the makefile to detect if iconv is present on the current system
- * no iconv means this file fails and will return nothing */
-
-int main ()
-{
-	iconv_t cd = iconv_open("","");
-	iconv(cd,NULL,NULL,NULL,NULL);
-	iconv_close(cd);
-	printf("1\n");
-	return 0;
-}
diff -r d28f88dc5587 -r 735b30b93dc2 os/macosx/Makefile.setup
--- a/os/macosx/Makefile.setup	Fri Mar 24 00:42:35 2006 +0000
+++ b/os/macosx/Makefile.setup	Fri Mar 24 06:40:49 2006 +0000
@@ -84,10 +84,3 @@
 		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