Fix:Build:WIN32 NLS Build issues

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@3776 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/CMakeLists.txt b/navit/CMakeLists.txt
index b38765b..a1f939b 100644 (file)
--- a/navit/CMakeLists.txt
+++ b/navit/CMakeLists.txt
@@ -19,6 +19,7 @@ ENDIF(NOT CMAKE_BUILD_TYPE)
 INCLUDE (CPack)
 INCLUDE (CheckIncludeFiles)
 INCLUDE (CheckLibraryExists)
+INCLUDE (CheckFunctionExists)
 find_package(Glib)
 find_package(ZLIB)
 find_package(Freetype)
@@ -295,6 +296,7 @@ endif(USE_PLUGINS)
 
 CHECK_INCLUDE_FILES (malloc.h HAVE_MALLOC_H)
 CHECK_INCLUDE_FILES ("sys/param.h;sys/mount.h" HAVE_SYS_MOUNT_H)
+CHECK_FUNCTION_EXISTS (getcwd HAVE_GETCWD)
 #CHECK_INCLUDE_FILES (windows.h HAVE_API_WIN32_BASE)
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 

diff --git a/navit/config.h.cmake b/navit/config.h.cmake
index 703d433..03c917f 100644 (file)
--- a/navit/config.h.cmake
+++ b/navit/config.h.cmake
@@ -6,6 +6,7 @@
 #cmakedefine HAVE_API_WIN32 1
 #cmakedefine HAVE_API_WIN32_CE 1
 #cmakedefine HAVE_GLIB 1
+#cmakedefine HAVE_GETCWD 1
 #cmakedefine CACHE_SIZE @CACHE_SIZE@
 #cmakedefine AVOID_FLOAT 1
 #cmakedefine AVOID_UNALIGNED 1

diff --git a/navit/navit/intl_cmake/localename.c b/navit/navit/intl_cmake/localename.c
index 5662e54..20852bf 100644 (file)
--- a/navit/navit/intl_cmake/localename.c
+++ b/navit/navit/intl_cmake/localename.c
@@ -1020,7 +1020,9 @@ _nl_locale_name (int category, const char *categoryname)
       switch (sub)
        {
        case SUBLANG_PUNJABI_INDIA: return "pa_IN"; /* Gurmukhi script */
+#if 0 /* FIXME */
        case SUBLANG_PUNJABI_PAKISTAN: return "pa_PK"; /* Arabic script */
+#endif
        }
       return "pa";
     case LANG_RHAETO_ROMANCE: return "rm_CH";
@@ -1028,7 +1030,9 @@ _nl_locale_name (int category, const char *categoryname)
       switch (sub)
        {
        case SUBLANG_ROMANIAN_ROMANIA: return "ro_RO";
+#if 0 /* FIXME */
        case SUBLANG_ROMANIAN_MOLDOVA: return "ro_MD";
+#endif
        }
       return "ro";
     case LANG_RUSSIAN: