From 74fa01a0e2ab8337cd4907e3daa72732e06e0971 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
<francois.grisez@belledonne-communications.com>
Date: Tue, 7 Jul 2015 14:00:32 +0200
Subject: [PATCH] Define ENABLE_NLS instead of HAVE_INTL when
internationalization is available
---
config.h.cmake | 2 +-
console/linphonec.c | 4 ++--
coreapi/misc.c | 2 +-
coreapi/private.h | 2 +-
gtk/linphone.h | 2 +-
gtk/main.c | 6 +++---
intl/libgettext.h | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/config.h.cmake b/config.h.cmake
index 6c5a2da15f..831bfe181d 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -42,4 +42,4 @@
#cmakedefine HAVE_ZLIB 1
#cmakedefine HAVE_CU_GET_SUITE 1
#cmakedefine HAVE_CU_CURSES 1
-#cmakedefine HAVE_INTL 1
+#cmakedefine ENABLE_NLS 1
diff --git a/console/linphonec.c b/console/linphonec.c
index 718a3fd735..78dd1e0192 100644
--- a/console/linphonec.c
+++ b/console/linphonec.c
@@ -65,7 +65,7 @@
#endif /*_WIN32_WCE*/
-#ifdef HAVE_INTL
+#ifdef ENABLE_NLS
#include <libintl.h>
#ifndef _
#define _(String) gettext(String)
@@ -714,7 +714,7 @@ linphonec_init(int argc, char **argv)
default:
break;
}
-#ifdef HAVE_INTL
+#ifdef ENABLE_NLS
if (NULL == bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR))
perror ("bindtextdomain failed");
#ifndef __ARM__
diff --git a/coreapi/misc.c b/coreapi/misc.c
index 784d85a66d..afa04f9bd9 100644
--- a/coreapi/misc.c
+++ b/coreapi/misc.c
@@ -96,7 +96,7 @@ void linphone_core_set_payload_type_number(LinphoneCore *lc, PayloadType *pt, in
const char *linphone_core_get_payload_type_description(LinphoneCore *lc, PayloadType *pt){
if (ms_filter_codec_supported(pt->mime_type)){
MSFilterDesc *desc=ms_filter_get_encoder(pt->mime_type);
-#ifdef HAVE_INTL
+#ifdef ENABLE_NLS
return dgettext("mediastreamer",desc->text);
#else
return desc->text;
diff --git a/coreapi/private.h b/coreapi/private.h
index c421e13336..f6a3ef1315 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -65,7 +65,7 @@ extern "C" {
#define PACKAGE_DATA_DIR "."
#endif
-#ifdef HAVE_INTL
+#ifdef ENABLE_NLS
#include <libintl.h>
#ifndef _
#define _(String) dgettext(GETTEXT_PACKAGE,String)
diff --git a/gtk/linphone.h b/gtk/linphone.h
index 44b17a8ed7..b4bbf02c2a 100644
--- a/gtk/linphone.h
+++ b/gtk/linphone.h
@@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "ldap/ldapprovider.h"
-#ifdef HAVE_INTL
+#ifdef ENABLE_NLS
# include <libintl.h>
# undef _
# define _(String) dgettext (GETTEXT_PACKAGE,String)
diff --git a/gtk/main.c b/gtk/main.c
index eab4acccd4..e936853f95 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -51,7 +51,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <libnotify/notify.h>
#endif
-#ifdef HAVE_INTL
+#ifdef ENABLE_NLS
#include <locale.h>
#endif
@@ -2098,7 +2098,7 @@ int main(int argc, char *argv[]){
g_setenv("LANGUAGE",lang,1);
}
-#ifdef HAVE_INTL
+#ifdef ENABLE_NLS
setlocale(LC_ALL, "");
bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
@@ -2148,7 +2148,7 @@ int main(int argc, char *argv[]){
}
}
-#if defined(__APPLE__) && defined(HAVE_INTL)
+#if defined(__APPLE__) && defined(ENABLE_NLS)
/*workaround for bundles. GTK is unable to find translations in the bundle (obscure bug again).
So we help it:*/
{
diff --git a/intl/libgettext.h b/intl/libgettext.h
index eb5912085a..c5be54a80a 100644
--- a/intl/libgettext.h
+++ b/intl/libgettext.h
@@ -20,7 +20,7 @@
#define _LIBGETTEXT_H 1
/* NLS can be disabled through the configure --disable-nls option. */
-#if HAVE_INTL
+#if ENABLE_NLS
/* Get declarations of GNU message catalog functions. */
# include <libintl.h>
--
GitLab