From c345661588839d4b279c586d875e3094be4a848f Mon Sep 17 00:00:00 2001
From: Vincent Torri <vincent.torri@gmail.com>
Date: Fri, 18 Jun 2010 06:36:21 +0000
Subject: [PATCH] Allow ecore to be built on systems that do not have gettext
 (again). The problem in the previous commit was that AM_GNU_GETTEXT and
 AM_GNU_GETTEXT_VERSION must begin a line (autopoint searches lines beginning
 by them).

SVN revision: 49738
---
 legacy/ecore/Makefile.am  | 13 ++++++++++++-
 legacy/ecore/configure.ac | 12 +++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/legacy/ecore/Makefile.am b/legacy/ecore/Makefile.am
index bbd57eea01..15b1308d41 100644
--- a/legacy/ecore/Makefile.am
+++ b/legacy/ecore/Makefile.am
@@ -4,6 +4,11 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = doc src po
 
+if HAVE_PO
+
+SUBDIRS += po
+
+endif
 
 MAINTAINERCLEANFILES = \
 ABOUT-NLS \
@@ -47,7 +52,11 @@ m4/po.m4 \
 m4/progtest.m4 \
 m4/stdint_h.m4 \
 m4/uintmax_t.m4 \
-m4/ulonglong.m4 \
+m4/ulonglong.m4
+
+if HAVE_PO
+
+MAINTAINERCLEANFILES += \
 po/boldquot.sed \
 po/en@boldquot.header \
 po/en@quot.header \
@@ -58,6 +67,8 @@ po/quot.sed \
 po/remove-potcdate.sin \
 po/Rules-quot
 
+endif
+
 bin_SCRIPTS = 
 
 EXTRA_DIST = AUTHORS COPYING COPYING-PLAIN \
diff --git a/legacy/ecore/configure.ac b/legacy/ecore/configure.ac
index c45ebd6dd6..0dcc0324e8 100644
--- a/legacy/ecore/configure.ac
+++ b/legacy/ecore/configure.ac
@@ -53,8 +53,18 @@ AC_SUBST(release_info)
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 
+m4_ifdef([AM_GNU_GETTEXT_VERSION], [
 AM_GNU_GETTEXT_VERSION([0.12.1])
+])
+
+m4_ifdef([AM_GNU_GETTEXT], [
 AM_GNU_GETTEXT([external])
+po_makefile_in=po/Makefile.in
+AM_CONDITIONAL([HAVE_PO], [true])
+],[
+AM_CONDITIONAL([HAVE_PO], [false])
+])
+AC_SUBST(LTLIBINTL)
 
 EFL_CHECK_PATH_MAX
 
@@ -1355,7 +1365,7 @@ src/lib/ecore_x/xcb/Makefile
 src/tests/Makefile
 README
 ecore.spec
-po/Makefile.in
+$po_makefile_in
 ])
 
 echo