Link with libunistring, if it exists.

12 files changed, 60 insertions, 16 deletions

diff --git a/Admin/plans b/Admin/plans
index 3a42ce6..bc7cafe 100644
--- a/Admin/plans
+++ b/Admin/plans
@@ -147,7 +147,7 @@ Things we plan to do. Comments welcome.
 - In x-c.c, support C++0x escape sequences, see
   http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2442.htm
 
-- Use libunistring as optional and then as hard dependency.
+- Use libunistring as hard dependency.
 
 - Extractor for Glade 3.
 
diff --git a/ChangeLog b/ChangeLog
index 6e267cb..fd28a6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-19  Bruno Haible  <bruno@clisp.org>
+
+	Link with libunistring, if it exists.
+	* autogen.sh (GNULIB_MODULES_TOOLS_FOR_SRC,
+	GNULIB_MODULES_LIBGETTEXTPO): Add libunistring-optional.
+	* DEPENDENCIES: Mention optional dependency to GNU libunistring.
+
 2010-05-22  Bruno Haible  <bruno@clisp.org>
 
 	* README.woe32: Explain how to build 64-bit mode binaries.
diff --git a/DEPENDENCIES b/DEPENDENCIES
index f69141e..8360d0d 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -105,6 +105,19 @@ The following packages should be installed before GNU gettext is installed
   + If it is installed in a nonstandard directory, pass the option
     --with-libcroco-0.6-prefix=DIR to 'configure'.
 
+* GNU libunistring
+  + Optional.
+    Needed for the line breaking in PO files and for xgettext.
+    If not present, a subset of libunistring (included in this package) will
+    be compiled into libgettextlib.
+  + Homepage:
+    http://www.gnu.org/software/libunistring/
+  + Download:
+    http://ftp.gnu.org/gnu/libunistring/
+    ftp://ftp.gnu.org/gnu/libunistring/
+  + If it is installed in a nonstandard directory, pass the option
+    --with-libunistring-prefix=DIR to 'configure'.
+
 
 The following packages should be installed when GNU gettext is installed
 (runtime dependencies, but not build dependencies):
diff --git a/NEWS b/NEWS
index 72ccb97..2e2648d 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,10 @@ Version 0.18.1 - June 2010
 
 * msggrep: A '$' anchor in a regular expression now also matches the end of
   the string, even if it does not end in a newline.
+
+* Dependencies:
+  The libraries and programs are now linked with libunistring if this library
+  is already installed.
 
 Version 0.18 - May 2010
 
diff --git a/autogen.sh b/autogen.sh
index 86fab0f..ace5e5b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -158,6 +158,7 @@ if ! $skip_gnulib; then
       iconv
       javacomp
       javaexec
+      libunistring-optional
       localcharset
       locale
       localename
@@ -281,6 +282,7 @@ if ! $skip_gnulib; then
       gettext-h
       hash
       iconv
+      libunistring-optional
       minmax
       open
       ostream
diff --git a/gettext-tools/gnulib-lib/.gitignore b/gettext-tools/gnulib-lib/.gitignore
index a739195..2d7c643 100644
--- a/gettext-tools/gnulib-lib/.gitignore
+++ b/gettext-tools/gnulib-lib/.gitignore
@@ -146,6 +146,7 @@
 /javaversion.class
 /javaversion.h
 /javaversion.java
+/libunistring.valgrind
 /localcharset.c
 /localcharset.h
 /locale.in.h
@@ -292,15 +293,15 @@
 /tputs.c
 /trim.c
 /trim.h
-/uniconv.h
-/unilbrk.h
-/uniname.h
+/uniconv.in.h
+/unilbrk.in.h
+/uniname.in.h
 /unistd--.h
 /unistd-safer.h
 /unistd.in.h
-/unistr.h
-/unitypes.h
-/uniwidth.h
+/unistr.in.h
+/unitypes.in.h
+/uniwidth.in.h
 /unlocked-io.h
 /unsetenv.c
 /vasnprintf.c
diff --git a/gettext-tools/libgettextpo/.gitignore b/gettext-tools/libgettextpo/.gitignore
index 9ccd54b..a67b77f 100644
--- a/gettext-tools/libgettextpo/.gitignore
+++ b/gettext-tools/libgettextpo/.gitignore
@@ -59,6 +59,7 @@
 /iconv_open.c
 /iconveh.h
 /intprops.h
+/libunistring.valgrind
 /localcharset.c
 /localcharset.h
 /malloc.c
@@ -114,12 +115,12 @@
 /strstr.c
 /sys_stat.in.h
 /time.in.h
-/uniconv.h
-/unilbrk.h
+/uniconv.in.h
+/unilbrk.in.h
 /unistd.in.h
-/unistr.h
-/unitypes.h
-/uniwidth.h
+/unistr.in.h
+/unitypes.in.h
+/uniwidth.in.h
 /unlocked-io.h
 /vasnprintf.c
 /vasnprintf.h
diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 20f4e2f..18575d3 100644
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-19  Bruno Haible  <bruno@clisp.org>
+
+	Link with libunistring, if it exists.
+	* Makefile.am (LDADD, libgettextsrc_la_LDFLAGS): Add LTLIBUNISTRING.
+
 2010-05-18  Bruno Haible  <bruno@clisp.org>
 
 	Correct program dependencies.
diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
index 81c806d..31d3c57 100644
--- a/gettext-tools/src/Makefile.am
+++ b/gettext-tools/src/Makefile.am
@@ -79,7 +79,7 @@ DEFS = \
 # Ensure that <stdint.h> defines SIZE_MAX in C++ mode, like it does in C mode.
 AM_CXXFLAGS = -D__STDC_LIMIT_MACROS
 
-LDADD = ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
+LDADD = ../gnulib-lib/libgettextlib.la $(LTLIBUNISTRING) @LTLIBINTL@ $(WOE32_LDADD)
 OTHERPROGDEPENDENCIES = ../gnulib-lib/libgettextlib.la $(WOE32_LDADD)
 
 SED = sed
@@ -211,12 +211,15 @@ urlget_SOURCES = urlget.c
 
 # How to build libgettextsrc.la.
 # Need ../gnulib-lib/libgettextlib.la.
+# Need $(LTLIBUNISTRING) because ulc_width_linebreaks, uc_width, etc. may be
+# taken from libunistring, when the configure option --with-libunistring-prefix
+# was given.
 # Need @LTLIBINTL@ because many source files use gettext().
 # Need @LTLIBICONV@ because po-charset.c, po-lex.c, msgl-iconv.c, write-po.c
 # use iconv().
 libgettextsrc_la_LDFLAGS = \
   -release @VERSION@ \
-  ../gnulib-lib/libgettextlib.la @LTLIBINTL@ @LTLIBICONV@ -lc @LTNOUNDEF@
+  ../gnulib-lib/libgettextlib.la $(LTLIBUNISTRING) @LTLIBINTL@ @LTLIBICONV@ -lc @LTNOUNDEF@
 
 # Tell the mingw or Cygwin linker which symbols to export.
 if WOE32DLL
diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am
index 4855a99..0042a3b 100644
--- a/gettext-tools/tests/Makefile.am
+++ b/gettext-tools/tests/Makefile.am
@@ -144,7 +144,7 @@ XGETTEXT = ../src/xgettext
 # For debugging memory leaks and memory allocation bugs.
 # You should build with --disable-shared when using valgrind.
 CHECKER =
-#CHECKER = valgrind --tool=memcheck --suppressions=$(srcdir)/../gnulib-lib/malloca.valgrind --num-callers=20 --leak-check=yes --leak-resolution=high --show-reachable=yes
+#CHECKER = valgrind --tool=memcheck --suppressions=$(srcdir)/../gnulib-lib/malloca.valgrind --suppressions=$(srcdir)/../gnulib-lib/libunistring.valgrind --num-callers=20 --leak-check=yes --leak-resolution=high --show-reachable=yes
 #CHECKER = valgrind --tool=massif --format=html --depth=10 --alloc-fn=xmalloc --alloc-fn=xrealloc --stacks=no
 
 TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) \
diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index 7c77f1f..d999cc6 100644
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-19  Bruno Haible  <bruno@clisp.org>
+
+	Link with libunistring, if it exists.
+	* modules/gettext-tools-misc (lib_LDFLAGS): Add LTLIBUNISTRING.
+
 2010-05-24  Bruno Haible  <bruno@clisp.org>
 
 	Use the newest regex module from gnulib.
diff --git a/gnulib-local/modules/gettext-tools-misc b/gnulib-local/modules/gettext-tools-misc
index d94420e..b281049 100644
--- a/gnulib-local/modules/gettext-tools-misc
+++ b/gnulib-local/modules/gettext-tools-misc
@@ -13,13 +13,16 @@ Makefile.am:
 # Specify that libgettextlib should installed in $(libdir).
 lib_LTLIBRARIES = libgettextlib.la
 
+# Need $(LTLIBUNISTRING) because ulc_width_linebreaks, uc_width, etc. may be
+# taken from libunistring, when the configure option --with-libunistring-prefix
+# was given.
 # Need @LTLIBINTL@ because many source files use gettext().
 # Need @LTLIBICONV@ because linebreak.c and striconv.c use iconv().
 # Need @LIB_ACL@ because copy-file.c uses acl.h.
 # Need @LTLIBC@ for -no-undefined to work on many platforms.
 lib_LDFLAGS += \
   -release @VERSION@ \
-  @LTLIBINTL@ @LTLIBICONV@ @LIB_ACL@ @LTLIBC@ @LTNOUNDEF@
+  $(LTLIBUNISTRING) @LTLIBINTL@ @LTLIBICONV@ @LIB_ACL@ @LTLIBC@ @LTNOUNDEF@
 
 # Tell the mingw or Cygwin linker which symbols to export.
 if WOE32DLL