* build libiconv without i18n-support, so it can be compiled without gettext -- gette...

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 8b90fb8092762266e4a7ed875c80f6a8667a8b70..46ca2e322414526acfcebd8198cfce8293e7c3f8 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -51,14 +51,14 @@ endif
 # ***************************************************************************
 
 ifeq ($(SYS),DARWIN)
-all: .autoconf .libtool .automake .intl .iconv .pkgcfg .freetype .fribidi \
+all: .autoconf .libtool .automake .iconv .intl .pkgcfg .freetype .fribidi \
        .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
        .FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .openslp \
        .dvdcss .dvdread .dvdnav .dvbpsi .live .goom2k4 .caca .mod \
        .png .gpgerror .gcrypt .gnutls
 endif
 ifeq ($(SYS),BEOS)
-all: .perl .autoconf .libtool .automake .intl .iconv .freetype .fribidi \
+all: .perl .autoconf .libtool .automake .iconv .intl .freetype .fribidi \
        .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
        .FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
        .dvdread .dvdnav .dvbpsi
@@ -270,7 +270,7 @@ libiconv: libiconv-$(LIBICONV_VERSION).tar.gz
        $(EXTRACT_GZ)
 
 .iconv: libiconv
-       (cd libiconv; ./configure --prefix=$(PREFIX) && make && make install)
+       (cd libiconv; ./configure --prefix=$(PREFIX) --disable-nls && make && make install)
        $(INSTALL_NAME)
        touch $@