Gentoo Archives: gentoo-dev

From: Samuli Suominen <ssuominen@g.o>
To: gentoo-dev@l.g.o, vapier@g.o
Subject: [gentoo-dev] Re: [gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass
Date: Sun, 20 May 2012 10:30:25
Message-Id: 4FB8C6C0.2040706@gentoo.org
1 ChangeLog?
2
3 On 05/20/2012 01:26 PM, Mike Frysinger (vapier) wrote:
4 > vapier 12/05/20 10:26:05
5 >
6 > Modified: autotools.eclass
7 > Log:
8 > automatically create AC_CONFIG_MACRO_DIR dir too
9 >
10 > Revision Changes Path
11 > 1.131 eclass/autotools.eclass
12 >
13 > file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.131&view=markup
14 > plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.131&content-type=text/plain
15 > diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.130&r2=1.131
16 >
17 > Index: autotools.eclass
18 > ===================================================================
19 > RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
20 > retrieving revision 1.130
21 > retrieving revision 1.131
22 > diff -u -r1.130 -r1.131
23 > --- autotools.eclass 22 Mar 2012 19:16:22 -0000 1.130
24 > +++ autotools.eclass 20 May 2012 10:26:05 -0000 1.131
25 > @@ -1,6 +1,6 @@
26 > # Copyright 1999-2012 Gentoo Foundation
27 > # Distributed under the terms of the GNU General Public License v2
28 > -# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.130 2012/03/22 19:16:22 vapier Exp $
29 > +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.131 2012/05/20 10:26:05 vapier Exp $
30 >
31 > # @ECLASS: autotools.eclass
32 > # @MAINTAINER:
33 > @@ -143,7 +143,7 @@
34 > # Should do a full autoreconf - normally what most people will be interested in.
35 > # Also should handle additional directories specified by AC_CONFIG_SUBDIRS.
36 > eautoreconf() {
37 > - local x auxdir g
38 > + local x g
39 >
40 > if [[ -z ${AT_NO_RECURSIVE} ]]; then
41 > # Take care of subdirs
42 > @@ -156,10 +156,11 @@
43 > done
44 > fi
45 >
46 > - auxdir=$(autotools_get_auxdir)
47 > + local auxdir=$(autotools_get_auxdir)
48 > + local macdir=$(autotools_get_macrodir)
49 >
50 > einfo "Running eautoreconf in '${PWD}' ..."
51 > - [[ -n ${auxdir} ]]&& mkdir -p ${auxdir}
52 > + [[ -n ${auxdir}${macdir} ]]&& mkdir -p ${auxdir} ${macdir}
53 > eaclocal
54 > [[ ${CHOST} == *-darwin* ]]&& g=g
55 > if ${LIBTOOLIZE:-${g}libtoolize} -n --install>& /dev/null ; then
56 > @@ -428,6 +429,7 @@
57 > # Internal function to get additional subdirs to configure
58 > autotools_get_subdirs() { autotools_check_macro_val AC_CONFIG_SUBDIRS ; }
59 > autotools_get_auxdir() { autotools_check_macro_val AC_CONFIG_AUX_DIR ; }
60 > +autotools_get_macrodir() { autotools_check_macro_val AC_CONFIG_MACRO_DIR ; }
61 >
62 > _autotools_m4dir_include() {
63 > local x include_opts
64 >
65 >
66 >
67 >