Move the libgettextpo library to the libgettextpo directory.

Remove its dependencies to libgettextsrc and libgettextlib.
Hide its exported symbols.

diff --git a/ChangeLog b/ChangeLog
index d40915be93434fcababd7f4c78a1dc446911e96c..24045e4da1b72ac61c300ee305e68978037dcc5e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-16  Bruno Haible  <bruno@clisp.org>
+
+       * autogen.sh (GNULIB_MODULES_FOR_LIBGETTEXTPO): New variable.
+       Invoke gnulib-tool also for libgettextpo.
+
 2006-10-16  Bruno Haible  <bruno@clisp.org>
 
        * autogen.sh (GNULIB_MODULES_FOR_SRC): Add xstriconv.

diff --git a/NEWS b/NEWS
index ca1a60cf8f797b7d9c03ce239e591f2c8fdba0d6..7973824ec0616713546305be461007bff182e4c5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -42,6 +42,9 @@ Version 0.15.1 - October 2006
     the requirements relating to the GNU gettext implementation outside the
     AM_GNU_GETTEXT invocation.
 
+* The libgettextpo library no longer exports symbols that could clash with
+  symbols of the application that uses it.
+
 * Vastly improved French translations. Thanks to Christophe Combelles.
 \f
 Version 0.15 - July 2006

diff --git a/autogen.sh b/autogen.sh
index e5038538a6f1d224985f16f0207694971a90e0ef..ea40fcc339a4685b2e5f8f204a912e6ae7f9b88d 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -166,6 +166,42 @@ if test -n "$GNULIB_TOOL"; then
   '
   $GNULIB_TOOL --dir=gettext-tools --lib=libgettextlib --source-base=gnulib-lib --m4-base=gnulib-m4 --libtool --local-dir=gnulib-local \
     --import $GNULIB_MODULES_FOR_SRC $GNULIB_MODULES_OTHER
+  # In gettext-tools/libgettextpo:
+  # This is a subset of the GNULIB_MODULES_FOR_SRC.
+  GNULIB_MODULES_FOR_LIBGETTEXTPO='
+  basename
+  c-ctype
+  c-strcase
+  c-strstr
+  error
+  error-progname
+  exit
+  fstrcmp
+  fwriteerror
+  gcd
+  getline
+  gettext-h
+  hash
+  iconv
+  linebreak
+  minmax
+  pathname
+  progname
+  stdbool
+  ucs4-utf8
+  utf8-ucs4
+  utf16-ucs4
+  vasprintf
+  xalloc
+  xallocsa
+  xerror
+  xstriconv
+  xvasprintf
+  '
+  GNULIB_MODULES_OTHER=''
+  $GNULIB_TOOL --dir=gettext-tools --source-base=libgettextpo --m4-base=libgettextpo/gnulib-m4 --macro-prefix=gtpo --makefile-name=Makefile.gnulib --libtool --local-dir=gnulib-local \
+    --import $GNULIB_MODULES_FOR_LIBGETTEXTPO $GNULIB_MODULES_OTHER
+  rm -rf gettext-tools/libgettextpo/gnulib-m4
 fi
 
 (cd autoconf-lib-link

diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index e3a5f101e37f9d66db0c9104e9fe1f475599609e..d7e3bfd53cd4345f58eafa422ffe6acbb56b679f 100644 (file)
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-16  Bruno Haible  <bruno@clisp.org>
+
+       * libgettextpo: New directory.
+       * Makefile.am (SUBDIRS): Add libgettextpo.
+       * configure.ac (gt_GLOBAL_SYMBOL_PIPE): New macro.
+       (AC_CONFIG_FILES): Add libgettextpo/Makefile, libgettextpo/exported.sh.
+
 2006-10-15  Bruno Haible  <bruno@clisp.org>
 
        * woe32dll/gettextsrc-exports.c: Remove input_syntax.

diff --git a/gettext-tools/Makefile.am b/gettext-tools/Makefile.am
index c6a049dbe5d492529c11fe7026da5588db68f811..7a731e23dd51f093c358c927c3b150ff62b04239 100644 (file)
--- a/gettext-tools/Makefile.am
+++ b/gettext-tools/Makefile.am
@@ -20,7 +20,7 @@
 AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
 ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../m4 -I gnulib-m4
 
-SUBDIRS = doc intl gnulib-lib libgrep libuniname src po projects misc man m4 tests examples
+SUBDIRS = doc intl gnulib-lib libgrep libuniname src libgettextpo po projects misc man m4 tests examples
 
 EXTRA_DIST = misc/DISCLAIM
 MOSTLYCLEANFILES = core *.stackdump

diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 9868c122bef1448f41ecafd8a7170a4844e2bc51..1a4114ce2208f6d9dc5897e99649b12e18a3d56f 100644 (file)
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -245,6 +245,22 @@ case "$host_os" in
     ;;
 esac
 
+dnl Check for nm output filter that yields the exported symbols.
+AC_DEFUN([gt_GLOBAL_SYMBOL_PIPE], [
+  AC_REQUIRE([AC_PROG_NM]) dnl provided by libtool.m4
+  AC_SUBST([NM])
+  AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE]) dnl provided by libtool.m4
+  GLOBAL_SYMBOL_PIPE=$lt_cv_sys_global_symbol_pipe
+  AC_SUBST([GLOBAL_SYMBOL_PIPE])
+  if test -n "$GLOBAL_SYMBOL_PIPE"; then
+    HAVE_GLOBAL_SYMBOL_PIPE=1
+  else
+    HAVE_GLOBAL_SYMBOL_PIPE=
+  fi
+  AC_SUBST([HAVE_GLOBAL_SYMBOL_PIPE])
+])
+gt_GLOBAL_SYMBOL_PIPE
+
 dnl Check for Emacs and where to install .elc files.
 AM_PATH_LISPDIR
 dnl Sometimes Emacs is badly installed. Allow the user to work around it.
@@ -334,6 +350,10 @@ AC_CONFIG_FILES([src/Makefile],
                 [FIX_MAKEFILE_COMPILE])
 AC_CONFIG_FILES([src/user-email:src/user-email.sh.in])
 
+AC_CONFIG_FILES([libgettextpo/Makefile],
+                [FIX_MAKEFILE_COMPILE])
+AC_CONFIG_FILES([libgettextpo/exported.sh])
+
 AC_CONFIG_FILES([po/Makefile.in])
 
 AC_CONFIG_FILES([projects/Makefile])

diff --git a/gettext-tools/po/ChangeLog b/gettext-tools/po/ChangeLog
index d025202ae3fc8ca79e6000e36488666e6ce291f8..f5486f38395f44248d4058cfcffc38ef6835ab8d 100644 (file)
--- a/gettext-tools/po/ChangeLog
+++ b/gettext-tools/po/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-16  Bruno Haible  <bruno@clisp.org>
+
+       * POTFILES.in: Add libgettextpo/gettext-po.c, remove src/gettext-po.c.
+
 2006-10-15  Bruno Haible  <bruno@clisp.org>
 
        * POTFILES.in: Add src/read-catalog.c, remove src/read-po.c.

diff --git a/gettext-tools/po/POTFILES.in b/gettext-tools/po/POTFILES.in
index 0939ad02f59f2f4e03a34aff0e2f6a0ed4f49cc5..fb7ccc6ffca9117db7488a988a69b071ef857eca 100644 (file)
--- a/gettext-tools/po/POTFILES.in
+++ b/gettext-tools/po/POTFILES.in
@@ -2,7 +2,7 @@
 # Copyright (C) 1995, 1998, 2001-2006 Free Software Foundation, Inc.
 
 # For updating this file, look at the result of:
-#   $ LC_ALL=C grep -l '[^A-Za-z_]_(' {gnulib-lib,src}/*.[chly]
+#   $ LC_ALL=C grep -l '[^A-Za-z_]_(' {gnulib-lib,src,libgettextpo}/*.[chly]
 
 # Files from the portability library
 gnulib-lib/argmatch.c
@@ -48,7 +48,6 @@ src/format-scheme.c
 src/format-sh.c
 src/format-tcl.c
 src/format-ycp.c
-src/gettext-po.c
 src/hostname.c
 src/msgattrib.c
 src/msgcat.c
@@ -111,3 +110,4 @@ src/x-tcl.c
 src/x-ycp.c
 src/xgettext.c
 src/user-email.sh.in
+libgettextpo/gettext-po.c

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 6015c225804cc91084518e21cdb9b45b92f94d44..8459babeefc9cfb908046727635a58f35c91677d 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,15 @@
+2006-10-16  Bruno Haible  <bruno@clisp.org>
+
+       * gettext-po.h.in: Move to ../libgettextpo/.
+       * gettext-po.c: Move to ../libgettextpo/.
+       * Makefile.am (lib_LTLIBRARIES): Remove libgettextpo.la.
+       (nodist_include_HEADERS): Remove variable.
+       (libgettextpo_la_SOURCES, LTV_CURRENT, LTV_REVISION, LTV_AGE,
+       libgettextpo_la_LDFLAGS, libgettextpo_la_DEPENDENCIES,
+       libgettextpo_la_LDFLAGS): Remove variables.
+       (EXTRA_DIST, BUILT_SOURCES, CLEANFILES): Remove gettext-po.h support.
+       (gettext-po.h): Remove rule.
+
 2006-10-18  Bruno Haible  <bruno@clisp.org>
 
        * po-error.h (__attribute__, __format__, __printf__): New macros.

diff --git a/gettext-tools/src/FILES b/gettext-tools/src/FILES
index 1b3eac9f56bd844afe9c3382d535ad50cd3d977c..9340ade0bd220a6787bfd9ad56466d5fe2ae4ce9 100644 (file)
--- a/gettext-tools/src/FILES
+++ b/gettext-tools/src/FILES
@@ -324,11 +324,3 @@ msgl-check.c
 |               Main source for the 'xgettext' program.
 |
 +-------------- The 'xgettext' program
-
-+-------------- The 'gettextpo' library
-|
-| gettext-po.h
-| gettext-po.c
-|               Public API for reading PO files.
-|
-+-------------- The 'gettextpo' library

diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
index 14e8eef23eeaa6b03e3081c45b4e71283cd2c00e..13424571ed908832d765259f705141ddbfbe083b 100644 (file)
--- a/gettext-tools/src/Makefile.am
+++ b/gettext-tools/src/Makefile.am
@@ -32,9 +32,7 @@ recode-sr-latin
 
 noinst_PROGRAMS = hostname urlget
 
-lib_LTLIBRARIES = libgettextsrc.la libgettextpo.la
-
-nodist_include_HEADERS = gettext-po.h
+lib_LTLIBRARIES = libgettextsrc.la
 
 noinst_HEADERS = pos.h message.h po-error.h po-xerror.h po-gram.h po-charset.h \
 po-lex.h open-catalog.h read-catalog-abstract.h read-catalog.h \
@@ -130,14 +128,6 @@ msgl-ascii.c msgl-iconv.c msgl-equal.c msgl-cat.c msgl-english.c msgl-check.c \
 file-list.c msgl-charset.c po-time.c plural-exp.c plural-eval.c plural-table.c \
 $(FORMAT_SOURCE)
 
-# libgettextpo contains the public API for PO files.
-libgettextpo_la_SOURCES = gettext-po.c
-# Libtool's library version information for libgettextpo.
-# See the libtool documentation, section "Library interface versions".
-LTV_CURRENT=3
-LTV_REVISION=0
-LTV_AGE=3
-
 # msggrep needs pattern matching.
 LIBGREP = ../libgrep/libgrep.a
 
@@ -245,22 +235,6 @@ install-exec-clean:
          *) $(RM) $(DESTDIR)$(libdir)/libgettextsrc.a ;; \
        esac
 
-# How to build libgettextpo.la.
-# Need libgettextsrc.la.
-# Need ../gnulib-lib/libgettextlib.la because of xmalloc.
-libgettextpo_la_LDFLAGS = \
-  -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
-  -rpath $(libdir) \
-  libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ @LTLIBICONV@ -lc @LTNOUNDEF@
-# Build order. Only needed for "make -j[N]".
-libgettextpo_la_DEPENDENCIES = libgettextsrc.la
-
-# Tell the mingw or Cygwin linker which symbols to export.
-if WOE32DLL
-libgettextpo_la_SOURCES += ../woe32dll/gettextpo-exports.c
-libgettextpo_la_LDFLAGS += -Wl,--export-all-symbols
-endif
-
 # Compile-time flags for particular source files.
 msgmerge_CFLAGS = $(AM_CFLAGS) $(OPENMP_CFLAGS)
 
@@ -336,19 +310,6 @@ po-gram-gen2.h: po-gram-gen.h
        $(SED) -e 's/yy/po_gram_/g' -e 's/extern /extern DLL_VARIABLE /' $(srcdir)/po-gram-gen.h > $@-tmp
        mv $@-tmp $@
 
-# Special rules for installable include files that export variables.
-
-EXTRA_DIST += gettext-po.h.in
-BUILT_SOURCES += gettext-po.h
-CLEANFILES += gettext-po.h
-gettext-po.h: gettext-po.h.in
-if WOE32DLL
-       sed -e 's/extern \([^()]*\);/extern __declspec (dllimport) \1;/' $(srcdir)/gettext-po.h.in > gettext-po.h-tmp
-else
-       cp $(srcdir)/gettext-po.h.in gettext-po.h-tmp
-endif
-       mv gettext-po.h-tmp gettext-po.h
-
 
 # Special rules for installation of auxiliary programs.