improved handling of libiconv

diff --git a/build/config.mk b/build/config.mk
index 1d2dc53..816b7ee 100644 (file)
--- a/build/config.mk
+++ b/build/config.mk
@@ -42,7 +42,10 @@ all default: $(DEFAULT_BUILD)
 
 VERSION=\"1.1.1\"
 
-CONFIG_CFLAGS=-DHAVE_INTTYPES_H -DFLAC__HAS_OGG
+CONFIG_CFLAGS=-DHAVE_INTTYPES_H -DHAVE_ICONV -DFLAC__HAS_OGG
+
+ICONV_INCLUDE_DIR=$(HOME)/local.i18n/include
+ICONV_LIB_DIR=$(HOME)/local.i18n/lib
 
 OGG_INCLUDE_DIR=$(HOME)/local/include
 OGG_LIB_DIR=$(HOME)/local/lib

diff --git a/src/flac/Makefile.lite b/src/flac/Makefile.lite
index 81eb0ab..03bbe0c 100644 (file)
--- a/src/flac/Makefile.lite
+++ b/src/flac/Makefile.lite
@@ -27,9 +27,9 @@ PROGRAM_NAME = flac
 INCLUDES = -I./include -I$(topdir)/include -I$(OGG_INCLUDE_DIR)
 
 ifeq ($(DARWIN_BUILD),yes)
-EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libOggFLAC.a $(libdir)/libFLAC.a $(libdir)/libreplaygain_analysis.a $(libdir)/libreplaygain_synthesis.a $(libdir)/libgetopt.a $(libdir)/libutf8.a $(OGG_LIB_DIR)/libogg.a -lm
+EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libOggFLAC.a $(libdir)/libFLAC.a $(libdir)/libreplaygain_analysis.a $(libdir)/libreplaygain_synthesis.a $(libdir)/libgetopt.a $(libdir)/libutf8.a $(OGG_LIB_DIR)/libogg.a -L$(ICONV_LIB_DIR) -liconv -lm
 else
-LIBS = -lgrabbag -lOggFLAC -lFLAC -lreplaygain_analysis -lreplaygain_synthesis -lgetopt -lutf8 -lm -L$(OGG_LIB_DIR) -logg
+LIBS = -lgrabbag -lOggFLAC -lFLAC -lreplaygain_analysis -lreplaygain_synthesis -lgetopt -lutf8 -L$(OGG_LIB_DIR) -logg -L$(ICONV_LIB_DIR) -liconv -lm
 endif
 
 SRCS_C = \

diff --git a/src/metaflac/Makefile.lite b/src/metaflac/Makefile.lite
index e1113b4..fadb1d9 100644 (file)
--- a/src/metaflac/Makefile.lite
+++ b/src/metaflac/Makefile.lite
@@ -27,9 +27,9 @@ PROGRAM_NAME = metaflac
 INCLUDES = -I./include -I$(topdir)/include
 
 ifeq ($(DARWIN_BUILD),yes)
-EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libFLAC.a $(libdir)/libreplaygain_analysis.a $(libdir)/libgetopt.a $(libdir)/libutf8.a -lm
+EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libFLAC.a $(libdir)/libreplaygain_analysis.a $(libdir)/libgetopt.a $(libdir)/libutf8.a -L$(ICONV_LIB_DIR) -liconv -lm
 else
-LIBS = -lgrabbag -lFLAC -lreplaygain_analysis -lgetopt -lutf8 -lm
+LIBS = -lgrabbag -lFLAC -lreplaygain_analysis -lgetopt -lutf8 -L$(ICONV_LIB_DIR) -liconv -lm
 endif
 
 SRCS_C = \

diff --git a/src/plugin_common/Makefile.lite b/src/plugin_common/Makefile.lite
index 49a8b47..031c496 100644 (file)
--- a/src/plugin_common/Makefile.lite
+++ b/src/plugin_common/Makefile.lite
@@ -22,7 +22,7 @@
 topdir = ../..
 
 LIB_NAME = libplugin_common
-INCLUDES = -I$(topdir)/include -I$(HOME)/local/include
+INCLUDES = -I$(topdir)/include -I$(HOME)/local/include -I$(ICONV_INCLUDE_DIR)
 DEFINES  = 
 
 SRCS_C = \

diff --git a/src/share/utf8/Makefile.lite b/src/share/utf8/Makefile.lite
index 95e4a7f..a035802 100644 (file)
--- a/src/share/utf8/Makefile.lite
+++ b/src/share/utf8/Makefile.lite
@@ -5,7 +5,7 @@
 topdir = ../../..
 
 LIB_NAME = libutf8
-INCLUDES = -I$(topdir)/include -I$(topdir)/include/share
+INCLUDES = -I$(topdir)/include -I$(topdir)/include/share -I$(ICONV_INCLUDE_DIR)
 
 SRCS_C = \
        charset.c \