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

diff --git a/intl/ChangeLog b/intl/ChangeLog
index 222d36e98df03c6ac0f43f4d1481486ae0bfd688..5561e64ac9ff69ba3e3726afbae2e208a5ada33e 100644 (file)
--- 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 7b1498def13a7a6b0c7f62a3d25fbf857a4c1fb5..c14737fb9ef3ad8e8de0314528b8f624447439be 100644 (file)
--- 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