Update includes after gnulib change.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index c7e1aef1e723f806f98bbf52af20c1fe315068b7..97607c26a01529c202f812dba3d433e037fe818c 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-14  Bruno Haible  <bruno@clisp.org>
+
+       * msgmerge.c: Include "glthread/lock.h" instead of "lock.h".
+
 2008-08-03  Bruno Haible  <bruno@clisp.org>
 
        * x-python.c (mixed_string_buffer_append): Replace a lone high

diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c
index 2ed6afccd2a21bde7efaae1f0f96ca7271aaf2b5..62736e9d7155b03f31a22baa938ecb08ddf74dc6 100644 (file)
--- a/gettext-tools/src/msgmerge.c
+++ b/gettext-tools/src/msgmerge.c
@@ -54,7 +54,7 @@
 #include "msgl-iconv.h"
 #include "msgl-equal.h"
 #include "msgl-fsearch.h"
-#include "lock.h"
+#include "glthread/lock.h"
 #include "lang-table.h"
 #include "plural-exp.h"
 #include "plural-count.h"