Backport fix from upstream for warnings with perl-5.16+ #424453 by Alexander Huemer.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0xD2E96200

5 files changed, 159 insertions, 19 deletions

diff --git a/sys-devel/automake/ChangeLog b/sys-devel/automake/ChangeLog
index 1cf647172c97..c97a5a7ce643 100644
--- a/sys-devel/automake/ChangeLog
+++ b/sys-devel/automake/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-devel/automake
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.215 2014/11/15 06:21:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.216 2014/11/15 06:30:36 vapier Exp $
+
+*automake-1.10.3-r1 (15 Nov 2014)
+*automake-1.11.6-r1 (15 Nov 2014)
+
+  15 Nov 2014; Mike Frysinger <vapier@gentoo.org> +automake-1.10.3-r1.ebuild,
+  +automake-1.11.6-r1.ebuild, +files/automake-1.10-perl-5.16.patch,
+  -automake-1.10.3.ebuild, -automake-1.11.6.ebuild:
+  Backport fix from upstream for warnings with perl-5.16+ #424453 by Alexander
+  Huemer.
 
 *automake-1.8.5-r5 (15 Nov 2014)
 *automake-1.5-r2 (15 Nov 2014)
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 10ed43b40ad3..74fe635e5b4c 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX automake-1.10-ccnoco-ldflags.patch 901 SHA256 98c85d873eac326a4b6c6afde25d887da85a45bae4bb4fad853a40e46fba7af5 SHA512 bc823b9387277c06944faef1abc4277c4f6e8024cf9cdfdfb2b9f333d578cedb6c5071fbf49ee420dbe696e8a8bda4583829e3eca225e9ba7f5d0ca0e2639ca3 WHIRLPOOL 362418007ee70757c2908d43600087ccfcc950a2a5d0cac638cd95417738ee5e848d1248466c607e062d96c2f00d65ddb8743a7ac3186d1445aae19798d6b949
+AUX automake-1.10-perl-5.16.patch 3555 SHA256 6482568f4934c545017edcd30c3e86545e004f3f88cafc97aec9e5a251911f4a SHA512 050d66f3f1b4aed6482a234b32bbdbe231ddea0c9f4fb2ff97e963095ad69a487fd65986189fd659fbe8d8d011f3f866e92e506e653fd832d2adaf3263ed33fc WHIRLPOOL 09f57b56a4490d42361e132e4f2f44291f52d5983bebb5b93173016b12591572350bb5d2afc6a4a9aef20b202db8367fce3a57e1b2a23ad14cac9233a55bd3cd
 AUX automake-1.10.1-tests.patch 3283 SHA256 107f073536a7104d5b25dc7ff80933c22f44f847789435f5678c01090890506b SHA512 4876eddcd2f45d472b8eadfa5684d5c662b06b057dd6a75b017d9e9f94a14056d299cc4e5e4c3d00bd493b0009433a4d83f6a2ff2867f22db9637e44e2af717a WHIRLPOOL 70881c93065b70be2e8d537052fcfb205fc31e748031597d5dc3362121896fd0e22f0a0673651e63e8d205debc273a7d041dbc3882296146966cd63e9bae9120
 AUX automake-1.10.2-bash4.patch 644 SHA256 c07951416ab13e34d5090892cbba5e4d0e6e351fef1ee540d11b0da88d6ea677 SHA512 7d89922410162b4248dd154d9c71b51ae211dd7bd4a99734a092758cbccb5504bceb59af476f399c515932e5bea838fa71e3dfd30df3ca5d3d640481d7a86ef1 WHIRLPOOL 68491fc0e19cf900644b3a1ea767208581dbaeddc220e2b612a58cdd62358be4155c5527bc8449a3fbbdba6357f41ca409067377c4b01b32239d3cd48bef185f
 AUX automake-1.13-dyn-ithreads.patch 2126 SHA256 5f97e051c780205696c6173bda36b1ba661beadf0b66ed564b7a7e6abd569747 SHA512 7a3795cb8b14b347a296abd410f3a740401e796a06317e52fa1ef8b0866099f71965f7fb12fd85db2ccc7445f310a4dbff6870d8a63e72c49ed6f8ca9da97277 WHIRLPOOL 4e63dacb6fd3fcdb974d38ca65fa943232461b0c543b3c092c1d53ff4ad51ccc6ce74dbf56061f262dd5e29ff078eae053b4967dfafca0578fc133760f207108
@@ -40,8 +41,8 @@ DIST automake-1.6.3.tar.bz2 476275 SHA256 0dbafacaf21e135cab35d357a14bdcd981d2f2
 DIST automake-1.7.9.tar.bz2 577705 SHA256 32c13b6ad38ed5e7bfd1756cbc19cf5efd67b7ade2d06000a4c99b0ce94bd46d SHA512 372f326cdf9c893a016473b959f0d3b92a7a82a13978e3950a887a79c93856a635549ebc63945faafba30b8be6db1c4cd68385f7dfe1cbb36386400acb2aa7a2 WHIRLPOOL 0536bec58cc4fa2ed739ba473443099f1f4a33b5cb61f9fb04c4901baa694643debd3028c8acd764b1609f439b67c02c6b4ed6e1e8b34a5f09d2280d896345a7
 DIST automake-1.8.5.tar.bz2 663182 SHA256 84c93aaa3c3651a9e7474b721b0e6788318592509e7de604bafe4ea8049dc410 SHA512 862f9fe8dd4f0fd51b97d80b767304b982d9c9307bf66933298187bf121f5c827f0b4880eab92f07d16e0c1d41ff5179923c7ae8d8aabd635db8574d4a3021b0 WHIRLPOOL 6328e298a4af1bbe2ca360f380064b6a1b43c9cf9c361c3dc4078297c3bf77c0bfe3690b1d9f2713ad2f28970f033880b40f4b077d5734c0e03bd35aa4bb18e3
 DIST automake-1.9.6.tar.bz2 765505 SHA256 8eccaa98e1863d10e4a5f861d8e2ec349a23e88cb12ad10f6b6f79022ad2bb8d SHA512 6aa8824876003bcac804e88d58f014a2449c7e1d824e46b5e971d3e2d070bc6ac0a3881e8eaae12e2f7f310c6b81dfb83ad4647d58785fc7e6759aa37478784e WHIRLPOOL 76d59f947a2dfad4ca70c888d58b15f86670f0df6156b9f1e9f2ed03ad92468ad880ab47b505b31577b35b376a799b6de0ebab46f17516440772a1d3eb6b7479
-EBUILD automake-1.10.3.ebuild 2185 SHA256 273c25039ac7552b9553cebbe5a7da99903282ebd02580818383ce7a4b907c7e SHA512 12cc0e12bafeab8b7f2bf05e4078df0b2127d98ca9e7fee044265499932af2da569a28c3223bcab33e111c28c0ac2e9b3e24885d514e252f754378922c10d962 WHIRLPOOL e4ba80bef57d89c99a636220481de1b0e5522d95b0def3727186fcd35b8a9c8e030ff5881a8b8a97736934010fcd4198b3c653d0b7bfeb1a7edbf84369a77eee
-EBUILD automake-1.11.6.ebuild 2454 SHA256 1cca19fd3e94067d29bdba90fb9069c03cf7c3ae4f573e344998007d4502631c SHA512 c953e6b63046585f5af311437c1a30e8683aac8d2e058d39bd1883703a2bb7617e1b20d76fa37bda9aa8b8f0c76795d92c8400f313a98d57983e3b5c5c56e7a3 WHIRLPOOL f81cdf2415defc8029a79fbc7107c55a5d846988d001dc9e7072837ca5f6d7c793bfb31f2fdafa0d5aebd6b2c61a09ce7cd01960c1bb44e2eaa9848c9df9446e
+EBUILD automake-1.10.3-r1.ebuild 2244 SHA256 18c61d3753ff272514ab8eb3f83f69359e7a70eed896546ce3ba95fb80473556 SHA512 8ec9aa2572ffc2b0d34c13ce8e10d63ceacb2a81f0cc56cd94a4048f6bcf277071be081fd2fe923cd2b55ff10c298762b830029f9549924321b84b4faa95d2c5 WHIRLPOOL b8fd0b08fb5ac45e01ca0ee441724f754ca23abc239e2ab15440e83e82aed3df3cafe661f625c746bb3d4ea1914ce94b9c3632c62ad0c15bff4c5cb6e6b49010
+EBUILD automake-1.11.6-r1.ebuild 2513 SHA256 d0b0900c6e4fc7de7eb857d4211f4c9d53f0fc1cc664e3b5038951eab466eb71 SHA512 11ee92b554c2c6b2878c234a6fd06cbf438f8eb33b0586dee81c4bdc81f8302636634f472e48c53e0fd8f7789c460759027186aca002cbb98b5ea0036fdd2d28 WHIRLPOOL ed8b1f199baca42590d5e81893caf5cd67b595bd2d568b920e453e894594be7cbbcade2800dfa3afb1c2ec5719d75e574ccf8dc33509549cc753067a62dd66c7
 EBUILD automake-1.12.6.ebuild 2409 SHA256 60dfd2b9e32917e4701fcdca48c3c3c55f78173733ead21b89c8e22576889c5a SHA512 93c4f6423a6cee06d433b9255e98cfcdac8a61761b4f0380db2b1f83df1f1d696bbf57dea750476fde97e065b234ca5d8118c463f31b7c617dfd5820d78c9b30 WHIRLPOOL 6a90b12d0997ecc99d7231fb591c746f63bedbea669c66b650769b4559191ecb15b17a28da5adbbd794fcd709efeccd07d1e882017ec8f157241cc5e2e3bec10
 EBUILD automake-1.13.4.ebuild 2490 SHA256 741ac41c84d9ec10189b9442d838c7862e35e8c0d6ece70bef942d33d3e3aa87 SHA512 52f4d65dbcbc7079acac9d23c5024e595301f4fa397afd74f356c430e42b3d59cba53c40855ca2ab9317ae50fd52670f435b5e147ba45f424ace5e35df62cd71 WHIRLPOOL 55ff2f7283cd600b52a7a747f7b95a9e7b0ad471c4fad43203cf60e2eb1a5956295d2ba8b363cd2e722e675301b4405e3a6e42ca1887cab111c987ca99b55887
 EBUILD automake-1.14.1.ebuild 2814 SHA256 24a11e32c79673a1bd08be6a26019f7dc91dc8597d5728f9612d5f4723c7d77f SHA512 3c7d8d8125cfc9627e8a648f51cf8cd2db7d8da65e76d24295a70760d170864c34542d1b8fe8d62b7970221a64cb7d8050cd9e3c8f2d9704d9b0cb7c1b10f6d9 WHIRLPOOL a4ce0d0a5425d367288af452a1c7247452789408e10f41906aa0447fbccd840d6e0c071f7bcbaea4ea908d3f1bb8d21ae39d79b7bd40158c9f003cabf9f7dff6
@@ -52,22 +53,22 @@ EBUILD automake-1.7.9-r3.ebuild 2328 SHA256 ebd7195e8eafef26cb530170f94cde2eab53
 EBUILD automake-1.8.5-r5.ebuild 2355 SHA256 aa4b891c02831da0cad9cf71934e505a0b94a3fd7203fe276cf3f044b701c128 SHA512 f9a61040a35ef23cc06e2a2633607e21fc187d8401a31cbd5b35ea327762730d879422aca27f17b7a31d69996917d8df69bd39dc10759451b36c839f21e6c631 WHIRLPOOL 3f05fabaa6865cba2aa3aa168d080cb3b763c4655f6c6c0d04cab2bbd3ebfddced9a95d8f0c6c9748ca779cd511102ea0e5644d6908095640950d833d72fbbe6
 EBUILD automake-1.9.6-r4.ebuild 2570 SHA256 27caa6b7d9bfc123e3cc1adea83b2d2b569e80adc6116054a4cf9510e70a43e1 SHA512 19dd8f56decc964729d6d110bd4d08b8fbb16d686559201b5a5ff6a2431c74fbe30df69a7851da768551cbdd42beb1a074d4f1179104fefbff672c73fe3d6e2b WHIRLPOOL 2f4561d15accb4c006238e70a7e7387f7bd5fd9896cd58de30de89cd5e5de9360e762de49c3ab1e66bd3c66c1d7c79a6c2cf67de4ccc079f3ed4baded6855ac9
 EBUILD automake-9999.ebuild 2319 SHA256 2d00ad3957f8bf90e9307933123554bb1597d5357412d75d971f8d961ebcc842 SHA512 aff32d1b74c61dd9a2166719791e68f24ebff27c425f57f56b95dfc9b9a66507fa27c118c1a17a2b92245e3f907322c9765c984d15978a0ac57d2cf39bd8b7aa WHIRLPOOL eeab6d04f10f5ca3bae12980f6367a7e96fe919ed49974425c8b1efe9689670e423849ca82c402766aee14420e80a4e63d92c1ff94104fb9b773b3799fcb1228
-MISC ChangeLog 35386 SHA256 4c69b65e0ffdf15c4e47fc120d9587eaf06a7a2eb33d0030839ee95e4b0f408e SHA512 52103963ea2634164672a2a4f7d500d2ee036c341fb0abce1bcda44ecddae5898fdc46abef02782d5e7a93228a3b40c500fa9fbd5fb1f7d354a4f9e8ca21dd66 WHIRLPOOL 412eca853199240e9bd61d1bd00e3f23e51ee90e669fe2566a4a059f9995d96d9b89b4121d83c51d80773c4ee6aec4dcfa6541622c6fe8dc168d303766bfbf74
+MISC ChangeLog 35743 SHA256 c39d18316cbf39dd269afa93f3db085bbf14efd151b3a82a7715c8928c509627 SHA512 34ae4fae3375547fd1f8f50b3ccf8ffa3e888459b06d05884c536c197197584e5b0604af804b1ed97abe2772733e0577f8889ec407bd370b6f61ee420150abee WHIRLPOOL 77d6fe2fc15b8066964fbe080d813f77552116da6b65de208e88271b8ca7f56f6d391df52cdc0ca714c1129cb0293273350041fe5465860a6ccf897cd7d497d6
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUZvEHAAoJEPGu1DbS6WIAc7UP/jwCyWC57VnLjxKsIR4Dmt8b
-cHGpbc3sFVf1XH7sKCLJ2WRqehGCSLCe66EANuRF7iL4egYB4y7hL5RMcauVW8hr
-79J9KbZv9JJSKJ0N4PGvY33sHkyUaNQ03ZsYFh4PXcF5cQH1y/3ZOvEXJ80kfH8I
-gn4XfmkzwIxCzU3zPiUo64pGqIPVrrUvDU7M1LvKfTZpvuigpputNDRsVwnxwlr+
-TPz0Odm2n/po97oWV+zBugEBQbcDrXPU1CWfApEEa8OopgcOi04vewu1r+YnjGKH
-ybYD0qYmQZhauDXe+uhm10F9Up+8LgdEf5DopiMEbAFukABeIbcEZGzpMt6W7R8o
-aE8loknoM7G6aM2kWDNcFtSYDNOxjIrjOYdN0xrUseUeCdxP+6WYX+iPb/1kWJJT
-EHupqEIMxD6trjUnWbscF5ts+DOE4n+nzr4WfzARBa10BD/w8NxvfSKt/r7H2ykB
-iV0Y8znvL+wrGvWNF6l9hPC+QH6UriuWv/5vWlZV/jRwB14p4EHgAsBvZEVuTv9p
-mtxK9DCJMryWDFKfSZ+8f5qPZPPb6mhFOfiBflztHl7BkZTPIShAn1cokiwHCCk/
-DTDh+0U7+Pay9m7WYn1iTo6miq7CdeocuN0OP5ircT5oXe8WMrg/+vkOVqxpsGAu
-0ruiZKFJVokUgMiM0rVu
-=yhgA
+iQIcBAEBCAAGBQJUZvMOAAoJEPGu1DbS6WIAvMkQAJCjWQnAs5bP3UulUyThpxw4
+B4C7EgPUW2wZpul0U168KsAq6aiA7UWZM5GwKQmFMglTZW2FTd0N24LgGOehUpZU
+LRTqlX8TRo58KoTrrac4Vr/2us0Z1uIrpS/59Pzh1XiOuLE/Vtdi32MJijbU+ToC
+oDDE8B6TltJsR9NJjHBt/4k2/xRIJ1jgtdcaJQM5+VrrNgnR9Zl1G8eTu28T6RQc
+aAe8n9fPUdWOpQd9NeUxGQ5rXvZjEDT67h8S2PBNilPKXLKzsOjXrgdgDW3IdcM1
+QNmufax0NrOTGQ+jA5TgU3d7paL6y60ZYBS4r+kUHmEOW+Kg7sSv+aiM5Gu33/a0
+WOJMQJtj8nioBXjRd9O/zVdgkErumoWTZTRNSwGkahZN2eg9wKaVrJD8CmDOm6Xd
+4w7I/unGJDusH3K+RSddZYj/mQjzhVRRMxoA7/EG6K0fX3FdF3UT1/pbPz26md+y
+vF9JQHBvaXOVs16FM3yTa9lxFsjI096kv3rSOrgOIufs6k2ZK9rzb+n6CKhnEwKw
+J/NQLNZZNG+8aq/ok8MdAdUNrjCX5eAoStzQ8WScfPHVEuBU32G6M1ComBVXaYUW
+0hHOqTdkBMrhos4YbT3fjUOdsfPmXg0UMatMNYpm0trGUMZL9RHLkaDVaFlh0k5T
+iV50Ik8JLMMpYUbWRv7h
+=GLic
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/automake/automake-1.10.3.ebuild b/sys-devel/automake/automake-1.10.3-r1.ebuild
index de8f875b77f3..0a0dcf7d389a 100644
--- a/sys-devel/automake/automake-1.10.3.ebuild
+++ b/sys-devel/automake/automake-1.10.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.10.3.ebuild,v 1.13 2014/11/15 06:07:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.10.3-r1.ebuild,v 1.1 2014/11/15 06:30:36 vapier Exp $
 
 EAPI="4"
 
@@ -25,6 +25,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	export WANT_AUTOCONF=2.5
+	epatch "${FILESDIR}"/${PN}-1.10-perl-5.16.patch #424453
 	chmod a+rx tests/*.test
 }
 
diff --git a/sys-devel/automake/automake-1.11.6.ebuild b/sys-devel/automake/automake-1.11.6-r1.ebuild
index 8c5c2b4f6ee1..dfe2deb93fc8 100644
--- a/sys-devel/automake/automake-1.11.6.ebuild
+++ b/sys-devel/automake/automake-1.11.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.11.6.ebuild,v 1.11 2014/11/15 06:07:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.11.6-r1.ebuild,v 1.1 2014/11/15 06:30:36 vapier Exp $
 
 EAPI="4"
 
@@ -25,6 +25,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	export WANT_AUTOCONF=2.5
+	epatch "${FILESDIR}"/${PN}-1.10-perl-5.16.patch #424453
 	chmod a+rx tests/*.test
 }
 
diff --git a/sys-devel/automake/files/automake-1.10-perl-5.16.patch b/sys-devel/automake/files/automake-1.10-perl-5.16.patch
new file mode 100644
index 000000000000..19fe249e0c00
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.10-perl-5.16.patch
@@ -0,0 +1,128 @@
+https://bugs.gentoo.org/424453
+
+From 6bf58a59a1f3803e57e3f0378aa9344686707b75 Mon Sep 17 00:00:00 2001
+From: Stefano Lattarini <stefano.lattarini@gmail.com>
+Date: Mon, 28 May 2012 13:32:03 +0200
+Subject: [PATCH] aclocal: declare function prototypes, do not use '&' in
+ function calls
+
+This change will also fix automake bug#11543 (from a report by Matt
+Burgess).
+
+* aclocal.in: Declare prototypes for almost all functions early, before
+any actual function definition (but omit the prototype for the dynamically
+generated '&search' function).  Add prototypes to any function definition.
+Remove '&' from function invocations (i.e., simply use "func(ARGS..)"
+instead of "&func(ARGS...)").
+* THANKS, NEWS: Update.
+
+Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
+---
+ NEWS       |  4 ++++
+ THANKS     |  1 +
+ aclocal.in | 42 ++++++++++++++++++++++++++++++++++--------
+ 3 files changed, 39 insertions(+), 8 deletions(-)
+
+diff --git a/aclocal.in b/aclocal.in
+index dfb851b..e8855d5 100644
+--- a/aclocal.in
++++ b/aclocal.in
+@@ -152,8 +152,34 @@ my $erase_me;
+ 
+ ################################################################
+ 
++# Prototypes for all subroutines.
++
++sub unlink_tmp (;$);
++sub xmkdir_p ($);
++sub check_acinclude ();
++sub reset_maps ();
++sub install_file ($$);
++sub list_compare (\@\@);
++sub scan_m4_dirs ($@);
++sub scan_m4_files ();
++sub add_macro ($);
++sub scan_configure_dep ($);
++sub add_file ($);
++sub scan_file ($$$);
++sub strip_redundant_includes (%);
++sub trace_used_macros ();
++sub scan_configure ();
++sub write_aclocal ($@);
++sub usage ($);
++sub version ();
++sub handle_acdir_option ($$);
++sub parse_arguments ();
++sub parse_ACLOCAL_PATH ();
++
++################################################################
++
+ # Erase temporary file ERASE_ME.  Handle signals.
+-sub unlink_tmp
++sub unlink_tmp (;$)
+ {
+   my ($sig) = @_;
+ 
+@@ -350,7 +376,7 @@ sub scan_m4_dirs ($@)
+ 	  next if $file eq 'aclocal.m4';
+ 
+ 	  my $fullfile = File::Spec->canonpath ("$m4dir/$file");
+-	    &scan_file ($type, $fullfile, 'aclocal');
++	  scan_file ($type, $fullfile, 'aclocal');
+ 	}
+       closedir (DIR);
+     }
+@@ -361,12 +387,12 @@ sub scan_m4_files ()
+ {
+   # First, scan configure.ac.  It may contain macro definitions,
+   # or may include other files that define macros.
+-  &scan_file (FT_USER, $configure_ac, 'aclocal');
++  scan_file (FT_USER, $configure_ac, 'aclocal');
+ 
+   # Then, scan acinclude.m4 if it exists.
+   if (-f 'acinclude.m4')
+     {
+-      &scan_file (FT_USER, 'acinclude.m4', 'aclocal');
++      scan_file (FT_USER, 'acinclude.m4', 'aclocal');
+     }
+ 
+   # Finally, scan all files in our search paths.
+@@ -380,7 +406,7 @@ sub scan_m4_files ()
+   my $search = "sub search {\nmy \$found = 0;\n";
+   foreach my $key (reverse sort keys %map)
+     {
+-      $search .= ('if (/\b\Q' . $key . '\E(?!\w)/) { & add_macro ("' . $key
++      $search .= ('if (/\b\Q' . $key . '\E(?!\w)/) { add_macro ("' . $key
+ 		  . '"); $found = 1; }' . "\n");
+     }
+   $search .= "return \$found;\n};\n";
+@@ -403,7 +429,7 @@ sub add_macro ($)
+ 
+   verb "saw macro $macro";
+   $macro_seen{$macro} = 1;
+-  &add_file ($map{$macro});
++  add_file ($map{$macro});
+ }
+ 
+ # scan_configure_dep ($file)
+@@ -465,7 +491,7 @@ sub scan_configure_dep ($)
+     }
+ 
+   add_macro ($_) foreach (@rlist);
+-  &scan_configure_dep ($_) foreach @ilist;
++  scan_configure_dep ($_) foreach @ilist;
+ }
+ 
+ # add_file ($FILE)
+@@ -931,7 +957,7 @@ EOF
+ }
+ 
+ # Print version and exit.
+-sub version()
++sub version ()
+ {
+   print <<EOF;
+ aclocal (GNU $PACKAGE) $VERSION
+-- 
+2.1.3
+