diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-11-15 07:49:11 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-11-15 07:49:11 +0000 |
| commit | c59c4f7397e8d410d7cfcb23b2fb5d59c365810f (patch) | |
| tree | 1db7992e95ff1a0292ebde40872588df29141fc3 | |
| parent | Avoid unneeded dependency on git, fixing bug 529226. (diff) | |
| download | gentoo-2-c59c4f7397e8d410d7cfcb23b2fb5d59c365810f.tar.gz gentoo-2-c59c4f7397e8d410d7cfcb23b2fb5d59c365810f.tar.bz2 gentoo-2-c59c4f7397e8d410d7cfcb23b2fb5d59c365810f.zip | |
set AUTOTOOLS_AUTO_DEPEND based on EAUTORECONF so that we do not clobber earlier settings #409611 by Michał Górny
| -rw-r--r-- | eclass/xfconf.eclass | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/eclass/xfconf.eclass b/eclass/xfconf.eclass index 350b8ecab02d..d409d0443f15 100644 --- a/eclass/xfconf.eclass +++ b/eclass/xfconf.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/xfconf.eclass,v 1.46 2014/02/27 17:12:01 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.47 2014/11/15 07:49:11 vapier Exp $ # @ECLASS: xfconf.eclass # @MAINTAINER: @@ -13,12 +13,16 @@ # @DESCRIPTION: # Run eautoreconf instead of elibtoolize if the variable is set +if [[ -n ${EAUTORECONF} ]] ; then + AUTOTOOLS_AUTO_DEPEND=yes +else + : ${AUTOTOOLS_AUTO_DEPEND:=no} +fi + # @ECLASS-VARIABLE: XFCONF # @DESCRIPTION: # This should be an array defining arguments for econf -AUTOTOOLS_AUTO_DEPEND=no - unset _xfconf_live [[ $PV == *9999* ]] && _xfconf_live=git-2 @@ -28,7 +32,7 @@ EGIT_BOOTSTRAP=autogen.sh EGIT_REPO_URI="git://git.xfce.org/xfce/${MY_PN:-${PN}}" _xfconf_deps="" -_xfconf_m4=">=dev-util/xfce4-dev-tools-4.10 ${AUTOTOOLS_DEPEND}" +_xfconf_m4=">=dev-util/xfce4-dev-tools-4.10" [[ -n $_xfconf_live ]] && _xfconf_deps+=" dev-util/gtk-doc ${_xfconf_m4}" [[ -n $EAUTORECONF ]] && _xfconf_deps+=" ${_xfconf_m4}" |