Remove libintl from the source tree.

People use libintil from the contrib anyway.

diff --git a/Makefile.am b/Makefile.am
index 0fbdb921f55c7eece95236b1a9d1a713977d94b9..c9f8b7193665ae012ce540a4adb84dd4ec334ec9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,10 +5,9 @@
 # SUBDIRS stores the directories where a "make" is required when building
 # something. DIST_SUBDIRS stores the directories where nothing is built but
 # which have makefiles with distribution information.
-#  - intl (gettext) is needed by src and modules
 #  - src (libvlc) is nedeed by modules, mozilla and bindings
 #  - libs/* are needed by modules
-SUBDIRS = intl po libs/loader libs/srtp src modules \
+SUBDIRS = po libs/loader libs/srtp src modules \
                mozilla bindings activex share doc
 DIST_SUBDIRS = $(SUBDIRS) m4 ipkg
 

diff --git a/configure.ac b/configure.ac
index e5e1b018a437c4ae7a89a9dc094890fc7c122b6b..283b98cbc7b0e9a87e5173ebb722968956e14678 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -393,17 +393,13 @@ dnl
 dnl Gettext stuff
 dnl
 AM_GNU_GETTEXT_VERSION(0.16.1)
-AM_GNU_GETTEXT
-AS_IF([test "${nls_cv_force_use_gnu_gettext}" = "yes"], [
-  AC_DEFINE(HAVE_INCLUDED_GETTEXT, 1, [Define if we use the local libintl])
-  AM_CPPFLAGS="${AM_CPPFLAGS} -I\$(top_builddir)/intl"
-], [
-  VLC_ADD_LIBS([libvlc vlc], [${LTLIBINTL}])
-])
+AM_GNU_GETTEXT([external])
+VLC_ADD_LIBS([libvlc vlc], [${LTLIBINTL}])
 
 dnl
 dnl Iconv stuff
 dnl
+AM_ICONV
 AS_IF([test "$am_cv_func_iconv" != "yes"],
        [AC_MSG_ERROR([libiconv is needed for VLC to work properly])])
 VLC_ADD_CFLAGS([libvlc],[${INCICONV}])
@@ -6102,7 +6098,6 @@ AC_CONFIG_FILES([
   bindings/java/src/Makefile
   bindings/python/Makefile
   doc/Makefile
-  intl/Makefile
   ipkg/Makefile
   libs/loader/Makefile
   libs/srtp/Makefile