1 |
mgorny 12/06/06 17:15:08 |
2 |
|
3 |
Modified: autotools.eclass ChangeLog |
4 |
Log: |
5 |
Support other GNOME-related tools in eautoreconf: gtk-doc, gnome-doc & glib-gettext. |
6 |
|
7 |
Revision Changes Path |
8 |
1.144 eclass/autotools.eclass |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.144&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.144&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.143&r2=1.144 |
13 |
|
14 |
Index: autotools.eclass |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v |
17 |
retrieving revision 1.143 |
18 |
retrieving revision 1.144 |
19 |
diff -u -r1.143 -r1.144 |
20 |
--- autotools.eclass 5 Jun 2012 18:31:54 -0000 1.143 |
21 |
+++ autotools.eclass 6 Jun 2012 17:15:08 -0000 1.144 |
22 |
@@ -1,6 +1,6 @@ |
23 |
# Copyright 1999-2012 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.143 2012/06/05 18:31:54 grobian Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.144 2012/06/06 17:15:08 mgorny Exp $ |
27 |
|
28 |
# @ECLASS: autotools.eclass |
29 |
# @MAINTAINER: |
30 |
@@ -165,10 +165,13 @@ |
31 |
# Run all the tools before aclocal so we can gather the .m4 files. |
32 |
local i tools=( |
33 |
# <tool> <was run> <command> |
34 |
- gettext false "eautopoint --force" |
35 |
+ glibgettext false "autotools_run_tool glib-gettextize --copy --force" |
36 |
+ gettext false "eautopoint --force" |
37 |
# intltool must come after autopoint. |
38 |
- intltool false "autotools_run_tool intltoolize --automake --copy --force" |
39 |
- libtool false "_elibtoolize --install --copy --force" |
40 |
+ intltool false "autotools_run_tool intltoolize --automake --copy --force" |
41 |
+ gtkdoc false "autotools_run_tool gtkdocize --copy" |
42 |
+ gnomedoc false "autotools_run_tool gnome-doc-prepare --copy --force" |
43 |
+ libtool false "_elibtoolize --install --copy --force" |
44 |
) |
45 |
for (( i = 0; i < ${#tools[@]}; i += 3 )) ; do |
46 |
if _at_uses_${tools[i]} ; then |
47 |
@@ -222,11 +225,14 @@ |
48 |
egrep -q "${args[@]}" configure.?? |
49 |
fi |
50 |
} |
51 |
-_at_uses_autoheader() { _at_uses_pkg AC_CONFIG_HEADERS; } |
52 |
-_at_uses_automake() { _at_uses_pkg AM_INIT_AUTOMAKE; } |
53 |
-_at_uses_gettext() { _at_uses_pkg AM_GNU_GETTEXT_VERSION; } |
54 |
-_at_uses_intltool() { _at_uses_pkg {AC,IT}_PROG_INTLTOOL; } |
55 |
-_at_uses_libtool() { _at_uses_pkg A{C,M}_PROG_LIBTOOL LT_INIT; } |
56 |
+_at_uses_autoheader() { _at_uses_pkg AC_CONFIG_HEADERS; } |
57 |
+_at_uses_automake() { _at_uses_pkg AM_INIT_AUTOMAKE; } |
58 |
+_at_uses_gettext() { _at_uses_pkg AM_GNU_GETTEXT_VERSION; } |
59 |
+_at_uses_glibgettext() { _at_uses_pkg AM_GLIB_GNU_GETTEXT; } |
60 |
+_at_uses_intltool() { _at_uses_pkg {AC,IT}_PROG_INTLTOOL; } |
61 |
+_at_uses_gtkdoc() { _at_uses_pkg GTK_DOC_CHECK; } |
62 |
+_at_uses_gnomedoc() { _at_uses_pkg GNOME_DOC_INIT; } |
63 |
+_at_uses_libtool() { _at_uses_pkg A{C,M}_PROG_LIBTOOL LT_INIT; } |
64 |
|
65 |
# @FUNCTION: eaclocal_amflags |
66 |
# @DESCRIPTION: |
67 |
@@ -462,8 +468,11 @@ |
68 |
AC_CONFIG_SUBDIRS |
69 |
AC_CONFIG_AUX_DIR AC_CONFIG_MACRO_DIR |
70 |
AM_INIT_AUTOMAKE |
71 |
+ AM_GLIB_GNU_GETTEXT |
72 |
AM_GNU_GETTEXT_VERSION |
73 |
{AC,IT}_PROG_INTLTOOL |
74 |
+ GTK_DOC_CHECK |
75 |
+ GNOME_DOC_INIT |
76 |
) |
77 |
autotools_check_macro() { |
78 |
[[ -f configure.ac || -f configure.in ]] || return 0 |
79 |
|
80 |
|
81 |
|
82 |
1.294 eclass/ChangeLog |
83 |
|
84 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.294&view=markup |
85 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.294&content-type=text/plain |
86 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.293&r2=1.294 |
87 |
|
88 |
Index: ChangeLog |
89 |
=================================================================== |
90 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
91 |
retrieving revision 1.293 |
92 |
retrieving revision 1.294 |
93 |
diff -u -r1.293 -r1.294 |
94 |
--- ChangeLog 6 Jun 2012 17:00:09 -0000 1.293 |
95 |
+++ ChangeLog 6 Jun 2012 17:15:08 -0000 1.294 |
96 |
@@ -1,6 +1,10 @@ |
97 |
# ChangeLog for eclass directory |
98 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
99 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.293 2012/06/06 17:00:09 mpagano Exp $ |
100 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.294 2012/06/06 17:15:08 mgorny Exp $ |
101 |
+ |
102 |
+ 06 Jun 2012; Michał Górny <mgorny@g.o> autotools.eclass: |
103 |
+ Support other GNOME-related tools in eautoreconf: gtk-doc, gnome-doc & |
104 |
+ glib-gettext. |
105 |
|
106 |
06 Jun 2012; Michael Pagano <mpagano@g.o> kernel-2.eclass: |
107 |
Move ppc/powerpc fix to after we apply linux patches |