[toolchain] binutils: Fix autoreconf for packages/devel/binutils package, which uses...
[openwrt/svn-archive/archive.git] / toolchain / binutils / patches / 2.20.1 / 400-autoreconf-compat.patch
1 --- a/config/override.m4
2 +++ b/config/override.m4
3 @@ -32,31 +32,6 @@ dnl Redefine AC_CONFIG_SUBDIRS so acloca
4 dnl when needed.
5
6 ifdef([m4_PACKAGE_VERSION],
7 -[dnl AC_DEFUN a commonly used macro so this file is picked up.
8 -m4_copy([AC_PREREQ], [_AC_PREREQ])
9 -AC_DEFUN([AC_PREREQ], [frob])
10 -m4_copy_force([_AC_PREREQ], [AC_PREREQ])
11 -
12 -
13 -dnl Ensure exactly this Autoconf version is used
14 -m4_ifndef([_GCC_AUTOCONF_VERSION],
15 - [m4_define([_GCC_AUTOCONF_VERSION], [2.64])])
16 -
17 -dnl Test for the exact version when AC_INIT is expanded.
18 -dnl This allows to update the tree in steps (for testing)
19 -dnl by putting
20 -dnl m4_define([_GCC_AUTOCONF_VERSION], [X.Y])
21 -dnl in configure.ac before AC_INIT,
22 -dnl without rewriting this file.
23 -dnl Or for updating the whole tree at once with the definition above.
24 -AC_DEFUN([_GCC_AUTOCONF_VERSION_CHECK],
25 -[m4_if(m4_defn([_GCC_AUTOCONF_VERSION]),
26 - m4_defn([m4_PACKAGE_VERSION]), [],
27 - [m4_fatal([Please use exactly Autoconf ]_GCC_AUTOCONF_VERSION[ instead of ]m4_defn([m4_PACKAGE_VERSION])[.])])
28 -])
29 -m4_define([AC_INIT], m4_defn([AC_INIT])[
30 -_GCC_AUTOCONF_VERSION_CHECK
31 -])
32
33
34 dnl Turn AC_DISABLE_OPTION_CHECKING into a no-op if not defined.
35 --- a/gas/aclocal.m4
36 +++ b/gas/aclocal.m4
37 @@ -998,7 +998,6 @@ m4_include([../config/nls.m4])
38 m4_include([../config/override.m4])
39 m4_include([../config/po.m4])
40 m4_include([../config/progtest.m4])
41 -m4_include([../libtool.m4])
42 m4_include([../ltoptions.m4])
43 m4_include([../ltsugar.m4])
44 m4_include([../ltversion.m4])
45 --- a/bfd/aclocal.m4
46 +++ b/bfd/aclocal.m4
47 @@ -978,7 +978,6 @@ m4_include([../config/plugins.m4])
48 m4_include([../config/po.m4])
49 m4_include([../config/progtest.m4])
50 m4_include([../config/stdint.m4])
51 -m4_include([../libtool.m4])
52 m4_include([../ltoptions.m4])
53 m4_include([../ltsugar.m4])
54 m4_include([../ltversion.m4])
55 --- a/binutils/aclocal.m4
56 +++ b/binutils/aclocal.m4
57 @@ -1003,7 +1003,6 @@ m4_include([../config/override.m4])
58 m4_include([../config/plugins.m4])
59 m4_include([../config/po.m4])
60 m4_include([../config/progtest.m4])
61 -m4_include([../libtool.m4])
62 m4_include([../ltoptions.m4])
63 m4_include([../ltsugar.m4])
64 m4_include([../ltversion.m4])
65 --- a/ld/aclocal.m4
66 +++ b/ld/aclocal.m4
67 @@ -999,7 +999,6 @@ m4_include([../config/nls.m4])
68 m4_include([../config/override.m4])
69 m4_include([../config/po.m4])
70 m4_include([../config/progtest.m4])
71 -m4_include([../libtool.m4])
72 m4_include([../ltoptions.m4])
73 m4_include([../ltsugar.m4])
74 m4_include([../ltversion.m4])
75 --- a/opcodes/aclocal.m4
76 +++ b/opcodes/aclocal.m4
77 @@ -978,7 +978,6 @@ m4_include([../config/nls.m4])
78 m4_include([../config/override.m4])
79 m4_include([../config/po.m4])
80 m4_include([../config/progtest.m4])
81 -m4_include([../libtool.m4])
82 m4_include([../ltoptions.m4])
83 m4_include([../ltsugar.m4])
84 m4_include([../ltversion.m4])