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

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index bc6e0ea6eac881493d786501d30b9293b4c70ffe..46ca2e322414526acfcebd8198cfce8293e7c3f8 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -215,25 +215,6 @@ CLEAN_FILE += .automake
 CLEAN_PKG += automake
 DISTCLEAN_PKG += automake-$(AUTOMAKE_VERSION).tar.gz
 
-# ***************************************************************************
-# libiconv
-# ***************************************************************************
-
-libiconv-$(LIBICONV_VERSION).tar.gz:
-       $(WGET) $(LIBICONV_URL)
-
-libiconv: libiconv-$(LIBICONV_VERSION).tar.gz
-       $(EXTRACT_GZ)
-
-.iconv: libiconv
-       (cd libiconv; ./configure --prefix=$(PREFIX) && make && make install)
-       $(INSTALL_NAME)
-       touch $@
-
-CLEAN_FILE += .iconv
-CLEAN_PKG += libiconv
-DISTCLEAN_PKG += libiconv-$(LIBICONV_VERSION).tar.gz
-
 # ***************************************************************************
 # pkgconfig
 # ***************************************************************************
@@ -251,6 +232,7 @@ pkgconfig: pkgconfig-$(PKGCFG_VERSION).tar.gz
 CLEAN_FILE += .pkgcfg
 CLEAN_PKG += pkgconfig
 DISTCLEAN_PKG += pkgconfig-$(PKGCFG_VERSION).tar.gz
+
 # ***************************************************************************
 # gettext
 # ***************************************************************************
@@ -262,7 +244,7 @@ gettext: gettext-$(GETTEXT_VERSION).tar.gz
        $(EXTRACT_GZ)
        patch -p 0 < Patches/gettext.patch
 
-.intl: gettext .iconv
+.intl: gettext
        ( cd $< && ./configure --prefix=$(PREFIX) )
 ifeq ($(SYS),BEOS)
 # The ugliest kludge ever - so libtool correctly links shared libraries
@@ -277,6 +259,25 @@ CLEAN_FILE += .intl
 CLEAN_PKG += gettext
 DISTCLEAN_PKG += gettext-$(GETTEXT_VERSION).tar.gz
 
+# ***************************************************************************
+# libiconv
+# ***************************************************************************
+
+libiconv-$(LIBICONV_VERSION).tar.gz:
+       $(WGET) $(LIBICONV_URL)
+
+libiconv: libiconv-$(LIBICONV_VERSION).tar.gz
+       $(EXTRACT_GZ)
+
+.iconv: libiconv
+       (cd libiconv; ./configure --prefix=$(PREFIX) --disable-nls && make && make install)
+       $(INSTALL_NAME)
+       touch $@
+
+CLEAN_FILE += .iconv
+CLEAN_PKG += libiconv
+DISTCLEAN_PKG += libiconv-$(LIBICONV_VERSION).tar.gz
+
 # ***************************************************************************
 # freetype2
 # ***************************************************************************
@@ -1034,7 +1035,7 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.gz
        $(EXTRACT_GZ)
 
 .gcrypt: libgcrypt
-       (cd $<; ./configure --prefix=$(PREFIX) && make && make install )
+       (cd $<; ./configure --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" && make && make install )
        touch $@
 
 CLEAN_FILE += .gcrypt