1 |
The gnome2.eclass checks the configure script for certain items and |
2 |
adjusts the arguments to econf based on those checks. Unfortunately |
3 |
when checking the configure script it did not respect ECONF_SOURCE. |
4 |
--- |
5 |
gnome2.eclass | 11 ++++++----- |
6 |
1 file changed, 6 insertions(+), 5 deletions(-) |
7 |
|
8 |
diff --git a/gnome2.eclass b/gnome2.eclass |
9 |
index 3f7b2da..1f3e005 100644 |
10 |
--- a/gnome2.eclass |
11 |
+++ b/gnome2.eclass |
12 |
@@ -129,7 +129,7 @@ gnome2_src_configure() { |
13 |
# Remember to drop 'doc' USE flag from your package if it was only used to |
14 |
# rebuild docs. |
15 |
# Preserve old behavior for older EAPI. |
16 |
- if grep -q "enable-gtk-doc" configure ; then |
17 |
+ if grep -q "enable-gtk-doc" ${ECONF_SOURCE:-.}/configure ; then |
18 |
if has ${EAPI-0} 0 1 2 3 4 && has doc ${IUSE} ; then |
19 |
G2CONF="${G2CONF} $(use_enable doc gtk-doc)" |
20 |
else |
21 |
@@ -138,24 +138,25 @@ gnome2_src_configure() { |
22 |
fi |
23 |
|
24 |
# Pass --disable-maintainer-mode when needed |
25 |
- if grep -q "^[[:space:]]*AM_MAINTAINER_MODE(\[enable\])" configure.*; then |
26 |
+ if grep -q "^[[:space:]]*AM_MAINTAINER_MODE(\[enable\])" \ |
27 |
+ ${ECONF_SOURCE:-.}/configure.*; then |
28 |
G2CONF="${G2CONF} --disable-maintainer-mode" |
29 |
fi |
30 |
|
31 |
# Pass --disable-scrollkeeper when possible |
32 |
- if grep -q "disable-scrollkeeper" configure; then |
33 |
+ if grep -q "disable-scrollkeeper" ${ECONF_SOURCE:-.}/configure; then |
34 |
G2CONF="${G2CONF} --disable-scrollkeeper" |
35 |
fi |
36 |
|
37 |
# Pass --disable-silent-rules when possible (not needed for eapi5), bug #429308 |
38 |
if has ${EAPI:-0} 0 1 2 3 4; then |
39 |
- if grep -q "disable-silent-rules" configure; then |
40 |
+ if grep -q "disable-silent-rules" ${ECONF_SOURCE:-.}/configure; then |
41 |
G2CONF="${G2CONF} --disable-silent-rules" |
42 |
fi |
43 |
fi |
44 |
|
45 |
# Pass --disable-schemas-install when possible |
46 |
- if grep -q "disable-schemas-install" configure; then |
47 |
+ if grep -q "disable-schemas-install" ${ECONF_SOURCE:-.}/configure; then |
48 |
G2CONF="${G2CONF} --disable-schemas-install" |
49 |
fi |
50 |
|
51 |
-- |
52 |
1.8.0 |