From 5b65f0a87015e549f2a3e7008ac456b85950b317 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 d9bb758..7bd3eb9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,13 @@ ACLOCAL_AMFLAGS = -I m4 MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = src data po +SUBDIRS = src data + +if HAVE_PO + +SUBDIRS += po + +endif filesdir = $(datadir) files_DATA = module.desktop diff --git a/configure.ac b/configure.ac index 5bb4f57..8b62f6d 100644 --- a/configure.ac +++ b/configure.ac @@ -23,8 +23,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) PKG_CHECK_MODULES(E, [enlightenment]) release=$(pkg-config --variable=release enlightenment) @@ -63,8 +73,8 @@ data/images/feeds/Makefile data/images/categories/Makefile data/theme/Makefile src/Makefile -po/Makefile.in module.desktop +$po_makefile_in ], [ ])