From 048c5cb8251c2fbaa237e55fe1364c9907d6407f Mon Sep 17 00:00:00 2001
From: Boris Faure <billiob@gmail.com>
Date: Mon, 8 Jul 2019 00:06:51 +0200
Subject: [PATCH] clean up mess with libintl

The header must exist, the lib itself may not
---
 meson.build              | 2 +-
 po/meson.build           | 1 -
 src/bin/keyin.c          | 2 +-
 src/bin/main.c           | 8 ++++----
 src/bin/options_colors.c | 4 ++--
 src/bin/private.h        | 2 +-
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/meson.build b/meson.build
index 77e521b8..ea95b5cd 100644
--- a/meson.build
+++ b/meson.build
@@ -63,7 +63,7 @@ edj_files = []
 
 if get_option('nls') == true
   subdir('po')
-  terminology_dependencies += cc.find_library('intl', required: true)
+   terminology_dependencies += cc.find_library('intl', required: false)
 endif
 
 foreach efl_dep: efl_deps
diff --git a/po/meson.build b/po/meson.build
index 498bbb18..fc9cf03a 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -28,6 +28,5 @@ if get_option('nls')
                 '--from-code=UTF-8',
                 '--foreign-user'
                 ])
-  config_data.set('HAVE_GETTEXT', '1')
   config_data.set('ENABLE_NLS', '1')
 endif
diff --git a/src/bin/keyin.c b/src/bin/keyin.c
index 4969465a..60dd646f 100644
--- a/src/bin/keyin.c
+++ b/src/bin/keyin.c
@@ -850,7 +850,7 @@ key_bindings_load(Config *config)
 
    if (!_key_bindings)
      {
-#if HAVE_GETTEXT && ENABLE_NLS
+#if ENABLE_NLS
         Shortcut_Action *action = _actions;
 
         while (action->action)
diff --git a/src/bin/main.c b/src/bin/main.c
index b511c785..9e773860 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -418,7 +418,7 @@ static Ecore_Getopt options = {
    }
 };
 
-#if HAVE_GETTEXT && ENABLE_NLS
+#if ENABLE_NLS
 static void
 _translate_options(void)
 {
@@ -559,12 +559,12 @@ elm_main(int argc, char **argv)
    elm_app_compile_bin_dir_set(PACKAGE_BIN_DIR);
    elm_app_compile_lib_dir_set(PACKAGE_LIB_DIR);
    elm_app_compile_data_dir_set(PACKAGE_DATA_DIR);
-#if HAVE_GETTEXT && ENABLE_NLS
+#if ENABLE_NLS
    elm_app_compile_locale_set(LOCALEDIR);
 #endif
    elm_app_info_set(elm_main, "terminology", "themes/default.edj");
 
-#if HAVE_GETTEXT && ENABLE_NLS
+#if ENABLE_NLS
    bindtextdomain(PACKAGE, elm_app_locale_dir_get());
    textdomain(PACKAGE);
    _translate_options();
@@ -1002,7 +1002,7 @@ remote:
    _log_domain = -1;
 
 
-#if HAVE_GETTEXT && ENABLE_NLS
+#if ENABLE_NLS
    eina_stringshare_del(options.copyright);
 #endif
 
diff --git a/src/bin/options_colors.c b/src/bin/options_colors.c
index f3b56a8b..62b16406 100644
--- a/src/bin/options_colors.c
+++ b/src/bin/options_colors.c
@@ -60,7 +60,7 @@ _cb_op_color_item_sel(void *data,
                continue;
              if (ctx->colitem[j][i] == it)
                elm_object_text_set(ctx->label,
-#if HAVE_GETTEXT && ENABLE_NLS
+#if ENABLE_NLS
                                    gettext(mapping_names[i])
 #else
                                    mapping_names[i]
@@ -326,7 +326,7 @@ options_colors(Evas_Object *opbox, Evas_Object *term, Evas_Object *bg)
 
    ctx->label = o = elm_label_add(opbox);
    elm_object_text_set(o,
-#if HAVE_GETTEXT && ENABLE_NLS
+#if ENABLE_NLS
                        gettext(mapping_names[0])
 #else
                        mapping_names[0]
diff --git a/src/bin/private.h b/src/bin/private.h
index ea88d5e2..6ea706d6 100644
--- a/src/bin/private.h
+++ b/src/bin/private.h
@@ -5,7 +5,7 @@
 #include "terminology_config.h"
 #endif
 
-#if HAVE_GETTEXT && ENABLE_NLS
+#if ENABLE_NLS
 #include <libintl.h>
 #define _(string) gettext (string)
 #else