From 1cc39de72ac5311db748341ef9183586556719d9 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 4 Aug 2012 14:18:38 -0700 Subject: econf: add --disable-silent-rules, bug #379497#c6 --- bin/phase-helpers.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh index 946520b20..480e73e08 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -420,11 +420,17 @@ econf() { done fi + local conf_help=$("${ECONF_SOURCE}/configure" --help 2>/dev/null) + + case "${conf_help}" in + *--disable-silent-rules*) set -- --disable-silent-rules "$@";; + esac + # EAPI=4 adds --disable-dependency-tracking to econf - if ! has "$EAPI" 0 1 2 3 3_pre2 && \ - "${ECONF_SOURCE}/configure" --help 2>/dev/null | \ - grep -q disable-dependency-tracking ; then - set -- --disable-dependency-tracking "$@" + if ! has "$EAPI" 0 1 2 3 3_pre2 ; then + case "${conf_help}" in + *--disable-dependency-tracking*) set -- --disable-dependency-tracking "$@";; + esac fi # if the profile defines a location to install libs to aside from default, pass it on. -- cgit v1.2.3-1-g7c22