[gentoo-commits] proj/gnome:gnome-next commit in: eclass/

["Alexandre Restovtsev" <tetromino@gmail.com>]

commit:     765007b63d0c4e9c9e81eabaf79ce87f87da1720
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Sep 20 02:12:30 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Sep 20 02:12:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=765007b6

eclass/gnome2-live.eclass: fix autopoint logic

Borrow the logic from gnome-autogen.sh to only run autopoint for
packages that use AM_GNU_GETTEXT_VERSION and do not use
AM_GLIB_GNU_GETTEXT. Otherwise, running autopoint will result in
failures such as

autopoint: *** Missing version: please specify in configure.in through a
line 'AM_GNU_GETTEXT_VERSION(x.yy.zz)' the gettext version the package
is using

Thanks to Steev Klimaszewski for pointing out such a failure on IRC.

The eclass now appears to work both for packages that require autopoint
(e.g. cogl) and those that cannot use it (e.g. mutter).

---
 eclass/gnome2-live.eclass |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass
index 6c4aefd..638cdc9 100644
--- a/eclass/gnome2-live.eclass
+++ b/eclass/gnome2-live.eclass
@@ -81,13 +81,16 @@ gnome2-live_src_prepare() {
 		mkdir -p "$i"
 	done
 
-	# Generate po/Makefile.in.in if it doesn't exist
-	if [[ -d po && ! -e po/Makefile.in.in && ! -e po/Makefile.am ]]; then
-		eautopoint --force
-	fi
-
 	# We don't run gettextize because that does too much stuff
 	if grep -qe 'GETTEXT' configure.*; then
+		# Generate po/Makefile.in.in if it doesn't exist for packages that use
+		# AM_GNU_GETTEXT and AM_GNU_GETTEXT_VERSION (e.g. media-libs/cogl).
+		# Logic is inspired by gnome-autogen.sh
+		if ! grep -qe '^AM_GLIB_GNU_GETTEXT' configure.* &&
+		   grep -qe '^AM_GNU_GETTEXT_VERSION' configure.* &&
+		   [[ -d po && ! -e po/Makefile.in.in && ! -e po/Makefile.am ]]; then
+			eautopoint --force
+		fi
 		local aux_dir=${S}/$(gnome2-live_get_var AC_CONFIG_AUX_DIR configure.*)
 		mkdir -p "${aux_dir}"
 		test -e "${aux_dir}/config.rpath" || :> "${aux_dir}/config.rpath"