Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH autotools] Support calling tools handled by gnome-autogen.sh.
Date: Wed, 06 Jun 2012 07:22:50
Message-Id: 1338967344-7971-1-git-send-email-mgorny@gentoo.org
1 This includes gtkdocize, gnome-doc-prepare & glib-gettextize.
2 ---
3 gx86/eclass/autotools.eclass | 25 +++++++++++++++++--------
4 1 file changed, 17 insertions(+), 8 deletions(-)
5
6 diff --git a/gx86/eclass/autotools.eclass b/gx86/eclass/autotools.eclass
7 index 2d165e0..30f2ac5 100644
8 --- a/gx86/eclass/autotools.eclass
9 +++ b/gx86/eclass/autotools.eclass
10 @@ -165,10 +165,13 @@ eautoreconf() {
11 # Run all the tools before aclocal so we can gather the .m4 files.
12 local i tools=(
13 # <tool> <was run> <command>
14 - gettext false "eautopoint --force"
15 + glibgettext false "autotools_run_tool glib-gettextize --copy --force"
16 + gettext false "eautopoint --force"
17 # intltool must come after autopoint.
18 - intltool false "autotools_run_tool intltoolize --automake --copy --force"
19 - libtool false "_elibtoolize --install --copy --force"
20 + intltool false "autotools_run_tool intltoolize --automake --copy --force"
21 + gtkdoc false "autotools_run_tool gtkdocize --copy"
22 + gnomedoc false "autotools_run_tool gnome-doc-prepare --copy --force"
23 + libtool false "_elibtoolize --install --copy --force"
24 )
25 for (( i = 0; i < ${#tools[@]}; i += 3 )) ; do
26 if _at_uses_${tools[i]} ; then
27 @@ -222,11 +225,14 @@ _at_uses_pkg() {
28 egrep -q "${args[@]}" configure.??
29 fi
30 }
31 -_at_uses_autoheader() { _at_uses_pkg AC_CONFIG_HEADERS; }
32 -_at_uses_automake() { _at_uses_pkg AM_INIT_AUTOMAKE; }
33 -_at_uses_gettext() { _at_uses_pkg AM_GNU_GETTEXT_VERSION; }
34 -_at_uses_intltool() { _at_uses_pkg {AC,IT}_PROG_INTLTOOL; }
35 -_at_uses_libtool() { _at_uses_pkg A{C,M}_PROG_LIBTOOL LT_INIT; }
36 +_at_uses_autoheader() { _at_uses_pkg AC_CONFIG_HEADERS; }
37 +_at_uses_automake() { _at_uses_pkg AM_INIT_AUTOMAKE; }
38 +_at_uses_gettext() { _at_uses_pkg AM_GNU_GETTEXT_VERSION; }
39 +_at_uses_glibgettext() { _at_uses_pkg AM_GLIB_GNU_GETTEXT; }
40 +_at_uses_intltool() { _at_uses_pkg {AC,IT}_PROG_INTLTOOL; }
41 +_at_uses_gtkdoc() { _at_uses_pkg GTK_DOC_CHECK; }
42 +_at_uses_gnomedoc() { _at_uses_pkg GNOME_DOC_INIT; }
43 +_at_uses_libtool() { _at_uses_pkg A{C,M}_PROG_LIBTOOL LT_INIT; }
44
45 # @FUNCTION: eaclocal_amflags
46 # @DESCRIPTION:
47 @@ -462,8 +468,11 @@ ALL_AUTOTOOLS_MACROS=(
48 AC_CONFIG_SUBDIRS
49 AC_CONFIG_AUX_DIR AC_CONFIG_MACRO_DIR
50 AM_INIT_AUTOMAKE
51 + AM_GLIB_GNU_GETTEXT
52 AM_GNU_GETTEXT_VERSION
53 {AC,IT}_PROG_INTLTOOL
54 + GTK_DOC_CHECK
55 + GNOME_DOC_INIT
56 )
57 autotools_check_macro() {
58 [[ -f configure.ac || -f configure.in ]] || return 0
59 --
60 1.7.10.2