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 --- makefiledir/Makefile.libdetection | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'makefiledir/Makefile.libdetection') diff --git a/makefiledir/Makefile.libdetection b/makefiledir/Makefile.libdetection index 237c02f98..47d8edee1 100644 --- a/makefiledir/Makefile.libdetection +++ b/makefiledir/Makefile.libdetection @@ -121,3 +121,12 @@ WITH_PNG:= 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 -- cgit v1.2.3-70-g09d2