Remove INCLUDED_LIBINTL hack

diff --git a/bindings/java/src/Makefile.am b/bindings/java/src/Makefile.am
index 1ba9398225bc997eaf1f5a119712407cde0dc3d3..a6ac5aeab59d32d2c93e00e97bed2a0036dd97f0 100644 (file)
--- a/bindings/java/src/Makefile.am
+++ b/bindings/java/src/Makefile.am
@@ -32,8 +32,8 @@ jvlc$(LIBEXT): $(libjvlc_a_OBJECTS) \
                       $(libjvlc_a_DEPENDENCIES)
                  $(CXXLINK) $(libjvlc_a_OBJECTS) -Wl,--kill-at \
                        $(srcdir)/libjvlc.def \
-                       $(LIBRARIES_libvlc) -shared $(LIBRARIES_libvlc) $(LIBJINCLUDES) $(LDFLAGS_jvlc) \
-                       $(INCLUDED_LIBINTL)
+                       $(LIBRARIES_libvlc) -shared $(LIBRARIES_libvlc) $(LIBJINCLUDES) \
+                               $(LDFLAGS_jvlc) $(LTLIBINTL)
 # Cygwin work-around, copied by other makefiles
                        @if test -f "$@.exe"; then mv -f "$@.exe" "$@"; fi
 

diff --git a/configure.ac b/configure.ac
index a9e4f4bb9895f5056ccb72688a38bc4fb1fafd30..366039735bf38c6548e19c0607ba6129f40ca6ff 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -366,19 +366,9 @@ 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"
-  AS_IF([test "${enable_libtool}" != "no"], [
-    INCLUDED_LIBINTL="${LTLIBINTL}"
-  ],[
-    INCLUDED_LIBINTL="${LIBINTL}"
-  ])
 ], [
-  AS_IF([test "${enable_libtool}" != "no"], [
-    VLC_ADD_LDFLAGS([libvlc vlc], [${LTLIBINTL}])
-  ], [
-    VLC_ADD_LDFLAGS([libvlc vlc], [${LIBINTL}])
-  ])
+  VLC_ADD_LDFLAGS([libvlc vlc], [${LTLIBINTL}])
 ])
-AC_SUBST(INCLUDED_LIBINTL)
 
 dnl
 dnl Iconv stuff

diff --git a/src/Makefile.am b/src/Makefile.am
index 484cfe814fd7b7669f20e940911048352c32f184..cdbe9627004d4f972138bd90397581f54c3d83f1 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -105,7 +105,7 @@ endif
 
 libvlc_la_SOURCES = $(SOURCES_libvlc)
 nodist_libvlc_la_SOURCES = misc/revision.c
-libvlc_la_LIBADD = $(INCLUDED_LIBINTL)
+libvlc_la_LIBADD = $(LTLIBINTL)
 libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc`
 libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc`
 libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc`