From 479140b6f26ef19f13082074450549ba0ce94dfc Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 25 Nov 2009 00:03:24 +0000 Subject: fix php configure generation with autoconf-2.64+ #281697 --- eclass/php5_2-sapi.eclass | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'eclass') diff --git a/eclass/php5_2-sapi.eclass b/eclass/php5_2-sapi.eclass index ce5b42660af3..f256ed5ed4f2 100644 --- a/eclass/php5_2-sapi.eclass +++ b/eclass/php5_2-sapi.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.26 2009/11/13 15:57:24 cla Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.27 2009/11/25 00:03:24 vapier Exp $ # ======================================================================== # Based on robbat2's work on the php4 sapi eclass @@ -394,6 +394,13 @@ php5_2-sapi_src_unpack() { # We are heavily patching autotools base files (configure.in) because # of suhosin etc., so let's regenerate the whole stuff now + # work around divert() issues with newer autoconf #281697 + if has_version '>=sys-devel/autoconf-2.64' ; then + sed -i -r \ + -e 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \ + $(grep -l divert $(find -name '*.m4') configure.in) || die + fi + # eaclocal doesn't accept --force, so we try to force re-generation # this way rm aclocal.m4 -- cgit v1.2.3-65-gdbad