Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | |
| 2 | This patch updates the required version number from 2.61 to the |
| 3 | current 2.65 version of aclocal, this will need to be updated |
| 4 | when we update aclocal |
| 5 | |
| 6 | Upstream-Status: Inappropriate [configuration] |
| 7 | |
| 8 | Signed-off-by Saul Wold <sgw@linux.intel.com> |
| 9 | |
| 10 | Index: gettext-0.16.1/autoconf-lib-link/m4/lib-link.m4 |
| 11 | =================================================================== |
| 12 | --- gettext-0.16.1.orig/autoconf-lib-link/m4/lib-link.m4 2011-03-17 02:24:36.391519775 -0700 |
| 13 | +++ gettext-0.16.1/autoconf-lib-link/m4/lib-link.m4 2011-03-17 02:24:45.569526073 -0700 |
| 14 | @@ -148,7 +148,7 @@ |
| 15 | define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], |
| 16 | [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) |
| 17 | dnl Autoconf >= 2.61 supports dots in --with options. |
| 18 | - define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])]) |
| 19 | + define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.65]),[-1],[translit([$1],[.],[_])],[$1])]) |
| 20 | dnl By default, look in $includedir and $libdir. |
| 21 | use_additional=yes |
| 22 | AC_LIB_WITH_FINAL_PREFIX([ |
| 23 | Index: gettext-0.16.1/autoconf-lib-link/tests/rpathly/aclocal.m4 |
| 24 | =================================================================== |
| 25 | --- gettext-0.16.1.orig/autoconf-lib-link/tests/rpathly/aclocal.m4 2011-03-17 02:24:36.391519775 -0700 |
| 26 | +++ gettext-0.16.1/autoconf-lib-link/tests/rpathly/aclocal.m4 2011-03-17 02:24:45.570526904 -0700 |
| 27 | @@ -11,8 +11,8 @@ |
| 28 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
| 29 | # PARTICULAR PURPOSE. |
| 30 | |
| 31 | -m4_if(m4_PACKAGE_VERSION, [2.61],, |
| 32 | -[m4_fatal([this file was generated for autoconf 2.61. |
| 33 | +m4_if(m4_PACKAGE_VERSION, [2.65],, |
| 34 | +[m4_fatal([this file was generated for autoconf 2.65. |
| 35 | You have another version of autoconf. If you want to use that, |
| 36 | you should regenerate the build system entirely.], [63])]) |
| 37 | |
| 38 | Index: gettext-0.16.1/autoconf-lib-link/tests/rpathx/aclocal.m4 |
| 39 | =================================================================== |
| 40 | --- gettext-0.16.1.orig/autoconf-lib-link/tests/rpathx/aclocal.m4 2011-03-17 02:24:36.391519775 -0700 |
| 41 | +++ gettext-0.16.1/autoconf-lib-link/tests/rpathx/aclocal.m4 2011-03-17 02:24:45.572525773 -0700 |
| 42 | @@ -11,8 +11,8 @@ |
| 43 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
| 44 | # PARTICULAR PURPOSE. |
| 45 | |
| 46 | -m4_if(m4_PACKAGE_VERSION, [2.61],, |
| 47 | -[m4_fatal([this file was generated for autoconf 2.61. |
| 48 | +m4_if(m4_PACKAGE_VERSION, [2.65],, |
| 49 | +[m4_fatal([this file was generated for autoconf 2.65. |
| 50 | You have another version of autoconf. If you want to use that, |
| 51 | you should regenerate the build system entirely.], [63])]) |
| 52 | |
| 53 | Index: gettext-0.16.1/autoconf-lib-link/tests/rpathy/aclocal.m4 |
| 54 | =================================================================== |
| 55 | --- gettext-0.16.1.orig/autoconf-lib-link/tests/rpathy/aclocal.m4 2011-03-17 02:24:36.391519775 -0700 |
| 56 | +++ gettext-0.16.1/autoconf-lib-link/tests/rpathy/aclocal.m4 2011-03-17 02:24:45.578394916 -0700 |
| 57 | @@ -11,7 +11,7 @@ |
| 58 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
| 59 | # PARTICULAR PURPOSE. |
| 60 | |
| 61 | -m4_if(m4_PACKAGE_VERSION, [2.61],, |
| 62 | +m4_if(m4_PACKAGE_VERSION, [2.65],, |
| 63 | [m4_fatal([this file was generated for autoconf 2.61. |
| 64 | You have another version of autoconf. If you want to use that, |
| 65 | you should regenerate the build system entirely.], [63])]) |
| 66 | Index: gettext-0.16.1/autoconf-lib-link/tests/rpathz/aclocal.m4 |
| 67 | =================================================================== |
| 68 | --- gettext-0.16.1.orig/autoconf-lib-link/tests/rpathz/aclocal.m4 2011-03-17 02:24:36.391519775 -0700 |
| 69 | +++ gettext-0.16.1/autoconf-lib-link/tests/rpathz/aclocal.m4 2011-03-17 02:24:45.586395416 -0700 |
| 70 | @@ -11,8 +11,8 @@ |
| 71 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
| 72 | # PARTICULAR PURPOSE. |
| 73 | |
| 74 | -m4_if(m4_PACKAGE_VERSION, [2.61],, |
| 75 | -[m4_fatal([this file was generated for autoconf 2.61. |
| 76 | +m4_if(m4_PACKAGE_VERSION, [2.65],, |
| 77 | +[m4_fatal([this file was generated for autoconf 2.65. |
| 78 | You have another version of autoconf. If you want to use that, |
| 79 | you should regenerate the build system entirely.], [63])]) |
| 80 | |
| 81 | Index: gettext-0.16.1/gettext-tools/aclocal.m4 |
| 82 | =================================================================== |
| 83 | --- gettext-0.16.1.orig/gettext-tools/aclocal.m4 2006-11-27 09:34:32.000000000 -0800 |
| 84 | +++ gettext-0.16.1/gettext-tools/aclocal.m4 2011-03-17 02:27:01.135682807 -0700 |
| 85 | @@ -11,8 +11,8 @@ |
| 86 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
| 87 | # PARTICULAR PURPOSE. |
| 88 | |
| 89 | -m4_if(m4_PACKAGE_VERSION, [2.61],, |
| 90 | -[m4_fatal([this file was generated for autoconf 2.61. |
| 91 | +m4_if(m4_PACKAGE_VERSION, [2.65],, |
| 92 | +[m4_fatal([this file was generated for autoconf 2.65. |
| 93 | You have another version of autoconf. If you want to use that, |
| 94 | you should regenerate the build system entirely.], [63])]) |
| 95 | |
| 96 | Index: gettext-0.16.1/gettext-tools/examples/aclocal.m4 |
| 97 | =================================================================== |
| 98 | --- gettext-0.16.1.orig/gettext-tools/examples/aclocal.m4 2006-11-27 09:16:23.000000000 -0800 |
| 99 | +++ gettext-0.16.1/gettext-tools/examples/aclocal.m4 2011-03-17 02:26:52.589396683 -0700 |
| 100 | @@ -11,8 +11,8 @@ |
| 101 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
| 102 | # PARTICULAR PURPOSE. |
| 103 | |
| 104 | -m4_if(m4_PACKAGE_VERSION, [2.61],, |
| 105 | -[m4_fatal([this file was generated for autoconf 2.61. |
| 106 | +m4_if(m4_PACKAGE_VERSION, [2.65],, |
| 107 | +[m4_fatal([this file was generated for autoconf 2.65. |
| 108 | You have another version of autoconf. If you want to use that, |
| 109 | you should regenerate the build system entirely.], [63])]) |
| 110 | |