From: "Mike Frysinger (vapier)" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass
Date: Tue, 13 Dec 2011 21:44:22 +0000 (UTC) [thread overview]
Message-ID: <20111213214422.E3E592004B@flycatcher.gentoo.org> (raw)
vapier 11/12/13 21:44:22
Modified: autotools.eclass
Log:
unify duplicated code for extracting values from traced variables
Revision Changes Path
1.112 eclass/autotools.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.112&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.112&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.111&r2=1.112
Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- autotools.eclass 13 Dec 2011 21:27:38 -0000 1.111
+++ autotools.eclass 13 Dec 2011 21:44:22 -0000 1.112
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.111 2011/12/13 21:27:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.112 2011/12/13 21:44:22 vapier Exp $
# @ECLASS: autotools.eclass
# @MAINTAINER:
@@ -352,36 +352,23 @@
return 0
}
-# Internal function to get additional subdirs to configure
-autotools_get_subdirs() {
- local subdirs_scan_out
-
- subdirs_scan_out=$(autotools_check_macro "AC_CONFIG_SUBDIRS")
- [[ -n ${subdirs_scan_out} ]] || return 0
-
- echo "${subdirs_scan_out}" | gawk \
- '($0 !~ /^[[:space:]]*(#|dnl)/) {
- if (match($0, /AC_CONFIG_SUBDIRS:(.*)$/, res))
- print res[1]
- }' | uniq
+# Internal function to look for a macro and extract its value
+autotools_check_macro_val() {
+ local macro=$1 scan_out
+
+ autotools_check_macro "${macro}" | \
+ gawk -v macro="${macro}" \
+ '($0 !~ /^[[:space:]]*(#|dnl)/) {
+ if (match($0, macro ":(.*)$", res))
+ print res[1]
+ }' | uniq
return 0
}
-autotools_get_auxdir() {
- local auxdir_scan_out
-
- auxdir_scan_out=$(autotools_check_macro "AC_CONFIG_AUX_DIR")
- [[ -n ${auxdir_scan_out} ]] || return 0
-
- echo ${auxdir_scan_out} | gawk \
- '($0 !~ /^[[:space:]]*(#|dnl)/) {
- if (match($0, /AC_CONFIG_AUX_DIR:(.*)$/, res))
- print res[1]
- }' | uniq
-
- return 0
-}
+# Internal function to get additional subdirs to configure
+autotools_get_subdirs() { autotools_check_macro_val AC_CONFIG_SUBDIRS ; }
+autotools_get_auxdir() { autotools_check_macro_val AC_CONFIG_AUX_DIR ; }
autotools_m4dir_include() {
[[ -n ${AT_M4DIR} ]] || return
next reply other threads:[~2011-12-13 21:44 UTC|newest]
Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-13 21:44 Mike Frysinger (vapier) [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-07-17 9:36 [gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass Mike Frysinger (vapier)
2015-06-03 4:06 Mike Frysinger (vapier)
2015-05-20 5:57 Mike Frysinger (vapier)
2015-03-19 19:27 Mike Frysinger (vapier)
2014-11-21 9:17 Mike Frysinger (vapier)
2014-11-15 7:50 Mike Frysinger (vapier)
2014-11-15 7:11 Mike Frysinger (vapier)
2014-11-15 5:40 Mike Frysinger (vapier)
2014-11-15 5:10 Mike Frysinger (vapier)
2014-11-14 1:31 Mike Frysinger (vapier)
2014-11-13 17:14 Mike Frysinger (vapier)
2014-08-12 12:15 Mike Frysinger (vapier)
2014-02-18 3:57 Mike Frysinger (vapier)
2013-12-30 8:19 Mike Frysinger (vapier)
2013-11-30 6:00 Mike Frysinger (vapier)
2013-04-28 21:55 Mike Frysinger (vapier)
2013-04-28 16:45 Mike Frysinger (vapier)
2013-04-23 19:16 Mike Frysinger (vapier)
2013-04-15 21:46 Mike Frysinger (vapier)
2013-01-28 4:13 Mike Frysinger (vapier)
2012-06-08 4:55 Mike Frysinger (vapier)
2012-06-07 6:00 Mike Frysinger (vapier)
2012-06-07 4:50 Mike Frysinger (vapier)
2012-05-24 1:13 Mike Frysinger (vapier)
2012-05-21 18:13 Mike Frysinger (vapier)
2012-05-21 17:53 Mike Frysinger (vapier)
2012-05-21 17:40 Mike Frysinger (vapier)
2012-05-20 13:01 Mike Frysinger (vapier)
2012-05-20 12:58 Mike Frysinger (vapier)
2012-05-20 12:55 Mike Frysinger (vapier)
2012-05-20 12:38 Mike Frysinger (vapier)
2012-05-20 12:31 Mike Frysinger (vapier)
2012-05-20 10:39 Mike Frysinger (vapier)
2012-05-20 10:32 Mike Frysinger (vapier)
2012-05-20 10:26 Mike Frysinger (vapier)
2012-03-22 19:16 Mike Frysinger (vapier)
2012-03-22 15:14 Mike Frysinger (vapier)
2012-03-21 21:51 Mike Frysinger (vapier)
2012-03-21 8:19 Samuli Suominen (ssuominen)
2012-03-21 3:27 Mike Frysinger (vapier)
2012-02-13 17:26 Mike Frysinger (vapier)
2012-02-13 17:21 Mike Frysinger (vapier)
2012-01-06 21:06 Mike Frysinger (vapier)
2012-01-04 22:00 Mike Frysinger (vapier)
2011-12-14 20:46 Mike Frysinger (vapier)
2011-12-14 19:15 Mike Frysinger (vapier)
2011-12-14 18:33 Mike Frysinger (vapier)
2011-12-13 21:57 Mike Frysinger (vapier)
2011-12-13 21:27 Mike Frysinger (vapier)
2011-10-05 13:44 Mike Frysinger (vapier)
2011-09-23 4:14 Mike Frysinger (vapier)
2011-09-23 4:14 Mike Frysinger (vapier)
2011-08-22 19:39 Mike Frysinger (vapier)
2011-08-22 18:22 Mike Frysinger (vapier)
2011-08-07 22:53 Mike Frysinger (vapier)
2011-05-16 3:44 Mike Frysinger (vapier)
2011-04-06 3:52 Diego Petteno (flameeyes)
2010-07-06 18:55 Mike Frysinger (vapier)
2010-05-23 22:52 Mike Frysinger (vapier)
2010-04-01 21:42 Robin H. Johnson (robbat2)
2010-04-01 10:12 Diego Petteno (flameeyes)
2010-03-31 2:11 Robin H. Johnson (robbat2)
2010-03-07 17:43 Mike Frysinger (vapier)
2010-03-07 17:42 Mike Frysinger (vapier)
2010-02-08 11:04 Samuli Suominen (ssuominen)
2010-01-17 1:09 Mike Frysinger (vapier)
2010-01-15 3:19 Mike Frysinger (vapier)
2010-01-10 18:39 Tomas Chvatal (scarabeus)
2009-12-04 9:11 Mike Frysinger (vapier)
2009-05-18 11:24 Diego Petteno (flameeyes)
2009-05-04 22:27 Mike Frysinger (vapier)
2009-04-12 7:38 Mike Frysinger (vapier)
2009-04-04 17:45 Fabian Groffen (grobian)
2009-01-04 16:54 Mike Frysinger (vapier)
2008-09-26 16:21 Jorge Manuel B. S. Vicetto (jmbsvicetto)
2008-07-31 20:45 Jeremy Olexa (darkside)
2008-07-31 19:54 Samuli Suominen (drac)
2008-07-31 19:13 Jeremy Olexa (darkside)
2008-06-09 9:09 Mike Frysinger (vapier)
2008-06-01 1:43 Mike Frysinger (vapier)
2008-04-24 3:15 Mike Frysinger (vapier)
2008-04-22 22:38 Mike Frysinger (vapier)
2008-03-31 14:19 Mike Frysinger (vapier)
2008-02-23 2:21 Mike Frysinger (vapier)
2008-01-25 22:45 Diego Petteno (flameeyes)
2008-01-13 18:41 Diego Petteno (flameeyes)
2008-01-07 2:54 Mike Frysinger (vapier)
2007-09-18 13:25 Mike Frysinger (vapier)
2007-09-17 23:15 Mike Frysinger (vapier)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111213214422.E3E592004B@flycatcher.gentoo.org \
--to=vapier@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox