Fix:Build:Made intl for cmake functional

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

diff --git a/navit/CMakeLists.txt b/navit/CMakeLists.txt
index 3267939..996a82d 100644 (file)
--- a/navit/CMakeLists.txt
+++ b/navit/CMakeLists.txt
@@ -5,6 +5,7 @@ cmake_policy(VERSION 2.6)
 
 set(PACKAGE_VERSION "0.5.0")
 set(PACKAGE_NAME "navit-svn")
+set(PACKAGE "navit")
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
 include("${PROJECT_SOURCE_DIR}/cmake/navit_macros.cmake")
@@ -41,6 +42,7 @@ if(PKG_CONFIG_FOUND)
 endif(PKG_CONFIG_FOUND)
 #Simple checks
 CHECK_INCLUDE_FILES(wordexp.h HAVE_WORDEXP)
+CHECK_INCLUDE_FILES(stdint.h HAVE_STDINT_H)
 CHECK_LIBRARY_EXISTS(gypsy gypsy_control_get_default "" GYPSY_FOUND)
 CHECK_INCLUDE_FILES(libspeechd.h HAVE_LIBSPEECHD)
 
@@ -254,8 +256,10 @@ if (WIN32)
 endif()
 if(WINCE)
     add_plugin(support/libc "wince detected" TRUE)
+    add_plugin(intl_cmake "wince detected" TRUE)
     set(HAVE_API_WIN32_CE 1)
     set(BUILD_MAPTOOL FALSE)
+    set(ENABLE_NLS TRUE)
 endif()
 
 

diff --git a/navit/config.h.cmake b/navit/config.h.cmake
index 3148ed7..703d433 100644 (file)
--- a/navit/config.h.cmake
+++ b/navit/config.h.cmake
@@ -1,5 +1,7 @@
+#cmakedefine ENABLE_NLS 1
 #cmakedefine HAVE_MALLOC_H 1
-#cmakedefine HAVE_SYS_MOUNT_H
+#cmakedefine HAVE_SYS_MOUNT_H 1
+#cmakedefine HAVE_STDINT_H 1
 #cmakedefine HAVE_API_WIN32_BASE 1
 #cmakedefine HAVE_API_WIN32 1
 #cmakedefine HAVE_API_WIN32_CE 1
@@ -11,6 +13,7 @@
 /* Versions */
 #cmakedefine PACKAGE_VERSION "@PACKAGE_VERSION@"
 #cmakedefine PACKAGE_NAME "@PACKAGE_NAME@"
+#cmakedefine PACKAGE "@PACKAGE@"
 
 #cmakedefine HAVE_ZLIB 1
 

diff --git a/navit/navit/intl_cmake/CMakeLists.txt b/navit/navit/intl_cmake/CMakeLists.txt
new file mode 100644 (file)
index 0000000..b166052
--- /dev/null
+++ b/navit/navit/intl_cmake/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_definitions(-DLOCALEDIR="${LOCALE_DIR}/locale" -DLOCALE_ALIAS_PATH=LOCALEDIR -DIN_LIBINTL=1 -DHAVE_CONFIG_H=1)
+supportlib_add_library(intl_cmake bindtextdom.c dcgettext.c dcigettext.c dcngettext.c dgettext.c dngettext.c explodename.c finddomain.c gettext.c intl-compat.c l10nflist.c loadmsgcat.c localcharset.c localealias.c localename.c log.c ngettext.c osdep.c plural-exp.c plural.c printf-args.c printf.c relocatable.c textdomain.c vasnprintf.c)
+ADD_CUSTOM_TARGET(libintl.h DEPENDS libgnuintl.h COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/libgnuintl.h ${CMAKE_CURRENT_BINARY_DIR}/libintl.h)
+ADD_DEPENDENCIES(intl_cmake libintl.h)

diff --git a/navit/intl_cmake/ChangeLog b/navit/navit/intl_cmake/ChangeLog
similarity index 100%
rename from navit/intl_cmake/ChangeLog
rename to navit/navit/intl_cmake/ChangeLog

diff --git a/navit/intl_cmake/Makefile.in b/navit/navit/intl_cmake/Makefile.in
similarity index 100%
rename from navit/intl_cmake/Makefile.in
rename to navit/navit/intl_cmake/Makefile.in

diff --git a/navit/intl_cmake/VERSION b/navit/navit/intl_cmake/VERSION
similarity index 100%
rename from navit/intl_cmake/VERSION
rename to navit/navit/intl_cmake/VERSION

diff --git a/navit/intl_cmake/bindtextdom.c b/navit/navit/intl_cmake/bindtextdom.c
similarity index 100%
rename from navit/intl_cmake/bindtextdom.c
rename to navit/navit/intl_cmake/bindtextdom.c

diff --git a/navit/intl_cmake/config.charset b/navit/navit/intl_cmake/config.charset
similarity index 100%
rename from navit/intl_cmake/config.charset
rename to navit/navit/intl_cmake/config.charset

diff --git a/navit/intl_cmake/dcgettext.c b/navit/navit/intl_cmake/dcgettext.c
similarity index 100%
rename from navit/intl_cmake/dcgettext.c
rename to navit/navit/intl_cmake/dcgettext.c

diff --git a/navit/intl_cmake/dcigettext.c b/navit/navit/intl_cmake/dcigettext.c
similarity index 100%
rename from navit/intl_cmake/dcigettext.c
rename to navit/navit/intl_cmake/dcigettext.c

diff --git a/navit/intl_cmake/dcngettext.c b/navit/navit/intl_cmake/dcngettext.c
similarity index 100%
rename from navit/intl_cmake/dcngettext.c
rename to navit/navit/intl_cmake/dcngettext.c

diff --git a/navit/intl_cmake/dgettext.c b/navit/navit/intl_cmake/dgettext.c
similarity index 100%
rename from navit/intl_cmake/dgettext.c
rename to navit/navit/intl_cmake/dgettext.c

diff --git a/navit/intl_cmake/dngettext.c b/navit/navit/intl_cmake/dngettext.c
similarity index 100%
rename from navit/intl_cmake/dngettext.c
rename to navit/navit/intl_cmake/dngettext.c

diff --git a/navit/intl_cmake/eval-plural.h b/navit/navit/intl_cmake/eval-plural.h
similarity index 100%
rename from navit/intl_cmake/eval-plural.h
rename to navit/navit/intl_cmake/eval-plural.h

diff --git a/navit/intl_cmake/explodename.c b/navit/navit/intl_cmake/explodename.c
similarity index 100%
rename from navit/intl_cmake/explodename.c
rename to navit/navit/intl_cmake/explodename.c

diff --git a/navit/intl_cmake/finddomain.c b/navit/navit/intl_cmake/finddomain.c
similarity index 100%
rename from navit/intl_cmake/finddomain.c
rename to navit/navit/intl_cmake/finddomain.c

diff --git a/navit/intl_cmake/gettext.c b/navit/navit/intl_cmake/gettext.c
similarity index 100%
rename from navit/intl_cmake/gettext.c
rename to navit/navit/intl_cmake/gettext.c

diff --git a/navit/intl_cmake/gettextP.h b/navit/navit/intl_cmake/gettextP.h
similarity index 100%
rename from navit/intl_cmake/gettextP.h
rename to navit/navit/intl_cmake/gettextP.h

diff --git a/navit/intl_cmake/gmo.h b/navit/navit/intl_cmake/gmo.h
similarity index 100%
rename from navit/intl_cmake/gmo.h
rename to navit/navit/intl_cmake/gmo.h

diff --git a/navit/intl_cmake/hash-string.h b/navit/navit/intl_cmake/hash-string.h
similarity index 100%
rename from navit/intl_cmake/hash-string.h
rename to navit/navit/intl_cmake/hash-string.h

diff --git a/navit/intl_cmake/intl-compat.c b/navit/navit/intl_cmake/intl-compat.c
similarity index 100%
rename from navit/intl_cmake/intl-compat.c
rename to navit/navit/intl_cmake/intl-compat.c

diff --git a/navit/intl_cmake/l10nflist.c b/navit/navit/intl_cmake/l10nflist.c
similarity index 100%
rename from navit/intl_cmake/l10nflist.c
rename to navit/navit/intl_cmake/l10nflist.c

diff --git a/navit/intl_cmake/libgnuintl.h.in b/navit/navit/intl_cmake/libgnuintl.h.in
similarity index 100%
rename from navit/intl_cmake/libgnuintl.h.in
rename to navit/navit/intl_cmake/libgnuintl.h.in

diff --git a/navit/intl_cmake/loadinfo.h b/navit/navit/intl_cmake/loadinfo.h
similarity index 100%
rename from navit/intl_cmake/loadinfo.h
rename to navit/navit/intl_cmake/loadinfo.h

diff --git a/navit/intl_cmake/loadmsgcat.c b/navit/navit/intl_cmake/loadmsgcat.c
similarity index 99%
rename from navit/intl_cmake/loadmsgcat.c
rename to navit/navit/intl_cmake/loadmsgcat.c
index 99c51b4..fd060b7 100644 (file)
--- a/navit/intl_cmake/loadmsgcat.c
+++ b/navit/navit/intl_cmake/loadmsgcat.c
@@ -57,6 +57,9 @@ char *alloca ();
 #endif
 
 #include <stdlib.h>
+#if HAVE_STDINT_H
+#include <stdint.h>
+#endif
 #include <string.h>
 
 #if defined HAVE_UNISTD_H || defined _LIBC

diff --git a/navit/intl_cmake/localcharset.c b/navit/navit/intl_cmake/localcharset.c
similarity index 100%
rename from navit/intl_cmake/localcharset.c
rename to navit/navit/intl_cmake/localcharset.c

diff --git a/navit/intl_cmake/localcharset.h b/navit/navit/intl_cmake/localcharset.h
similarity index 100%
rename from navit/intl_cmake/localcharset.h
rename to navit/navit/intl_cmake/localcharset.h

diff --git a/navit/intl_cmake/locale.alias b/navit/navit/intl_cmake/locale.alias
similarity index 100%
rename from navit/intl_cmake/locale.alias
rename to navit/navit/intl_cmake/locale.alias

diff --git a/navit/intl_cmake/localealias.c b/navit/navit/intl_cmake/localealias.c
similarity index 100%
rename from navit/intl_cmake/localealias.c
rename to navit/navit/intl_cmake/localealias.c

diff --git a/navit/intl_cmake/localename.c b/navit/navit/intl_cmake/localename.c
similarity index 100%
rename from navit/intl_cmake/localename.c
rename to navit/navit/intl_cmake/localename.c

diff --git a/navit/intl_cmake/log.c b/navit/navit/intl_cmake/log.c
similarity index 100%
rename from navit/intl_cmake/log.c
rename to navit/navit/intl_cmake/log.c

diff --git a/navit/intl_cmake/ngettext.c b/navit/navit/intl_cmake/ngettext.c
similarity index 100%
rename from navit/intl_cmake/ngettext.c
rename to navit/navit/intl_cmake/ngettext.c

diff --git a/navit/intl_cmake/os2compat.c b/navit/navit/intl_cmake/os2compat.c
similarity index 100%
rename from navit/intl_cmake/os2compat.c
rename to navit/navit/intl_cmake/os2compat.c

diff --git a/navit/intl_cmake/os2compat.h b/navit/navit/intl_cmake/os2compat.h
similarity index 100%
rename from navit/intl_cmake/os2compat.h
rename to navit/navit/intl_cmake/os2compat.h

diff --git a/navit/intl_cmake/osdep.c b/navit/navit/intl_cmake/osdep.c
similarity index 100%
rename from navit/intl_cmake/osdep.c
rename to navit/navit/intl_cmake/osdep.c

diff --git a/navit/intl_cmake/plural-exp.c b/navit/navit/intl_cmake/plural-exp.c
similarity index 100%
rename from navit/intl_cmake/plural-exp.c
rename to navit/navit/intl_cmake/plural-exp.c

diff --git a/navit/intl_cmake/plural-exp.h b/navit/navit/intl_cmake/plural-exp.h
similarity index 100%
rename from navit/intl_cmake/plural-exp.h
rename to navit/navit/intl_cmake/plural-exp.h

diff --git a/navit/intl_cmake/plural.c b/navit/navit/intl_cmake/plural.c
similarity index 100%
rename from navit/intl_cmake/plural.c
rename to navit/navit/intl_cmake/plural.c

diff --git a/navit/intl_cmake/plural.y b/navit/navit/intl_cmake/plural.y
similarity index 100%
rename from navit/intl_cmake/plural.y
rename to navit/navit/intl_cmake/plural.y

diff --git a/navit/intl_cmake/printf-args.c b/navit/navit/intl_cmake/printf-args.c
similarity index 100%
rename from navit/intl_cmake/printf-args.c
rename to navit/navit/intl_cmake/printf-args.c

diff --git a/navit/intl_cmake/printf-args.h b/navit/navit/intl_cmake/printf-args.h
similarity index 100%
rename from navit/intl_cmake/printf-args.h
rename to navit/navit/intl_cmake/printf-args.h

diff --git a/navit/intl_cmake/printf-parse.c b/navit/navit/intl_cmake/printf-parse.c
similarity index 100%
rename from navit/intl_cmake/printf-parse.c
rename to navit/navit/intl_cmake/printf-parse.c

diff --git a/navit/intl_cmake/printf-parse.h b/navit/navit/intl_cmake/printf-parse.h
similarity index 100%
rename from navit/intl_cmake/printf-parse.h
rename to navit/navit/intl_cmake/printf-parse.h

diff --git a/navit/intl_cmake/printf.c b/navit/navit/intl_cmake/printf.c
similarity index 100%
rename from navit/intl_cmake/printf.c
rename to navit/navit/intl_cmake/printf.c

diff --git a/navit/intl_cmake/ref-add.sin b/navit/navit/intl_cmake/ref-add.sin
similarity index 100%
rename from navit/intl_cmake/ref-add.sin
rename to navit/navit/intl_cmake/ref-add.sin

diff --git a/navit/intl_cmake/ref-del.sin b/navit/navit/intl_cmake/ref-del.sin
similarity index 100%
rename from navit/intl_cmake/ref-del.sin
rename to navit/navit/intl_cmake/ref-del.sin

diff --git a/navit/intl_cmake/relocatable.c b/navit/navit/intl_cmake/relocatable.c
similarity index 100%
rename from navit/intl_cmake/relocatable.c
rename to navit/navit/intl_cmake/relocatable.c

diff --git a/navit/intl_cmake/relocatable.h b/navit/navit/intl_cmake/relocatable.h
similarity index 100%
rename from navit/intl_cmake/relocatable.h
rename to navit/navit/intl_cmake/relocatable.h

diff --git a/navit/intl_cmake/textdomain.c b/navit/navit/intl_cmake/textdomain.c
similarity index 100%
rename from navit/intl_cmake/textdomain.c
rename to navit/navit/intl_cmake/textdomain.c

diff --git a/navit/intl_cmake/vasnprintf.c b/navit/navit/intl_cmake/vasnprintf.c
similarity index 100%
rename from navit/intl_cmake/vasnprintf.c
rename to navit/navit/intl_cmake/vasnprintf.c

diff --git a/navit/intl_cmake/vasnprintf.h b/navit/navit/intl_cmake/vasnprintf.h
similarity index 100%
rename from navit/intl_cmake/vasnprintf.h
rename to navit/navit/intl_cmake/vasnprintf.h

diff --git a/navit/intl_cmake/vasnwprintf.h b/navit/navit/intl_cmake/vasnwprintf.h
similarity index 100%
rename from navit/intl_cmake/vasnwprintf.h
rename to navit/navit/intl_cmake/vasnwprintf.h

diff --git a/navit/intl_cmake/wprintf-parse.h b/navit/navit/intl_cmake/wprintf-parse.h
similarity index 100%
rename from navit/intl_cmake/wprintf-parse.h
rename to navit/navit/intl_cmake/wprintf-parse.h

diff --git a/navit/intl_cmake/xsize.h b/navit/navit/intl_cmake/xsize.h
similarity index 100%
rename from navit/intl_cmake/xsize.h
rename to navit/navit/intl_cmake/xsize.h