From: Luca Longinotti <chtekk@gentoo.org>
Date: Tue, 1 Nov 2005 10:04:13 +0000 (+0000)
Subject: Fix java-internal INI file support.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=800c8af4e6669ee556638e9fa5fd87634e06ad3b;p=gentoo.git

Fix java-internal INI file support.
---

diff --git a/eclass/php-common-r1.eclass b/eclass/php-common-r1.eclass
index f10302cc655e..b7557b130dbf 100644
--- a/eclass/php-common-r1.eclass
+++ b/eclass/php-common-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-common-r1.eclass,v 1.3 2005/10/31 14:08:42 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v 1.4 2005/11/01 10:04:13 chtekk Exp $
 
 # ########################################################################
 #
@@ -122,6 +122,10 @@ php_install_java() {
 }
 
 php_install_java_inifile() {
+	if ! useq java-internal ; then
+		return 1
+	fi
+
 	JAVA_LIBRARY="`grep -- '-DJAVALIB' Makefile | sed -e 's,.\+-DJAVALIB=\"\([^"]*\)\".*$,\1,g;'| sort | uniq `"
 
 	echo "extension = java.so" >> "${D}/${PHP_EXT_INI_DIR}/java.ini"