build: Fix version of gettext macros

Commit c9cd419caba9effa11ca53e8696e5f6a4b424d60 added copying of the
makefile for translation files from gnulib. The makefile from gnulib is
of version 0.18 but the build configuration cretes macros from version
0.17 which breaks the build with message:

*** error: gettext infrastructure mismatch: using a Makefile.in.in from
gettext version 0.18 but the autoconf macros are from gettext version
0.17

diff --git a/bootstrap.conf b/bootstrap.conf
index c6620e5c0b6b8268f284125c8518d76024049104..56911e02cfd809d0baea708a81de9a9a485bb69d 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -195,7 +195,7 @@ buildreq="\
 autoconf   2.59
 automake   1.9.6
 autopoint  -
-gettext    0.17
+gettext    0.18
 git        1.5.5
 gzip       -
 libtool    -

diff --git a/configure.ac b/configure.ac
index 53c9b34ee6f1cbe4c72eede2aa71ad3a0f680b8e..a814495da618c774c48f55557d084c0e5c05677b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2274,7 +2274,7 @@ dnl compute the difference between save_CPPFLAGS and CPPFLAGS and append it
 dnl to INCLUDES in order to preserve changes made by gettext but in a place
 dnl that does not break the build
 save_CPPFLAGS="$CPPFLAGS"
-AM_GNU_GETTEXT_VERSION([0.17])
+AM_GNU_GETTEXT_VERSION([0.18])
 AM_GNU_GETTEXT([external])
 GETTEXT_CPPFLAGS=
 if test "x$save_CPPFLAGS" != "x$CPPFLAGS"; then