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).

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@49738 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/Makefile.am b/Makefile.am
index bbd57ee..15b1308 100644 (file)
--- a/Makefile.am
+++ b/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/configure.ac b/configure.ac
index c45ebd6..0dcc032 100644 (file)
--- a/configure.ac
+++ b/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