Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | |
| 2 | This patch hardcodes in version 0.17 for the GETTEXT_MACRO_VERSION, |
| 3 | the version check is only part of 0.17 and will not affect any 0.16.1 |
| 4 | operations |
| 5 | |
| 6 | Upstream-Status: Inappropriate [licensing] |
| 7 | |
| 8 | Signed-off-by: Saul Wold <sgw@linux.intel.com> |
| 9 | |
| 10 | Index: gettext-0.16.1/gettext-runtime/m4/po.m4 |
| 11 | =================================================================== |
| 12 | --- gettext-0.16.1.orig/gettext-runtime/m4/po.m4 2011-03-17 02:24:28.953520231 -0700 |
| 13 | +++ gettext-0.16.1/gettext-runtime/m4/po.m4 2011-03-17 02:28:25.455396862 -0700 |
| 14 | @@ -27,6 +27,9 @@ |
| 15 | AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake |
| 16 | AC_REQUIRE([AM_NLS])dnl |
| 17 | |
| 18 | + dnl Hardcode the MACRO_VERSION to 0.17 for gnutls |
| 19 | + AC_SUBST([GETTEXT_MACRO_VERSION], [0.17]) |
| 20 | + |
| 21 | dnl Perform the following tests also if --disable-nls has been given, |
| 22 | dnl because they are needed for "make dist" to work. |
| 23 | |
| 24 | Index: gettext-0.16.1/gettext-runtime/po/Makefile.in.in |
| 25 | =================================================================== |
| 26 | --- gettext-0.16.1.orig/gettext-runtime/po/Makefile.in.in 2011-03-17 02:24:28.953520231 -0700 |
| 27 | +++ gettext-0.16.1/gettext-runtime/po/Makefile.in.in 2011-03-17 02:28:07.574395144 -0700 |
| 28 | @@ -10,6 +10,9 @@ |
| 29 | # |
| 30 | # Origin: gettext-0.16 |
| 31 | |
| 32 | +# Hardcode this value for gnutls building against gplv2 code |
| 33 | +GETTEXT_MACRO_VERSION = 0.17 |
| 34 | + |
| 35 | PACKAGE = @PACKAGE@ |
| 36 | VERSION = @VERSION@ |
| 37 | PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ |
| 38 | Index: gettext-0.16.1/gettext-tools/po/Makefile.in.in |
| 39 | =================================================================== |
| 40 | --- gettext-0.16.1.orig/gettext-tools/po/Makefile.in.in 2011-03-17 02:24:28.953520231 -0700 |
| 41 | +++ gettext-0.16.1/gettext-tools/po/Makefile.in.in 2011-03-17 02:28:07.574395144 -0700 |
| 42 | @@ -10,6 +10,9 @@ |
| 43 | # |
| 44 | # Origin: gettext-0.16 |
| 45 | |
| 46 | +# Hardcode this value for gnutls building against gplv2 code |
| 47 | +GETTEXT_MACRO_VERSION = 0.17 |
| 48 | + |
| 49 | PACKAGE = @PACKAGE@ |
| 50 | VERSION = @VERSION@ |
| 51 | PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ |