| 1 |
flameeyes 11/04/06 03:52:08 |
| 2 |
|
| 3 |
Modified: autotools.eclass |
| 4 |
Log: |
| 5 |
Make sure to use AT_M4DIR values for autoheader and autoconf calls as well. |
| 6 |
|
| 7 |
This is required to re-build autotools on app-admin/sudo-1.8* |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.102 eclass/autotools.eclass |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.102&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.102&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.101&r2=1.102 |
| 15 |
|
| 16 |
Index: autotools.eclass |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v |
| 19 |
retrieving revision 1.101 |
| 20 |
retrieving revision 1.102 |
| 21 |
diff -u -r1.101 -r1.102 |
| 22 |
--- autotools.eclass 21 Aug 2010 19:39:52 -0000 1.101 |
| 23 |
+++ autotools.eclass 6 Apr 2011 03:52:08 -0000 1.102 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2010 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.101 2010/08/21 19:39:52 vapier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.102 2011/04/06 03:52:08 flameeyes Exp $ |
| 29 |
|
| 30 |
# @ECLASS: autotools.eclass |
| 31 |
# @MAINTAINER: |
| 32 |
@@ -157,22 +157,8 @@ |
| 33 |
break |
| 34 |
done |
| 35 |
|
| 36 |
- if [[ -n ${AT_M4DIR} ]] ; then |
| 37 |
- for x in ${AT_M4DIR} ; do |
| 38 |
- case "${x}" in |
| 39 |
- "-I") |
| 40 |
- # We handle it below |
| 41 |
- ;; |
| 42 |
- *) |
| 43 |
- [[ ! -d ${x} ]] && ewarn "eaclocal: '${x}' does not exist" |
| 44 |
- aclocal_opts="${aclocal_opts} -I ${x}" |
| 45 |
- ;; |
| 46 |
- esac |
| 47 |
- done |
| 48 |
- fi |
| 49 |
- |
| 50 |
[[ ! -f aclocal.m4 || -n $(grep -e 'generated.*by aclocal' aclocal.m4) ]] && \ |
| 51 |
- autotools_run_tool aclocal "$@" ${aclocal_opts} |
| 52 |
+ autotools_run_tool aclocal $(autotools_m4dir_include) "$@" ${aclocal_opts} |
| 53 |
} |
| 54 |
|
| 55 |
# @FUNCTION: _elibtoolize |
| 56 |
@@ -201,7 +187,7 @@ |
| 57 |
eautoheader() { |
| 58 |
# Check if we should run autoheader |
| 59 |
[[ -n $(autotools_check_macro "AC_CONFIG_HEADERS") ]] || return 0 |
| 60 |
- NO_FAIL=1 autotools_run_tool autoheader "$@" |
| 61 |
+ NO_FAIL=1 autotools_run_tool autoheader $(autotools_m4dir_include) "$@" |
| 62 |
} |
| 63 |
|
| 64 |
# @FUNCTION: eautoconf |
| 65 |
@@ -215,7 +201,7 @@ |
| 66 |
die "No configure.{ac,in} present!" |
| 67 |
fi |
| 68 |
|
| 69 |
- autotools_run_tool autoconf "$@" |
| 70 |
+ autotools_run_tool autoconf $(autotools_m4dir_include) "$@" |
| 71 |
} |
| 72 |
|
| 73 |
# @FUNCTION: eautomake |
| 74 |
@@ -320,7 +306,7 @@ |
| 75 |
[[ -f configure.ac || -f configure.in ]] || return 0 |
| 76 |
local macro |
| 77 |
for macro ; do |
| 78 |
- WANT_AUTOCONF="2.5" autoconf --trace="${macro}" 2>/dev/null |
| 79 |
+ WANT_AUTOCONF="2.5" autoconf $(autotools_m4dir_include) --trace="${macro}" 2>/dev/null |
| 80 |
done |
| 81 |
return 0 |
| 82 |
} |
| 83 |
@@ -355,3 +341,23 @@ |
| 84 |
|
| 85 |
return 0 |
| 86 |
} |
| 87 |
+ |
| 88 |
+autotools_m4dir_include() { |
| 89 |
+ [[ -n ${AT_M4DIR} ]] || return |
| 90 |
+ |
| 91 |
+ local include_opts= |
| 92 |
+ |
| 93 |
+ for x in ${AT_M4DIR} ; do |
| 94 |
+ case "${x}" in |
| 95 |
+ "-I") |
| 96 |
+ # We handle it below |
| 97 |
+ ;; |
| 98 |
+ *) |
| 99 |
+ [[ ! -d ${x} ]] && ewarn "autotools.eclass: '${x}' does not exist" |
| 100 |
+ include_opts="${include_opts} -I ${x}" |
| 101 |
+ ;; |
| 102 |
+ esac |
| 103 |
+ done |
| 104 |
+ |
| 105 |
+ echo $include_opts |
| 106 |
+} |
Archives