diff options
| -rwxr-xr-x | CMakeLists.txt | 10 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | config.h.cmake | 2 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | navit/intl_cmake/relocatable.c | 4 | ||||
| -rw-r--r-- | navit/main.c | 2 | ||||
| -rw-r--r-- | navit/navit_nls.c | 8 | ||||
| -rw-r--r-- | navit/support/glib/glibintl.h | 2 |
8 files changed, 17 insertions, 17 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ab76ff3..569ffa81 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,7 +95,7 @@ add_module(vehicle/gpsd_dbus "dbus-glib-1 not found" FALSE) add_module(speech/speech_dispatcher "speech_dispatcher lib not found" FALSE) add_module(autoload/osso "Default" FALSE) add_module(map/garmin "Garmin library not found" FALSE) -add_feature(ENABLE_NLS "Gettext not found and not on Windows" FALSE) +add_feature(USE_NATIVE_LANGUAGE_SUPPORT "Gettext not found and not on Windows" FALSE) INCLUDE (CPack) INCLUDE (CheckIncludeFiles) @@ -353,7 +353,7 @@ if (LIBOSSO_FOUND) endif(LIBOSSO_FOUND) if (GETTEXT_FOUND) - set_with_reason(ENABLE_NLS "Gettext found" TRUE) + set_with_reason(USE_NATIVE_LANGUAGE_SUPPORT "Gettext found" TRUE) endif(GETTEXT_FOUND) #Independent modules @@ -488,7 +488,7 @@ if(WIN32 OR WINCE) set(HAVE_PRAGMA_PACK 1) add_plugin(support/xgetopt "Windows detected" TRUE) endif(MSVC) - set_with_reason(ENABLE_NLS "Windows detected" TRUE) + set_with_reason(USE_NATIVE_LANGUAGE_SUPPORT "Windows detected" TRUE) enable_language(RC) set(XSLTS "windows;${XSLTS}" CACHE STRING "define a semicolon seperated list of XSLTs to process") @@ -694,6 +694,6 @@ add_subdirectory (navit) add_subdirectory (man) -if (ENABLE_NLS) +if (USE_NATIVE_LANGUAGE_SUPPORT) add_subdirectory (po) -endif(ENABLE_NLS) +endif(USE_NATIVE_LANGUAGE_SUPPORT) diff --git a/Makefile.am b/Makefile.am index beed90e7..7bc7d34d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS= -I m4 include $(top_srcdir)/Makefile.inc SUBDIRS= -if ENABLE_NLS +if USE_NATIVE_LANGUAGE_SUPPORT XCFLAGS=-DINSTALLPREFIX=INSTALLDIR if SUPPORT_WIN32 XCFLAGS+=-DSUBLANG_BENGALI_BANGLADESH=0x03 -DSUBLANG_PUNJABI_PAKISTAN=0x03 -DSUBLANG_ROMANIAN_MOLDOVA=0x03 diff --git a/config.h.cmake b/config.h.cmake index 770b4a52..abc3d0eb 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -1,4 +1,4 @@ -#cmakedefine ENABLE_NLS 1 +#cmakedefine USE_NATIVE_LANGUAGE_SUPPORT 1 #cmakedefine HAVE_MALLOC_H 1 #cmakedefine HAVE_SYS_MOUNT_H 1 #cmakedefine HAVE_STDINT_H 1 diff --git a/configure.in b/configure.in index d2a17c6f..2361c413 100644 --- a/configure.in +++ b/configure.in @@ -777,7 +777,7 @@ if test "x$enable_nls" = "xyes"; then LINGUAS="$LINGUAS$lcode " done fi - AC_DEFINE(ENABLE_NLS, [1], [NLS Please]) + AC_DEFINE(USE_NATIVE_LANGUAGE_SUPPORT, [1], [NLS Please]) echo "xgettext and gettext() exist; will build i18n support for $LINGUAS" else LINGUAS="" @@ -813,7 +813,7 @@ if test x"$LIBINTL" != "x" ;then fi fi -AM_CONDITIONAL(ENABLE_NLS, [test "x$enable_nls" = "xyes"]) +AM_CONDITIONAL(USE_NATIVE_LANGUAGE_SUPPORT, [test "x$enable_nls" = "xyes"]) AM_CONDITIONAL(XGETTEXT_GLADE, [test "x$xgettext_glade" = "xyes"]) AC_CHECK_HEADER( byteswap.h, diff --git a/navit/intl_cmake/relocatable.c b/navit/intl_cmake/relocatable.c index bf7c7085..b49446f3 100644 --- a/navit/intl_cmake/relocatable.c +++ b/navit/intl_cmake/relocatable.c @@ -56,7 +56,7 @@ #if DEPENDS_ON_LIBICONV && HAVE_ICONV # include <iconv.h> #endif -#if DEPENDS_ON_LIBINTL && ENABLE_NLS +#if DEPENDS_ON_LIBINTL && USE_NATIVE_LANGUAGE_SUPPORT # include <libintl.h> #endif @@ -152,7 +152,7 @@ set_relocation_prefix (const char *orig_prefix_arg, const char *curr_prefix_arg) #if DEPENDS_ON_LIBICONV && HAVE_ICONV && _LIBICONV_VERSION >= 0x0109 libiconv_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg); #endif -#if DEPENDS_ON_LIBINTL && ENABLE_NLS && defined libintl_set_relocation_prefix +#if DEPENDS_ON_LIBINTL && USE_NATIVE_LANGUAGE_SUPPORT && defined libintl_set_relocation_prefix libintl_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg); #endif } diff --git a/navit/main.c b/navit/main.c index d6f21c33..efb1a714 100644 --- a/navit/main.c +++ b/navit/main.c @@ -415,7 +415,7 @@ main_init(const char *program) void main_init_nls(void) { -#ifdef ENABLE_NLS +#ifdef USE_NATIVE_LANGUAGE_SUPPORT #ifdef FORCE_LOCALE #define STRINGIFY2(x) #x #define STRINGIFY(x) STRINGIFY2(x) diff --git a/navit/navit_nls.c b/navit/navit_nls.c index 692d3dcd..5d4ccfbc 100644 --- a/navit/navit_nls.c +++ b/navit/navit_nls.c @@ -12,7 +12,7 @@ static GList *textdomains; char * navit_nls_add_textdomain(const char *package, const char *dir) { -#ifdef ENABLE_NLS +#ifdef USE_NATIVE_LANGUAGE_SUPPORT char *ret=bindtextdomain(package, dir); bind_textdomain_codeset(package, "UTF-8"); textdomains=g_list_append(textdomains, g_strdup(package)); @@ -23,7 +23,7 @@ navit_nls_add_textdomain(const char *package, const char *dir) void navit_nls_remove_textdomain(const char *package) { -#ifdef ENABLE_NLS +#ifdef USE_NATIVE_LANGUAGE_SUPPORT GList *i=textdomains; while (i) { if (!strcmp(i->data, package)) { @@ -39,7 +39,7 @@ navit_nls_remove_textdomain(const char *package) const char * navit_nls_gettext(const char *msgid) { -#ifdef ENABLE_NLS +#ifdef USE_NATIVE_LANGUAGE_SUPPORT GList *i=textdomains; while (i) { const char *ret=dgettext(i->data, msgid); @@ -54,7 +54,7 @@ navit_nls_gettext(const char *msgid) const char * navit_nls_ngettext(const char *msgid, const char *msgid_plural, unsigned long int n) { -#ifdef ENABLE_NLS +#ifdef USE_NATIVE_LANGUAGE_SUPPORT GList *i=textdomains; while (i) { const char *ret=dngettext(i->data, msgid, msgid_plural, n); diff --git a/navit/support/glib/glibintl.h b/navit/support/glib/glibintl.h index fb56e4f7..13af202c 100644 --- a/navit/support/glib/glibintl.h +++ b/navit/support/glib/glibintl.h @@ -9,7 +9,7 @@ G_CONST_RETURN gchar *glib_gettext (const gchar *str); -#ifdef ENABLE_NLS +#ifdef USE_NATIVE_LANGUAGE_SUPPORT #include "navit_nls.h" #undef _ |