From 924f303348c544bff5215183f6110053f9f60a6c Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Thu, 14 Jul 2005 16:20:35 +0000 Subject: Fix bug 98836. --- eclass/php-sapi.eclass | 4 ++-- eclass/php5-sapi-r1.eclass | 4 ++-- eclass/php5-sapi-r2.eclass | 4 ++-- eclass/php5-sapi-r3.eclass | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'eclass') diff --git a/eclass/php-sapi.eclass b/eclass/php-sapi.eclass index cbe6dd500535..b95235032882 100644 --- a/eclass/php-sapi.eclass +++ b/eclass/php-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/php-sapi.eclass,v 1.81 2005/07/12 19:18:25 sebastian Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-sapi.eclass,v 1.82 2005/07/14 16:20:35 sebastian Exp $ # Author: Robin H. Johnson inherit eutils flag-o-matic multilib libtool @@ -387,7 +387,7 @@ php-sapi_src_compile() { myconf="${myconf} `use_with imap imap /usr` `use_with ldap ldap /usr`" myconf="${myconf} `use_with xml2 dom /usr` `use_with xml2 dom-xslt /usr`" myconf="${myconf} `use_with xml2 dom-exslt /usr`" - myconf="${myconf} `use_with kerberos kerberos /usr` `use_with pam`" + myconf="${myconf} `use_with kerberos` `use_with pam`" myconf="${myconf} `use_enable memlimit memory-limit`" myconf="${myconf} `use_enable ipv6`" myconf="${myconf} `use_with yaz` `use_enable debug`" diff --git a/eclass/php5-sapi-r1.eclass b/eclass/php5-sapi-r1.eclass index fc8a4eb07f14..4c9ebcc1ab88 100644 --- a/eclass/php5-sapi-r1.eclass +++ b/eclass/php5-sapi-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/php5-sapi-r1.eclass,v 1.16 2005/07/13 16:06:04 sebastian Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r1.eclass,v 1.17 2005/07/14 16:20:35 sebastian Exp $ # # eclass/php5-sapi-r1.eclass # Eclass for building different php5 SAPI instances @@ -370,7 +370,7 @@ php5-sapi-r1_src_compile() { enable_extension_with "ingres" "ingres" 1 enable_extension_with "interbase" "firebird" 1 # ircg extension not supported on Gentoo at this time - enable_extension_with "kerberos" "kerberos" 0 "/usr" + enable_extension_with "kerberos" "kerberos" 0 enable_extension_disable "libxml" "xml2" 0 enable_extension_enable "mbstring" "nls" 1 enable_extension_with "mcrypt" "crypt" 1 diff --git a/eclass/php5-sapi-r2.eclass b/eclass/php5-sapi-r2.eclass index e6536a4597be..9d6e54ab4ee9 100644 --- a/eclass/php5-sapi-r2.eclass +++ b/eclass/php5-sapi-r2.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-sapi-r2.eclass,v 1.30 2005/07/13 16:06:04 sebastian Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r2.eclass,v 1.31 2005/07/14 16:20:35 sebastian Exp $ # # eclass/php5-sapi-r2.eclass # Eclass for building different php5 SAPI instances @@ -418,7 +418,7 @@ php5-sapi-r2_src_compile() { # iodbc support added by Tim Haynes enable_extension_with "iodbc" "iodbc" 0 "/usr" # ircg extension not supported on Gentoo at this time - enable_extension_with "kerberos" "kerberos" 0 "/usr" + enable_extension_with "kerberos" "kerberos" 0 enable_extension_disable "libxml" "xml2" 0 enable_extension_enable "mbstring" "nls" 1 enable_extension_with "mcrypt" "crypt" 1 diff --git a/eclass/php5-sapi-r3.eclass b/eclass/php5-sapi-r3.eclass index d62d63d22068..4ef676f5ed1d 100644 --- a/eclass/php5-sapi-r3.eclass +++ b/eclass/php5-sapi-r3.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-sapi-r3.eclass,v 1.18 2005/07/13 16:06:04 sebastian Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r3.eclass,v 1.19 2005/07/14 16:20:35 sebastian Exp $ # # ######################################################################## # @@ -418,7 +418,7 @@ php5-sapi-r3_src_compile() { # iodbc support added by Tim Haynes enable_extension_with "iodbc" "iodbc" 0 "/usr" # ircg extension not supported on Gentoo at this time - enable_extension_with "kerberos" "kerberos" 0 "/usr" + enable_extension_with "kerberos" "kerberos" 0 enable_extension_disable "libxml" "xml2" 0 enable_extension_enable "mbstring" "nls" 1 enable_extension_with "mcrypt" "crypt" 1 -- cgit v1.2.3-65-gdbad