diff options
| author |   Doug Goldstein <cardoe@gentoo.org> | 2012-12-05 23:41:52 +0000 |
|---|---|---|
| committer | Doug Goldstein <cardoe@gentoo.org> | 2012-12-05 23:41:52 +0000 |
| commit | b19fbe31e46bbc0027eb04a27846c85c241d3883 (patch) | |
| tree | f3dac188b75951137a5992814ab5b130ec0747ab | |
| parent | Version bump. (diff) | |
| download | gentoo-2-b19fbe31e46bbc0027eb04a27846c85c241d3883.tar.gz gentoo-2-b19fbe31e46bbc0027eb04a27846c85c241d3883.tar.bz2 gentoo-2-b19fbe31e46bbc0027eb04a27846c85c241d3883.zip | |
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.
| -rw-r--r-- | eclass/gnome2.eclass | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass index 3f7b2da9f75c..c2c3fd576ba7 100644 --- a/eclass/gnome2.eclass +++ b/eclass/gnome2.eclass @@ -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 @@ gnome2_src_configure() { # 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 @@ gnome2_src_configure() { 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 |