okra pushed a commit to branch master.
http://git.enlightenment.org/apps/ephoto.git/commit/?id=a790f13308ea54bef1ef1d2d267f8d10c4834a93
commit a790f13308ea54bef1ef1d2d267f8d10c4834a93
Author: Stephen Houston <smhousto...@gmail.com>
Date: Mon Sep 25 10:20:08 2017 -0500
Update meson wrt to gettext and nls translations.
---
meson.build | 14 ++++++++------
po/meson.build | 2 --
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/meson.build b/meson.build
index aae480f..b068dd7 100644
--- a/meson.build
+++ b/meson.build
@@ -59,18 +59,20 @@ endif
##### Check for arpa/inet and netinet/in.h
if cc.has_header('arpa/inet.h') == true
cfg.set ('HAVE_ARPA_INET_H' , 1)
-else
- cfg.set ('HAVE_ARPA_INET_H' , 0)
endif
if cc.has_header('netinet/in.h') == true
cfg.set ('HAVE_NETINET_IN_H' , 1)
-else
- cfg.set ('HAVE_NETINET_IN_H' , 0)
endif
if exif.found() == true
cfg.set ('HAVE_LIBEXIF' , 1)
-else
- cfg.set ('HAVE_LIBEXIF' , 0)
+endif
+if get_option('nls') == true
+ if cc.has_header('locale.h') == true
+ if cc.has_header('libintl.h') == true
+ cfg.set ('HAVE_GETTEXT' , 1)
+ endif
+ endif
+ cfg.set ('ENABLE_NLS' , 1)
endif
configure_file(output: 'config.h', configuration: cfg)
diff --git a/po/meson.build b/po/meson.build
index e9bd647..ca521c7 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -1,6 +1,4 @@
if get_option('nls')
i18n = import('i18n')
i18n.gettext('ephoto')
- cfg = configuration_data()
- cfg.set('HAVE_GETTEXT', '1')
endif
--
