From 3e7207f76736a3db92dafd937fafced919a9b2e4 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Mon, 6 Jun 2011 16:40:14 +0000 Subject: [PATCH] make gettext optional some problem might arise like undef symbols if they are not guarded correctly (like in alarm, see next commit) SVN revision: 59994 --- Makefile.am | 8 +++++++- configure.ac | 14 ++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 5f62bca..fef0900 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,13 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \ config.sub configure depcomp install-sh ltmain.sh \ missing module.desktop config.rpath mkinstalldirs -SUBDIRS = src po +SUBDIRS = src + +if HAVE_PO + +SUBDIRS += po + +endif EDJE_FLAGS = -v \ -id $(top_srcdir)/images diff --git a/configure.ac b/configure.ac index 33928f6..b1b2463 100644 --- a/configure.ac +++ b/configure.ac @@ -36,8 +36,18 @@ define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl AC_PROG_LIBTOOL +m4_ifdef([AM_GNU_GETTEXT_VERSION], [ +AM_GNU_GETTEXT_VERSION([0.14]) +]) + +m4_ifdef([AM_GNU_GETTEXT], [ AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION(0.14) +po_makefile_in=po/Makefile.in +AM_CONDITIONAL([HAVE_PO], [true]) +],[ +AM_CONDITIONAL([HAVE_PO], [false]) +]) +AC_SUBST(LTLIBINTL) # Find edje_cc PKG_CHECK_MODULES(EDJE, [edje >= 0.5.0]) @@ -63,8 +73,8 @@ AC_ARG_ENABLE(homedir-install, AC_OUTPUT([ Makefile e_modules-moon.spec -po/Makefile.in src/Makefile module.desktop +$po_makefile_in ], [ ])