Add patch for gettext/autopoint weirdness.
This commit is contained in:
parent
c1c39d6cd8
commit
fbc68e6aca
|
@ -0,0 +1,4 @@
|
|||
$NetBSD$
|
||||
|
||||
SHA1 (patch-configure.ac) = e71544a02c6c3fa09fe79f78eb39ebd31e0d8a3c
|
||||
SHA1 (patch-pan-general-e-util.cc) = c252f074b139b100f3f879261b1ba894b5f3350c
|
|
@ -0,0 +1,27 @@
|
|||
$NetBSD$
|
||||
|
||||
Add AM_GNU_GETTEXT_REQUIRE_VERSION so that autopoint 0.20 will set
|
||||
the version number to 0.20 (its own) instead of 0.19. Otherwise,
|
||||
the generated po/Makefile.in.in will have "GETTEXT_MACRO_VERSION = 0.19"
|
||||
but @GETTEXT_MACRO_VERSION@ = 0.20 and it will refuse to work:
|
||||
|
||||
*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version 0.19 but the autoconf macros are from gettext version 0.20
|
||||
|
||||
Just adding AM_GNU_GETTEXT_REQUIRE_VERSION isn't enough, then some tools
|
||||
seem to think that gettext isn't used at all.
|
||||
|
||||
Weird.
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index f53d238..3d3a0cf 100644
|
||||
--- configure.ac
|
||||
+++ configure.ac
|
||||
@@ -94,7 +94,8 @@ AC_CHECK_HEADERS([errno.h fcntl.h])
|
||||
dnl I18n support
|
||||
GETTEXT_PACKAGE=pan
|
||||
AC_SUBST(GETTEXT_PACKAGE)
|
||||
AM_GNU_GETTEXT_VERSION([0.19.7])
|
||||
+AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.7])
|
||||
AM_GNU_GETTEXT([external])
|
||||
AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext Package])
|
||||
panlocaledir=[${datadir}/locale]
|
Loading…
Reference in New Issue