From 5f6f447b60e3499f55bc1a4548c184ba7ff498f2 Mon Sep 17 00:00:00 2001
From: martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Date: Wed, 15 Dec 2010 13:34:57 +0000
Subject: [PATCH] Fix:Build:Potential fix for win32 libintl.h confusion

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@3786 ffa7fe5e-494d-0410-b361-a75ebd5db220
---
 navit/CMakeLists.txt                | 1 +
 navit/config.h.cmake                | 1 +
 navit/navit/navit_nls.h             | 4 ++++
 navit/navit/support/glib/glibintl.h | 6 +++++-
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/navit/CMakeLists.txt b/navit/CMakeLists.txt
index 4927deb..4d1e9c9 100644
--- a/navit/CMakeLists.txt
+++ b/navit/CMakeLists.txt
@@ -252,6 +252,7 @@ if(WIN32 OR WINCE)
     endif(MSVC AND support/espeak)
     set(ENABLE_NLS TRUE)
     add_plugin(intl_cmake "windows detected" TRUE)
+    set(USE_LIBGNUINTL TRUE)
 endif()
 if (WIN32) 
     set(HAVE_API_WIN32 1)
diff --git a/navit/config.h.cmake b/navit/config.h.cmake
index 5616916..6692dbb 100644
--- a/navit/config.h.cmake
+++ b/navit/config.h.cmake
@@ -10,6 +10,7 @@
 #cmakedefine CACHE_SIZE @CACHE_SIZE@
 #cmakedefine AVOID_FLOAT 1
 #cmakedefine AVOID_UNALIGNED 1
+#cmakedefine USE_LIBGNUINTL 1
 
 /* Versions */
 #cmakedefine PACKAGE_VERSION "@PACKAGE_VERSION@"
diff --git a/navit/navit/navit_nls.h b/navit/navit/navit_nls.h
index d6ac7fe..560d871 100644
--- a/navit/navit/navit_nls.h
+++ b/navit/navit/navit_nls.h
@@ -2,7 +2,11 @@
 #include "config.h"
 
 #ifdef ENABLE_NLS
+#ifdef USE_LIBGNUINTL
+#include <libgnuintl.h>
+#else
 #include <libintl.h>
+#endif
 #define _(STRING)    gettext(STRING)
 #define gettext_noop(String) String
 #define _n(STRING)    gettext_noop(STRING)
diff --git a/navit/navit/support/glib/glibintl.h b/navit/navit/support/glib/glibintl.h
index 7899488..fb56e4f 100644
--- a/navit/navit/support/glib/glibintl.h
+++ b/navit/navit/support/glib/glibintl.h
@@ -11,7 +11,11 @@ G_CONST_RETURN gchar *glib_gettext (const gchar *str);
 
 #ifdef ENABLE_NLS
 
-#include <libintl.h>
+#include "navit_nls.h"
+#undef _
+#undef gettext_noop
+#undef _n
+
 #define _(String) glib_gettext(String)
 /* Split out this in the code, but keep it in the same domain for now */
 #define P_(String) glib_gettext(String)
-- 
2.7.4