Navigation

Changeset b5b707f0bae7a95f134a3555518525568abfb310

Timestamp:

02/19/06 16:21:58 (3 years ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1140362518 +0000

git-parent:

[1b3784c1c13f30af9bf696ed40c4d2a9006bd314]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1140362518 +0000

Message:

Really fix libintl linking

Files:

r0701057	rb5b707f
217	217
218	218	vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin` $(vlc_WORKAROUNDLDFLAGS)
219		vlc_LDADD = $(LIB_libvlc) $(DATA_win32_rc) $(~~LIB_intl~~)
	219	vlc_LDADD = $(LIB_libvlc) $(DATA_win32_rc) $(INCLUDED_LIBINTL)
220	220	vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
221	221

r31a3a65	rb5b707f
291	291	AC_DEFINE(HAVE_INCLUDED_GETTEXT, 1, Define if we use the local libintl)
292	292	INCLUDES="${INCLUDES} -I\$(top_builddir)/intl"
	293	INCLUDED_LIBINTL="${LIBINTL}"
293	294	else
294	295	VLC_ADD_LDFLAGS([vlc],[${LIBINTL}])
295		fi
296		AM_CONDITIONAL(BUILD_INTL, test "${nls_cv_force_use_gnu_gettext}" = "yes")
	296	INCLUDED_LIBINTL=
	297	fi
	298	AC_SUBST(INCLUDED_LIBINTL)
297	299	XGETTEXT="${XGETTEXT} --keyword=_NS --keyword=_ANS"
298	300

r30ff455	rb5b707f
5	5	NULL =
6	6	SUBDIRS =
7
8		~~LIBINTL = @LIBINTL@~~
9	7
10	8	EXTRA_DIST = extras/COPYING misc/modules_builtin.h.in
…	…
136	134	libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc`
137	135	libvlc_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc`
138		~~libvlc_a_LIBADD = $(LIBINTL)~~
139	136
140	137	libvlc_pic_a_SOURCES = $(SOURCES_libvlc)
…	…
142	139	libvlc_pic_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc pic`
143	140	libvlc_pic_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc pic`
144		~~libvlc_pic_a_LIBADD = $(LIBINTL)~~
145	141
146	142	if HAVE_BEOS
…	…
174	170
175	171	libvlc$(LIBEXT): $(OBJECTS_libvlc_so)
176		@ldfl="`$(VLC_CONFIG) --libs plugin vlc $(pic)`" ; \
	172	@ldfl="`$(VLC_CONFIG) --libs plugin vlc $(pic)` $(INCLUDED_LIBINTL)" ; \
177	173	case `$(VLC_CONFIG) --linkage vlc` in \
178	174	c++) ld="$(CXXLINK)" ;; \