Specify dependencies. Needed at least with --disable-shared.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 6ccc449ff919b75fbe7a536894e2e748255d88a9..b380d2f143174f56856e4150045df7749428c29c 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,32 @@
+2009-09-15  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (msg*_DEPENDENCIES, xgettext_DEPENDENCIES,
+       recode_sr_latin_DEPENDENCIES): New variables.
+
+2009-09-15  Bruno Haible  <bruno@clisp.org>
+
+       * msgl-fsearch.h: Include stdbool.h.
+       (message_fuzzy_index_search): Add 'heuristic' argument.
+       * msgl-fsearch.c (message_fuzzy_index_search): Likewise. If !heuristic,
+       consider all messages.
+       * msgmerge.c (struct definitions_ty): Add fields 'curr_findex',
+       'curr_findex_init_lock'.
+       (definitions_init): Initialize them.
+       (definitions_set_current_list): Clear the previous curr_findex.
+       (definitions_init_curr_findex): New function.
+       (definitions_search_fuzzy): Do fuzzy matching by calling
+       message_fuzzy_index_search on a hashed index, rather than through
+       message_list_search_fuzzy.
+       (definitions_destroy): Update.
+       (merge): Determine the definitions' canonical encoding.
+       * msgcmp.c: Include xmalloca.h, po-charset.h, msgl-fsearch.h.
+       (match_domain): Add defmlp_findex, def_canon_charset arguments. Do
+       fuzzy matching by calling message_fuzzy_index_search on a hashed
+       index, rather than through message_list_search_fuzzy.
+       (compare): Determine the definitions' canonical encoding. Prepare room
+       for a lazily allocated hashed index.
+       * Makefile.am (msgcmp_SOURCES): Add msgl-fsearch.c.
+
 2009-09-15  Bruno Haible  <bruno@clisp.org>
 
        * msgcmp.c (use_fuzzy_matching): New variable.

diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
index 0789660aac9abea6d2970a5a6dbe3186f3b0f176..20894b46415ebe9cc9242d021c9ebf94d0cfa7a3 100644 (file)
--- a/gettext-tools/src/Makefile.am
+++ b/gettext-tools/src/Makefile.am
@@ -254,6 +254,24 @@ msginit_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
 msguniq_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
 recode_sr_latin_LDADD = ../gnulib-lib/libgettextlib.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
 
+# Specify when to relink the programs.
+msgcmp_DEPENDENCIES = libgettextsrc.la ../gnulib-lib/libgettextlib.la
+msgfmt_DEPENDENCIES = libgettextsrc.la ../gnulib-lib/libgettextlib.la
+msgmerge_DEPENDENCIES = libgettextsrc.la ../gnulib-lib/libgettextlib.la
+msgunfmt_DEPENDENCIES = libgettextsrc.la ../gnulib-lib/libgettextlib.la
+xgettext_DEPENDENCIES = libgettextsrc.la ../gnulib-lib/libgettextlib.la
+msgattrib_DEPENDENCIES = libgettextsrc.la ../gnulib-lib/libgettextlib.la
+msgcat_DEPENDENCIES = libgettextsrc.la ../gnulib-lib/libgettextlib.la
+msgcomm_DEPENDENCIES = libgettextsrc.la ../gnulib-lib/libgettextlib.la
+msgconv_DEPENDENCIES = libgettextsrc.la ../gnulib-lib/libgettextlib.la
+msgen_DEPENDENCIES = libgettextsrc.la ../gnulib-lib/libgettextlib.la
+msgexec_DEPENDENCIES = libgettextsrc.la ../gnulib-lib/libgettextlib.la
+msgfilter_DEPENDENCIES = libgettextsrc.la ../gnulib-lib/libgettextlib.la
+msggrep_DEPENDENCIES = $(LIBGREP) libgettextsrc.la ../gnulib-lib/libgettextlib.la
+msginit_DEPENDENCIES = libgettextsrc.la ../gnulib-lib/libgettextlib.la
+msguniq_DEPENDENCIES = libgettextsrc.la ../gnulib-lib/libgettextlib.la
+recode_sr_latin_DEPENDENCIES = ../gnulib-lib/libgettextlib.la
+
 # Specify installation directory, for --enable-relocatable.
 msgcmp_CPPFLAGS = $(AM_CPPFLAGS) -DINSTALLDIR=\"$(bindir)\"
 msgfmt_CPPFLAGS = $(AM_CPPFLAGS) -DINSTALLDIR=\"$(bindir)\"