From d685d0220fdb16097252bcf851ada5cf8400da0e Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 14 Apr 2008 21:01:30 -0500 Subject: Fix gettext on non-Linux platforms Linux includes all the gettext stuff in glibc, so there is no need for the libintl links which we failed to include in our linker variables. Update the makefiles which should enable NLS support on all platforms, including OS X and Cygwin. Signed-off-by: Dan McGee --- lib/libalpm/Makefile.am | 1 + src/pacman/Makefile.am | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index 6549066f..00fc0b38 100644 --- a/lib/libalpm/Makefile.am +++ b/lib/libalpm/Makefile.am @@ -40,5 +40,6 @@ libalpm_la_SOURCES = \ util.h util.c libalpm_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION_INFO) +libalpm_la_LIBADD = $(LTLIBINTL) # vim:set ts=2 sw=2 noet: diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am index 0395432e..5e287404 100644 --- a/src/pacman/Makefile.am +++ b/src/pacman/Makefile.am @@ -33,10 +33,9 @@ pacman_SOURCES = \ callback.h callback.c \ util.h util.c -pacman_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la +LDADD = $(LTLIBINTL) $(top_builddir)/lib/libalpm/.libs/libalpm.la pacman_static_SOURCES = $(pacman_SOURCES) pacman_static_LDFLAGS = $(LDFLAGS) -all-static -pacman_static_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la # vim:set ts=2 sw=2 noet: -- cgit v1.2.3-70-g09d2