summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2011-06-06 16:40:14 +0000
committerVincent Torri <vincent.torri@gmail.com>2011-06-06 16:40:14 +0000
commitea9117f9c703a54b850f42d4dd8ada3856a8e79e (patch)
tree68cbdb4f5bb6f1466ae275544d40bba75595e76d
parentf102ecfb7fec5e88b17c2db859d27d83f224631f (diff)
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
-rw-r--r--Makefile.am6
-rw-r--r--configure.ac17
2 files changed, 20 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index c2de082..85be25f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,6 +5,12 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \
5 5
6SUBDIRS = src 6SUBDIRS = src
7 7
8if HAVE_PO
9
10SUBDIRS += po
11
12endif
13
8EDJE_FLAGS = -v -id $(top_srcdir) 14EDJE_FLAGS = -v -id $(top_srcdir)
9 15
10filesdir = $(datadir) 16filesdir = $(datadir)
diff --git a/configure.ac b/configure.ac
index 27289f7..74a6535 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,13 +25,23 @@ define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
25define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl 25define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
26AC_PROG_LIBTOOL 26AC_PROG_LIBTOOL
27 27
28m4_ifdef([AM_GNU_GETTEXT_VERSION], [
29AM_GNU_GETTEXT_VERSION([0.14])
30])
31
32m4_ifdef([AM_GNU_GETTEXT], [
33AM_GNU_GETTEXT([external])
34po_makefile_in=po/Makefile.in
35AM_CONDITIONAL([HAVE_PO], [true])
36],[
37AM_CONDITIONAL([HAVE_PO], [false])
38])
39AC_SUBST(LTLIBINTL)
40
28AC_SUBST(packagedatadir) 41AC_SUBST(packagedatadir)
29 42
30PKG_PROG_PKG_CONFIG 43PKG_PROG_PKG_CONFIG
31 44
32AM_GNU_GETTEXT([external])
33AM_GNU_GETTEXT_VERSION(0.14)
34
35AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl) 45AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl)
36AC_SUBST(dlopen_libs) 46AC_SUBST(dlopen_libs)
37 47
@@ -68,5 +78,6 @@ Makefile
68src/Makefile 78src/Makefile
69src/module/Makefile 79src/module/Makefile
70module.desktop 80module.desktop
81$po_makefile_in
71], [ 82], [
72]) 83])