Really fix libintl linking

diff --git a/Makefile.am b/Makefile.am
index 479fbf53e3dfef409ab3644f9aab1e0c94953e38..a8316ce9c0ab0113623a6fdada632031e8de3b61 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -216,7 +216,7 @@ LIB_libvlc = src/libvlc.a
 endif
 
 vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin` $(vlc_WORKAROUNDLDFLAGS)
-vlc_LDADD = $(LIB_libvlc) $(DATA_win32_rc) $(LIB_intl)
+vlc_LDADD = $(LIB_libvlc) $(DATA_win32_rc) $(INCLUDED_LIBINTL)
 vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
 
 # We use DEPENDENCIES_vlc instead of vlc_DEPENDENCIES because of an

diff --git a/configure.ac b/configure.ac
index 93d559cf7e961659b2b3d21c96debfbfa3a3de59..0545edfd85d8ced49d47ff9dd11f5fbb936b1efe 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -290,10 +290,12 @@ AM_GNU_GETTEXT
 if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then
   AC_DEFINE(HAVE_INCLUDED_GETTEXT, 1, Define if we use the local libintl)
   INCLUDES="${INCLUDES} -I\$(top_builddir)/intl"
+  INCLUDED_LIBINTL="${LIBINTL}"
 else
   VLC_ADD_LDFLAGS([vlc],[${LIBINTL}])
+  INCLUDED_LIBINTL=
 fi
-AM_CONDITIONAL(BUILD_INTL, test "${nls_cv_force_use_gnu_gettext}" = "yes")
+AC_SUBST(INCLUDED_LIBINTL)
 XGETTEXT="${XGETTEXT} --keyword=_NS --keyword=_ANS"
 
 dnl

diff --git a/src/Makefile.am b/src/Makefile.am
index 8ff6db006028699ecc777a0ec182b7da70ead268..3ec8bf96d4f48ffb6c0ecccfe2e63231c4a03127 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,8 +5,6 @@
 NULL =
 SUBDIRS =
 
-LIBINTL = @LIBINTL@
-
 EXTRA_DIST = extras/COPYING misc/modules_builtin.h.in
 
 BUILT_SOURCES = $(DISTCLEANFILES) $(CLEANFILES)
@@ -135,13 +133,11 @@ libvlc_a_SOURCES = $(SOURCES_libvlc)
 libvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
 libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc`
 libvlc_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc`
-libvlc_a_LIBADD = $(LIBINTL)
 
 libvlc_pic_a_SOURCES = $(SOURCES_libvlc)
 libvlc_pic_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc pic`
 libvlc_pic_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc pic`
 libvlc_pic_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc pic`
-libvlc_pic_a_LIBADD = $(LIBINTL)
 
 if HAVE_BEOS
 OPT_SOURCES_libvlc_beos = $(SOURCES_libvlc_beos)
@@ -173,7 +169,7 @@ endif
 endif
 
 libvlc$(LIBEXT): $(OBJECTS_libvlc_so)
-       @ldfl="`$(VLC_CONFIG) --libs plugin vlc $(pic)`" ; \
+       @ldfl="`$(VLC_CONFIG) --libs plugin vlc $(pic)` $(INCLUDED_LIBINTL)" ; \
        case `$(VLC_CONFIG) --linkage vlc` in \
          c++)  ld="$(CXXLINK)" ;; \
          objc) ld="$(OBJCLINK)" ;; \