Test distcheck with libtool when using libtool so I can test

diff --git a/Makefile.am b/Makefile.am
index 8984c961edd2f862a0cf05cafa6d13999d9b2a34..c82630c63da90558cf75e33d1abe9a262797a367 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,6 +40,9 @@ SUFFIXES =
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-dvd --disable-mad --disable-libmpeg2 \
        --disable-ffmpeg --disable-faad --disable-skins2
+if USE_LIBTOOL
+DISTCHECK_CONFIGURE_FLAGS += --enable-libtool
+endif
 
 # Tell aclocal to use -I m4. Wonder if it really works.
 ACLOCAL_AMFLAGS = -I m4
@@ -225,6 +228,8 @@ endif
 # old automake-1.5 bug (automake/279).
 DEPENDENCIES_vlc = src/$(LIB_libvlc) $(DATA_win32_rc)
 
+vlc_LDADD = $(DATA_win32_rc) $(LIBVLC)
+
 vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
 if USE_LIBTOOL
 vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc`
@@ -245,8 +250,8 @@ LIB_libvlc = libvlc.a
 LIBVLC = src/$(LIB_libvlc)
 DEPENDENCIES_vlc += stamp-builtin
 endif
+vlc_LDADD += $(INCLUDED_LIBINTL)
 endif
-vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) $(INCLUDED_LIBINTL)
 
 # Shortcut for developpers to rebuild the core (libvlc + vlc)
 # Don't use it if you don't know what it is about.

diff --git a/src/Makefile.am b/src/Makefile.am
index b1936d6cfa20b62db467c5b7e7cd61d4bded9091..d927e57f3a19fe3c1b5a91658705e4e39a000ef9 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -165,6 +165,7 @@ libvlc_pic_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc pic`
 libvlc_pic_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc pic`
 
 libvlc_la_SOURCES = $(SOURCES_libvlc)
+libvlc_la_LIBADD = $(INCLUDED_LTLIBINTL)
 libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
 libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc`
 libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc`