Create a libgettextlib shared library.

diff --git a/ChangeLog b/ChangeLog
index 548e9961c8affc547b09a677482235ea7ee00930..bca26f76d21753102e8ad081b2248c7f99c6fd8e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-21  Bruno Haible  <haible@clisp.cons.org>
+
+       * configure.in: Define LTLIBOBJS and LTALLOCA based on LIBOBJS, ALLOCA.
+
 2001-10-19  Bruno Haible  <haible@clisp.cons.org>
 
        * configure.in: Remove check for texi2html.

diff --git a/configure.in b/configure.in
index c3499e30be15a04bfa6e3a380af1d65b70ab504d..833b35aa696d1c061f19c557d3de362ed5c7dc2b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -120,6 +120,17 @@ $RELEASE_DATE  GNU  <bug-gnu-gettext@gnu.org>
 
 EOF
 
+dnl These can be removed when we drop support for autoconf-2.13 and switch
+dnl to autoconf-2.52.
+changequote(,)dnl
+LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'`
+changequote([, ])dnl
+AC_SUBST(LTLIBOBJS)
+changequote(,)dnl
+LTALLOCA=`echo "$ALLOCA" | sed 's/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'`
+changequote([, ])dnl
+AC_SUBST(LTALLOCA)
+
 AC_OUTPUT([Makefile \
            lib/Makefile lib/javacomp.sh lib/javaexec.sh \
            intl/Makefile intl-java/Makefile \

diff --git a/lib/ChangeLog b/lib/ChangeLog
index cfa07325e8e39545bedfb46b6038c4d43f68df6b..910d0c8477af2915452feb8e6d5e92be14b65d55 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,13 @@
+2001-10-21  Bruno Haible  <haible@clisp.cons.org>
+
+       Create a libgettextlib shared library.
+       * Makefile.am (noinst_LIBRARIES): Remove variable.
+       (lib_LTLIBRARIES): New variable.
+       (libgettextlib_la_SOURCES): Renamed from libnlsut_a_SOURCES.
+       (libgettextlib_la_HEADER): Renamed from libnlsut_a_HEADER.
+       (libgettextlib_la_LIBADD): Renamed from libnlsut_a_LIBADD.
+       (libgettextlib_la_LDFLAGS): New variable.
+
 2001-10-21  Bruno Haible  <haible@clisp.cons.org>
 
        * mkdtemp.c: Include <inttypes.h> if it exists. Needed on platforms

diff --git a/lib/Makefile.am b/lib/Makefile.am
index ed213bd048c7c78af799a1829ced974cb375f8bb..e37664da00d25a08e82bc1375ca46000462ae6dc 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -19,21 +19,22 @@
 
 AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
 
-noinst_LIBRARIES = libnlsut.a
+lib_LTLIBRARIES = libgettextlib.la
 
 # Sources that are compiled on all platforms.
 
-libnlsut_a_SOURCES = addext.c argmatch.c backupfile.c basename.c c-ctype.c \
-concatpath.c copy-file.c execute.c findprog.c fstrcmp.c full-write.c gcd.c \
-getopt.c getopt1.c hash.c javacomp.c javaexec.c linebreak.c localcharset.c \
-mbswidth.c obstack.c pipe-bidi.c pipe-in.c pipe-out.c progname.c safe-read.c \
-sh-quote.c tmpdir.c wait-process.c xerror.c xgetcwd.c xmalloc.c xstrdup.c
+libgettextlib_la_SOURCES = addext.c argmatch.c backupfile.c basename.c \
+c-ctype.c concatpath.c copy-file.c execute.c findprog.c fstrcmp.c \
+full-write.c gcd.c getopt.c getopt1.c hash.c javacomp.c javaexec.c \
+linebreak.c localcharset.c mbswidth.c obstack.c pipe-bidi.c pipe-in.c \
+pipe-out.c progname.c safe-read.c sh-quote.c tmpdir.c wait-process.c xerror.c \
+xgetcwd.c xmalloc.c xstrdup.c
 
-libnlsut_a_HEADER = argmatch.h backupfile.h basename.h c-ctype.h copy-file.h \
-execute.h findprog.h fstrcmp.h full-write.h gcd.h getopt.h hash.h javacomp.h \
-javaexec.h lbrkprop.h linebreak.h mbswidth.h obstack.h pathmax.h pipe.h \
-progname.h safe-read.h sh-quote.h system.h tmpdir.h utf8-ucs4.h utf16-ucs4.h \
-wait-process.h xerror.h xmalloc.h
+libgettextlib_la_HEADER = argmatch.h backupfile.h basename.h c-ctype.h \
+copy-file.h execute.h findprog.h fstrcmp.h full-write.h gcd.h getopt.h hash.h \
+javacomp.h javaexec.h lbrkprop.h linebreak.h mbswidth.h obstack.h pathmax.h \
+pipe.h progname.h safe-read.h sh-quote.h system.h tmpdir.h utf8-ucs4.h \
+utf16-ucs4.h wait-process.h xerror.h xmalloc.h
 
 # Sources that are compiled only on platforms that lack the functions.
 
@@ -49,11 +50,19 @@ UNUSED_SOURCE = memmove.c
 
 UNUSED_HEADER =
 
-libnlsut_a_LIBADD = @ALLOCA@ @LIBOBJS@
+# How to build libgettextlib.la.
+
+libgettextlib_la_LIBADD = @LTALLOCA@ @LTLIBOBJS@
+
+# Need @INTLLIBS@ because many source files use gettext().
+# Need @LIBICONV@ because linebreak.c uses iconv().
+libgettextlib_la_LDFLAGS = \
+  -release @VERSION@ \
+  @INTLLIBS@ @LIBICONV@ -no-undefined
 
 # List of files to be distributed.
 
-noinst_HEADERS = $(libnlsut_a_HEADER) $(LIBADD_HEADER) $(UNUSED_HEADER)
+noinst_HEADERS = $(libgettextlib_la_HEADER) $(LIBADD_HEADER) $(UNUSED_HEADER)
 
 EXTRA_DIST = classpath.c config.charset ref-add.sin ref-del.sin \
 $(LIBADD_SOURCE) $(UNUSED_SOURCE) \

diff --git a/src/ChangeLog b/src/ChangeLog
index b1b39b07c640488e4576404817aafeb5673ed3a4..128327262fe62f2b4e332862152ef6a51a4f484b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-21  Bruno Haible  <haible@clisp.cons.org>
+
+       * Makefile.am (LDADD): Replace libnlsut.a with libgettextlib.la.
+       (*_LDADD): Likewise.
+
 2001-10-26  Bruno Haible  <haible@clisp.cons.org>
 
        * x-c.h (EXTENSIONS_C): Add ".hxx".

diff --git a/src/Makefile.am b/src/Makefile.am
index ce0cf5b5545bf087e32ec9b75cc8c5b4c558cc5f..5905c915e2600a0eac8caee75a68e0465b863d9e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -41,7 +41,7 @@ INCLUDES = -I. -I$(srcdir) -I.. -I$(top_srcdir)/lib -I../intl \
 -I$(top_srcdir)/intl
 DEFS = -DLOCALEDIR=\"$(localedir)\" -DGETTEXTJAR=\"$(jardir)/gettext.jar\" \
 -DLIBDIR=\"$(libdir)\" -DPROJECTSDIR=\"$(projectsdir)\" @DEFS@
-LDADD = ../lib/libnlsut.a @INTLLIBS@
+LDADD = ../lib/libgettextlib.la @INTLLIBS@
 
 SED = sed
 YACC = @YACC@ -d
@@ -88,21 +88,21 @@ urlget_SOURCES    = urlget.c
 # Link dependencies.
 # po-lex.c and po.c may need -liconv.
 # write-po.c pulls in linebreak.c which may need -liconv.
-msgcmp_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@
-msgfmt_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@
-msgmerge_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@
-msgunfmt_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@
-xgettext_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@
-msgattrib_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@
-msgcat_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@
-msgcomm_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@
-msgconv_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@
-msgen_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@
-msgexec_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@
-msggrep_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@
+msgcmp_LDADD = ../lib/libgettextlib.la @INTLLIBS@ @LIBICONV@
+msgfmt_LDADD = ../lib/libgettextlib.la @INTLLIBS@ @LIBICONV@
+msgmerge_LDADD = ../lib/libgettextlib.la @INTLLIBS@ @LIBICONV@
+msgunfmt_LDADD = ../lib/libgettextlib.la @INTLLIBS@ @LIBICONV@
+xgettext_LDADD = ../lib/libgettextlib.la @INTLLIBS@ @LIBICONV@
+msgattrib_LDADD = ../lib/libgettextlib.la @INTLLIBS@ @LIBICONV@
+msgcat_LDADD = ../lib/libgettextlib.la @INTLLIBS@ @LIBICONV@
+msgcomm_LDADD = ../lib/libgettextlib.la @INTLLIBS@ @LIBICONV@
+msgconv_LDADD = ../lib/libgettextlib.la @INTLLIBS@ @LIBICONV@
+msgen_LDADD = ../lib/libgettextlib.la @INTLLIBS@ @LIBICONV@
+msgexec_LDADD = ../lib/libgettextlib.la @INTLLIBS@ @LIBICONV@
+msggrep_LDADD = ../lib/libgettextlib.la @INTLLIBS@ @LIBICONV@
 msginit_LDADD = ../intl/localealias.$(OBJEXT) ../intl/localename.$(OBJEXT) \
-                ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@
-msguniq_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@
+                ../lib/libgettextlib.la @INTLLIBS@ @LIBICONV@
+msguniq_LDADD = ../lib/libgettextlib.la @INTLLIBS@ @LIBICONV@
 
 
 # Special rules for bison and flex generated files.

diff --git a/src/format-c.c b/src/format-c.c
index dd67c3b34bde5e54ed68d36c4587c56ad21791b5..733335afc46211d7735b52f121513aef328a4c15 100644 (file)
--- a/src/format-c.c
+++ b/src/format-c.c
@@ -713,7 +713,7 @@ main ()
 /*
  * For Emacs M-x compile
  * Local Variables:
- * compile-command: "gcc -O -g -Wall -I.. -I../lib -I../intl -DHAVE_CONFIG_H -DTEST format-c.c ../lib/libnlsut.a"
+ * compile-command: "/bin/sh ../libtool --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../lib -I../intl -DHAVE_CONFIG_H -DTEST format-c.c ../lib/libgettextlib.la"
  * End:
  */
 

diff --git a/src/format-java.c b/src/format-java.c
index 1000d2597dcb0a2df6cf823d5f85a78791dc41eb..6dd99843a5017f6aa733f0eb5d51dab17606593e 100644 (file)
--- a/src/format-java.c
+++ b/src/format-java.c
@@ -773,7 +773,7 @@ main ()
 /*
  * For Emacs M-x compile
  * Local Variables:
- * compile-command: "gcc -O -g -Wall -I.. -I../lib -I../intl -DHAVE_CONFIG_H -DTEST format-java.c ../lib/libnlsut.a"
+ * compile-command: "/bin/sh ../libtool --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../lib -I../intl -DHAVE_CONFIG_H -DTEST format-java.c ../lib/libgettextlib.la"
  * End:
  */
 

diff --git a/src/format-lisp.c b/src/format-lisp.c
index 267fb5e5d96a0e65d1b5a2376f2faa94a13a4eaa..cc082947d53828f9b908968c1629960c7bbc6c4c 100644 (file)
--- a/src/format-lisp.c
+++ b/src/format-lisp.c
@@ -3534,7 +3534,7 @@ main ()
 /*
  * For Emacs M-x compile
  * Local Variables:
- * compile-command: "gcc -O -g -Wall -I.. -I../lib -I../intl -DHAVE_CONFIG_H -DTEST format-lisp.c ../lib/libnlsut.a"
+ * compile-command: "/bin/sh ../libtool --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../lib -I../intl -DHAVE_CONFIG_H -DTEST format-lisp.c ../lib/libgettextlib.la"
  * End:
  */
 

diff --git a/src/format-pascal.c b/src/format-pascal.c
index b7ece5768ae00f854f3985e5f44116f8ebd1c23c..38243d136de49f2dff217d35f4e7008c78362fcd 100644 (file)
--- a/src/format-pascal.c
+++ b/src/format-pascal.c
@@ -523,7 +523,7 @@ main ()
 /*
  * For Emacs M-x compile
  * Local Variables:
- * compile-command: "gcc -O -g -Wall -I.. -I../lib -I../intl -DHAVE_CONFIG_H -DTEST format-pascal.c ../lib/libnlsut.a"
+ * compile-command: "/bin/sh ../libtool --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../lib -I../intl -DHAVE_CONFIG_H -DTEST format-pascal.c ../lib/libgettextlib.la"
  * End:
  */
 

diff --git a/src/format-python.c b/src/format-python.c
index a19a751b0fc19be63bd8f258da6bc6a1c40db6dc..09bcb7eb26f6051a2b70e0b7006e259c16c7321e 100644 (file)
--- a/src/format-python.c
+++ b/src/format-python.c
@@ -604,7 +604,7 @@ main ()
 /*
  * For Emacs M-x compile
  * Local Variables:
- * compile-command: "gcc -O -g -Wall -I.. -I../lib -I../intl -DHAVE_CONFIG_H -DTEST format-python.c ../lib/libnlsut.a"
+ * compile-command: "/bin/sh ../libtool --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../lib -I../intl -DHAVE_CONFIG_H -DTEST format-python.c ../lib/libgettextlib.la"
  * End:
  */
 

diff --git a/src/format-ycp.c b/src/format-ycp.c
index 80066ffa3cea498feadc3ad0154f9afc814453a3..2d79c186e6f9db00ec92fae7a77454aa9fc9195f 100644 (file)
--- a/src/format-ycp.c
+++ b/src/format-ycp.c
@@ -214,7 +214,7 @@ main ()
 /*
  * For Emacs M-x compile
  * Local Variables:
- * compile-command: "gcc -O -g -Wall -I.. -I../lib -I../intl -DHAVE_CONFIG_H -DTEST format-ycp.c ../lib/libnlsut.a"
+ * compile-command: "/bin/sh ../libtool --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../lib -I../intl -DHAVE_CONFIG_H -DTEST format-ycp.c ../lib/libgettextlib.la"
  * End:
  */
 

diff --git a/tests/ChangeLog b/tests/ChangeLog
index f1a00318d268b26758483dbb2e307a1e13d6b1f7..f25b3c150e7d9fa91a32746cf918dc97f484c2e2 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-21  Bruno Haible  <haible@clisp.cons.org>
+
+       * Makefile.am (tstgettext_LDADD, tstngettext_LDADD): Replace
+       libnlsut.a with libgettextlib.la.
+
 2001-09-25  Bruno Haible  <haible@clisp.cons.org>
 
        Upgrade to automake-1.5.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f2b9bf8dea9ab2c63f2fd00685e77e961b5dd689..e28db07bd3386fde68a13ea1b9dc997a80ea0493 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -73,7 +73,7 @@ LDADD_yes = ../intl/libintl.la
 LDADD_no = ../intl/libgnuintl.la @INTLLIBS@
 noinst_PROGRAMS = tstgettext tstngettext cake
 tstgettext_SOURCES = tstgettext.c setlocale.c
-tstgettext_LDADD = ../lib/libnlsut.a $(LDADD)
+tstgettext_LDADD = ../lib/libgettextlib.la $(LDADD)
 tstngettext_SOURCES = tstngettext.c setlocale.c
-tstngettext_LDADD = ../lib/libnlsut.a $(LDADD)
+tstngettext_LDADD = ../lib/libgettextlib.la $(LDADD)
 cake_SOURCES = plural-1-prg.c setlocale.c