[gentoo-commits] gentoo-x86 commit in eclass: gnome2.eclass

["Doug Goldstein (cardoe)" <cardoe@gentoo.org>]

cardoe      12/12/05 23:41:52

  Modified:             gnome2.eclass
  Log:
  The gnome2.eclass checks the configure script for certain items and
  adjusts the arguments to econf based on those checks. Unfortunately
  when checking the configure script it did not respect ECONF_SOURCE.

Revision  Changes    Path
1.116                eclass/gnome2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.116&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.116&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?r1=1.115&r2=1.116

Index: gnome2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- gnome2.eclass	2 Dec 2012 11:07:09 -0000	1.115
+++ gnome2.eclass	5 Dec 2012 23:41:52 -0000	1.116
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.115 2012/12/02 11:07:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.116 2012/12/05 23:41:52 cardoe Exp $
 
 # @ECLASS: gnome2.eclass
 # @MAINTAINER:
@@ -129,7 +129,7 @@
 	# Remember to drop 'doc' USE flag from your package if it was only used to
 	# rebuild docs.
 	# Preserve old behavior for older EAPI.
-	if grep -q "enable-gtk-doc" configure ; then
+	if grep -q "enable-gtk-doc" ${ECONF_SOURCE:-.}/configure ; then
 		if has ${EAPI-0} 0 1 2 3 4 && has doc ${IUSE} ; then
 			G2CONF="${G2CONF} $(use_enable doc gtk-doc)"
 		else
@@ -138,24 +138,25 @@
 	fi
 
 	# Pass --disable-maintainer-mode when needed
-	if grep -q "^[[:space:]]*AM_MAINTAINER_MODE(\[enable\])" configure.*; then
+	if grep -q "^[[:space:]]*AM_MAINTAINER_MODE(\[enable\])" \
+		${ECONF_SOURCE:-.}/configure.*; then
 		G2CONF="${G2CONF} --disable-maintainer-mode"
 	fi
 
 	# Pass --disable-scrollkeeper when possible
-	if grep -q "disable-scrollkeeper" configure; then
+	if grep -q "disable-scrollkeeper" ${ECONF_SOURCE:-.}/configure; then
 		G2CONF="${G2CONF} --disable-scrollkeeper"
 	fi
 
 	# Pass --disable-silent-rules when possible (not needed for eapi5), bug #429308
 	if has ${EAPI:-0} 0 1 2 3 4; then
-		if grep -q "disable-silent-rules" configure; then
+		if grep -q "disable-silent-rules" ${ECONF_SOURCE:-.}/configure; then
 			G2CONF="${G2CONF} --disable-silent-rules"
 		fi
 	fi
 
 	# Pass --disable-schemas-install when possible
-	if grep -q "disable-schemas-install" configure; then
+	if grep -q "disable-schemas-install" ${ECONF_SOURCE:-.}/configure; then
 		G2CONF="${G2CONF} --disable-schemas-install"
 	fi