From: Bruno Haible <bruno@clisp.org>
Date: Sun, 11 Mar 2001 15:58:02 +0000 (+0000)
Subject: Link libintl correctly: the soname and the parameters passed to libtool.
X-Git-Tag: v0.10.36~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b02ecb52eddcaea9a52b42c2218091658c10a392;p=thirdparty%2Fgettext.git

Link libintl correctly: the soname and the parameters passed to libtool.
---

diff --git a/intl/ChangeLog b/intl/ChangeLog
index 222d36e98..5561e64ac 100644
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,5 +1,12 @@
 2001-03-10  Bruno Haible  <haible@clisp.cons.org>
 
+	* Makefile.in (libintl.la): Pass -liconv and flag -no-undefined.
+	Needed on platforms like BeOS.
+
+	* Makefile.in (all-no-yes): Depend on libgnuintl.$la, not libintl.$la.
+	(libgnuintl.a, libgnuintl.la): New targets. Needed for linking
+	../tests/tstgettext on systems which have gettext() in libintl.so.
+
 	* localcharset.c (locale_charset): Allow wildcard syntax. Resolve
 	alias also if codeset is empty.
 	* config.charset (BeOS): Use wildcard syntax.
diff --git a/intl/Makefile.in b/intl/Makefile.in
index 7b1498def..c14737fb9 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -105,19 +105,21 @@ INCLUDES = -I.. -I. -I$(top_srcdir)/intl
 all: all-@USE_INCLUDED_LIBINTL@
 all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed
 all-no: all-no-@BUILD_INCLUDED_LIBINTL@
-all-no-yes: libintl.$la
+all-no-yes: libgnuintl.$la
 all-no-no:
 
-libintl.a: $(OBJECTS)
+libintl.a libgnuintl.a: $(OBJECTS)
 	rm -f $@
 	$(AR) cru $@ $(OBJECTS)
 	$(RANLIB) $@
 
-libintl.la: $(OBJECTS)
+libintl.la libgnuintl.la: $(OBJECTS)
 	$(LIBTOOL) --mode=link \
-	  $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) \
+	  $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
+	  $(OBJECTS) @LIBICONV@ \
 	  -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
-	  -rpath $(libdir)
+	  -rpath $(libdir) \
+	  -no-undefined
 
 libintl.h: libgnuintl.h
 	cp $(srcdir)/libgnuintl.h libintl.h