Fix automake errors. Patch by Luca Longinotti (CHTEKK).

diff --git a/eclass/php-ext-base-r1.eclass b/eclass/php-ext-base-r1.eclass
index fd2c80ab69cc19d4feae43231b3b8affb2e6629a..392b3746f9b99406a5b7e2268390abe380e9e522 100644 (file)
--- a/eclass/php-ext-base-r1.eclass
+++ b/eclass/php-ext-base-r1.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-base-r1.eclass,v 1.1 2005/09/04 10:54:53 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-base-r1.eclass,v 1.2 2005/09/25 15:21:22 kloeri Exp $
 #
 # Author: Tal Peer <coredumb@gentoo.org>
 # Author: Stuart Herbert <stuart@gentoo.org>
@@ -34,8 +34,12 @@ EXT_DIR="`${PHPCONFIG} --extension-dir 2>/dev/null`"
 # ---end ebuild configurable settings
 
 DEPEND="${DEPEND}
-               >=sys-devel/m4-1.4
-               >=sys-devel/libtool-1.4.3"
+               >=sys-devel/m4-1.4.3
+               >=sys-devel/libtool-1.5.18
+               >=sys-devel/automake-1.9.6
+               sys-devel/automake-wrapper
+               >=sys-devel/autoconf-2.59
+               sys-devel/autoconf-wrapper"
 
 php-ext-base-r1_buildinilist() {
        # work out the list of .ini files to edit/add to
@@ -65,7 +69,7 @@ php-ext-base-r1_src_install() {
 
 php-ext-base-r1_addextension() {
        if [ "${PHP_EXT_ZENDEXT}" = "yes" ] ; then
-               if built_with_use =${PHP_PKG} apache2 threads ; then
+               if has_zts ; then
                        ext_type="zend_extension_ts"
                        ext_file="${EXT_DIR}/$1"
                else

diff --git a/eclass/php-ext-source-r1.eclass b/eclass/php-ext-source-r1.eclass
index 7a019174a9c47f6035424f035e7f7a8a05b9afe3..ad442aae7623e750d470856f630c085a87c0a84f 100644 (file)
--- a/eclass/php-ext-source-r1.eclass
+++ b/eclass/php-ext-source-r1.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r1.eclass,v 1.1 2005/09/04 10:54:53 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r1.eclass,v 1.2 2005/09/25 15:21:22 kloeri Exp $
 #
 # Author: Tal Peer <coredumb@gentoo.org>
 # Author: Stuart Herbert <stuart@gentoo.org>
@@ -25,8 +25,12 @@ EXPORT_FUNCTIONS src_compile src_install
 # ---end ebuild configurable settings
 
 DEPEND="${DEPEND}
-               >=sys-devel/m4-1.4
-               >=sys-devel/libtool-1.4.3"
+               >=sys-devel/m4-1.4.3
+               >=sys-devel/libtool-1.5.18
+               >=sys-devel/automake-1.9.6
+               sys-devel/automake-wrapper
+               >=sys-devel/autoconf-2.59
+               sys-devel/autoconf-wrapper"
 
 php-ext-source-r1_src_compile() {
        # pull in the PHP settings
@@ -34,7 +38,7 @@ php-ext-source-r1_src_compile() {
        my_conf="${my_conf} --prefix=${PHPPREFIX} --with-php-config=${PHPCONFIG}"
        addpredict /usr/share/snmp/mibs/.index
        #phpize creates configure out of config.m4
-       export WANT_AUTOMAKE=1.6
+       export WANT_AUTOMAKE=1.9 WANT_AUTOCONF=2.5
        ${PHPIZE}
        ./configure ${my_conf} || die "Unable to configure code to compile"
        emake || die "Unable to make code"

diff --git a/eclass/php4_4-sapi.eclass b/eclass/php4_4-sapi.eclass
index 6f1ad93faa7f36e365649104fcf60ea44558fbab..cec62b780c34125403f4e0f199cfc926c53616a1 100644 (file)
--- a/eclass/php4_4-sapi.eclass
+++ b/eclass/php4_4-sapi.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php4_4-sapi.eclass,v 1.3 2005/09/18 12:57:22 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php4_4-sapi.eclass,v 1.4 2005/09/25 15:21:22 kloeri Exp $
 #
 # ########################################################################
 #
@@ -46,6 +46,12 @@ DEPEND="${DEPEND}
        !dev-php/php
        !dev-php/php-cgi
        !dev-php/mod_php
+       >=sys-devel/m4-1.4.3
+       >=sys-devel/libtool-1.5.18
+       >=sys-devel/automake-1.9.6
+       sys-devel/automake-wrapper
+       >=sys-devel/autoconf-2.59
+       sys-devel/autoconf-wrapper
        berkdb? ( =sys-libs/db-4* )
        bzip2? ( app-arch/bzip2 )
        cdb? ( dev-db/cdb )
@@ -217,7 +223,7 @@ php4_4-sapi_check_awkward_uses() {
        confutils_use_depend_all "solid"                "odbc"
 
        # PEAR support
-       confutils_use_depend_all "pear"                 "cli" "pcre" "xml"
+       confutils_use_depend_all "pear"                 "cli" "pcre" "xml" "zlib"
 
        # Readline and libedit do the same thing; you can't have both
        confutils_use_conflict "readline" "libedit"

diff --git a/eclass/php5_0-sapi.eclass b/eclass/php5_0-sapi.eclass
index 0f323fb8e2e789ada254f9907fd26aa504a527aa..75182c59d180de4a1ac459775d432c0244aa1b2d 100644 (file)
--- a/eclass/php5_0-sapi.eclass
+++ b/eclass/php5_0-sapi.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5_0-sapi.eclass,v 1.3 2005/09/18 12:57:22 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_0-sapi.eclass,v 1.4 2005/09/25 15:21:22 kloeri Exp $
 #
 # ########################################################################
 #
@@ -46,6 +46,12 @@ DEPEND="${DEPEND}
        !dev-php/php
        !dev-php/php-cgi
        !dev-php/mod_php
+       >=sys-devel/m4-1.4.3
+       >=sys-devel/libtool-1.5.18
+       >=sys-devel/automake-1.9.6
+       sys-devel/automake-wrapper
+       >=sys-devel/autoconf-2.59
+       sys-devel/autoconf-wrapper
        berkdb? ( =sys-libs/db-4* )
        bzip2? ( app-arch/bzip2 )
        cdb? ( dev-db/cdb )
@@ -207,7 +213,7 @@ php5_0-sapi_check_awkward_uses() {
        confutils_use_depend_all "solid"                "odbc"
 
        # PEAR support
-       confutils_use_depend_all "pear"                 "cli" "pcre" "xml2"
+       confutils_use_depend_all "pear"                 "cli" "pcre" "xml2" "zlib"
 
        # QDBM doesn't play nicely with GDBM
        confutils_use_conflict "qdbm" "gdbm"

diff --git a/eclass/php5_1-sapi.eclass b/eclass/php5_1-sapi.eclass
index f0cfec40bfbc6ef7aa33679a27aeaab271276c9a..c7579de2663c7fdd49958046d935f96d90d33f5d 100644 (file)
--- a/eclass/php5_1-sapi.eclass
+++ b/eclass/php5_1-sapi.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5_1-sapi.eclass,v 1.5 2005/09/18 12:57:22 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_1-sapi.eclass,v 1.6 2005/09/25 15:21:22 kloeri Exp $
 #
 # ########################################################################
 #
@@ -46,6 +46,12 @@ DEPEND="${DEPEND}
        !dev-php/php
        !dev-php/php-cgi
        !dev-php/mod_php
+       >=sys-devel/m4-1.4.3
+       >=sys-devel/libtool-1.5.18
+       >=sys-devel/automake-1.9.6
+       sys-devel/automake-wrapper
+       >=sys-devel/autoconf-2.59
+       sys-devel/autoconf-wrapper
        berkdb? ( =sys-libs/db-4* )
        bzip2? ( app-arch/bzip2 )
        cdb? ( dev-db/cdb )
@@ -211,7 +217,7 @@ php5_1-sapi_check_awkward_uses() {
        confutils_use_conflict "pdo" "pdo-external"
 
        # PEAR support
-       confutils_use_depend_all "pear"                 "cli" "pcre" "xml2"
+       confutils_use_depend_all "pear"                 "cli" "pcre" "xml2" "zlib"
 
        # QDBM doesn't play nicely with GDBM
        confutils_use_conflict "qdbm" "gdbm"