diff options
-rw-r--r-- | CMakeLists.txt | 4 | ||||
-rw-r--r-- | config.h.cmake | 5 | ||||
-rw-r--r-- | navit/intl_cmake/CMakeLists.txt | 4 | ||||
-rw-r--r-- | navit/intl_cmake/ChangeLog (renamed from intl_cmake/ChangeLog) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/Makefile.in (renamed from intl_cmake/Makefile.in) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/VERSION (renamed from intl_cmake/VERSION) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/bindtextdom.c (renamed from intl_cmake/bindtextdom.c) | 0 | ||||
-rwxr-xr-x | navit/intl_cmake/config.charset (renamed from intl_cmake/config.charset) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/dcgettext.c (renamed from intl_cmake/dcgettext.c) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/dcigettext.c (renamed from intl_cmake/dcigettext.c) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/dcngettext.c (renamed from intl_cmake/dcngettext.c) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/dgettext.c (renamed from intl_cmake/dgettext.c) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/dngettext.c (renamed from intl_cmake/dngettext.c) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/eval-plural.h (renamed from intl_cmake/eval-plural.h) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/explodename.c (renamed from intl_cmake/explodename.c) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/finddomain.c (renamed from intl_cmake/finddomain.c) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/gettext.c (renamed from intl_cmake/gettext.c) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/gettextP.h (renamed from intl_cmake/gettextP.h) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/gmo.h (renamed from intl_cmake/gmo.h) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/hash-string.h (renamed from intl_cmake/hash-string.h) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/intl-compat.c (renamed from intl_cmake/intl-compat.c) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/l10nflist.c (renamed from intl_cmake/l10nflist.c) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/libgnuintl.h.in (renamed from intl_cmake/libgnuintl.h.in) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/loadinfo.h (renamed from intl_cmake/loadinfo.h) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/loadmsgcat.c (renamed from intl_cmake/loadmsgcat.c) | 3 | ||||
-rw-r--r-- | navit/intl_cmake/localcharset.c (renamed from intl_cmake/localcharset.c) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/localcharset.h (renamed from intl_cmake/localcharset.h) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/locale.alias (renamed from intl_cmake/locale.alias) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/localealias.c (renamed from intl_cmake/localealias.c) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/localename.c (renamed from intl_cmake/localename.c) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/log.c (renamed from intl_cmake/log.c) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/ngettext.c (renamed from intl_cmake/ngettext.c) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/os2compat.c (renamed from intl_cmake/os2compat.c) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/os2compat.h (renamed from intl_cmake/os2compat.h) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/osdep.c (renamed from intl_cmake/osdep.c) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/plural-exp.c (renamed from intl_cmake/plural-exp.c) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/plural-exp.h (renamed from intl_cmake/plural-exp.h) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/plural.c (renamed from intl_cmake/plural.c) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/plural.y (renamed from intl_cmake/plural.y) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/printf-args.c (renamed from intl_cmake/printf-args.c) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/printf-args.h (renamed from intl_cmake/printf-args.h) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/printf-parse.c (renamed from intl_cmake/printf-parse.c) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/printf-parse.h (renamed from intl_cmake/printf-parse.h) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/printf.c (renamed from intl_cmake/printf.c) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/ref-add.sin (renamed from intl_cmake/ref-add.sin) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/ref-del.sin (renamed from intl_cmake/ref-del.sin) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/relocatable.c (renamed from intl_cmake/relocatable.c) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/relocatable.h (renamed from intl_cmake/relocatable.h) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/textdomain.c (renamed from intl_cmake/textdomain.c) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/vasnprintf.c (renamed from intl_cmake/vasnprintf.c) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/vasnprintf.h (renamed from intl_cmake/vasnprintf.h) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/vasnwprintf.h (renamed from intl_cmake/vasnwprintf.h) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/wprintf-parse.h (renamed from intl_cmake/wprintf-parse.h) | 0 | ||||
-rw-r--r-- | navit/intl_cmake/xsize.h (renamed from intl_cmake/xsize.h) | 0 |
54 files changed, 15 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 32679392..996a82da 100644 --- a/CMakeLists.txt +++ b/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/config.h.cmake b/config.h.cmake index 3148ed76..703d433b 100644 --- a/config.h.cmake +++ b/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/intl_cmake/CMakeLists.txt b/navit/intl_cmake/CMakeLists.txt new file mode 100644 index 00000000..b1660525 --- /dev/null +++ b/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/intl_cmake/ChangeLog b/navit/intl_cmake/ChangeLog index 75129192..75129192 100644 --- a/intl_cmake/ChangeLog +++ b/navit/intl_cmake/ChangeLog diff --git a/intl_cmake/Makefile.in b/navit/intl_cmake/Makefile.in index 05f15329..05f15329 100644 --- a/intl_cmake/Makefile.in +++ b/navit/intl_cmake/Makefile.in diff --git a/intl_cmake/VERSION b/navit/intl_cmake/VERSION index b4b846ca..b4b846ca 100644 --- a/intl_cmake/VERSION +++ b/navit/intl_cmake/VERSION diff --git a/intl_cmake/bindtextdom.c b/navit/intl_cmake/bindtextdom.c index dcdc4008..dcdc4008 100644 --- a/intl_cmake/bindtextdom.c +++ b/navit/intl_cmake/bindtextdom.c diff --git a/intl_cmake/config.charset b/navit/intl_cmake/config.charset index 43d45fb7..43d45fb7 100755 --- a/intl_cmake/config.charset +++ b/navit/intl_cmake/config.charset diff --git a/intl_cmake/dcgettext.c b/navit/intl_cmake/dcgettext.c index 850acdee..850acdee 100644 --- a/intl_cmake/dcgettext.c +++ b/navit/intl_cmake/dcgettext.c diff --git a/intl_cmake/dcigettext.c b/navit/intl_cmake/dcigettext.c index 35238e2c..35238e2c 100644 --- a/intl_cmake/dcigettext.c +++ b/navit/intl_cmake/dcigettext.c diff --git a/intl_cmake/dcngettext.c b/navit/intl_cmake/dcngettext.c index 48a3e09e..48a3e09e 100644 --- a/intl_cmake/dcngettext.c +++ b/navit/intl_cmake/dcngettext.c diff --git a/intl_cmake/dgettext.c b/navit/intl_cmake/dgettext.c index b64b0f5d..b64b0f5d 100644 --- a/intl_cmake/dgettext.c +++ b/navit/intl_cmake/dgettext.c diff --git a/intl_cmake/dngettext.c b/navit/intl_cmake/dngettext.c index 7815637f..7815637f 100644 --- a/intl_cmake/dngettext.c +++ b/navit/intl_cmake/dngettext.c diff --git a/intl_cmake/eval-plural.h b/navit/intl_cmake/eval-plural.h index 01bd5af5..01bd5af5 100644 --- a/intl_cmake/eval-plural.h +++ b/navit/intl_cmake/eval-plural.h diff --git a/intl_cmake/explodename.c b/navit/intl_cmake/explodename.c index 52c25e72..52c25e72 100644 --- a/intl_cmake/explodename.c +++ b/navit/intl_cmake/explodename.c diff --git a/intl_cmake/finddomain.c b/navit/intl_cmake/finddomain.c index 4992a8c9..4992a8c9 100644 --- a/intl_cmake/finddomain.c +++ b/navit/intl_cmake/finddomain.c diff --git a/intl_cmake/gettext.c b/navit/intl_cmake/gettext.c index 92c42faa..92c42faa 100644 --- a/intl_cmake/gettext.c +++ b/navit/intl_cmake/gettext.c diff --git a/intl_cmake/gettextP.h b/navit/intl_cmake/gettextP.h index 4d66c3de..4d66c3de 100644 --- a/intl_cmake/gettextP.h +++ b/navit/intl_cmake/gettextP.h diff --git a/intl_cmake/gmo.h b/navit/intl_cmake/gmo.h index e7c9cc14..e7c9cc14 100644 --- a/intl_cmake/gmo.h +++ b/navit/intl_cmake/gmo.h diff --git a/intl_cmake/hash-string.h b/navit/intl_cmake/hash-string.h index 093e3b1c..093e3b1c 100644 --- a/intl_cmake/hash-string.h +++ b/navit/intl_cmake/hash-string.h diff --git a/intl_cmake/intl-compat.c b/navit/intl_cmake/intl-compat.c index 96f9d955..96f9d955 100644 --- a/intl_cmake/intl-compat.c +++ b/navit/intl_cmake/intl-compat.c diff --git a/intl_cmake/l10nflist.c b/navit/intl_cmake/l10nflist.c index eb995aaf..eb995aaf 100644 --- a/intl_cmake/l10nflist.c +++ b/navit/intl_cmake/l10nflist.c diff --git a/intl_cmake/libgnuintl.h.in b/navit/intl_cmake/libgnuintl.h.in index 3be7eb99..3be7eb99 100644 --- a/intl_cmake/libgnuintl.h.in +++ b/navit/intl_cmake/libgnuintl.h.in diff --git a/intl_cmake/loadinfo.h b/navit/intl_cmake/loadinfo.h index 65e5ebd1..65e5ebd1 100644 --- a/intl_cmake/loadinfo.h +++ b/navit/intl_cmake/loadinfo.h diff --git a/intl_cmake/loadmsgcat.c b/navit/intl_cmake/loadmsgcat.c index 99c51b4c..fd060b70 100644 --- a/intl_cmake/loadmsgcat.c +++ b/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/intl_cmake/localcharset.c b/navit/intl_cmake/localcharset.c index 4865f103..4865f103 100644 --- a/intl_cmake/localcharset.c +++ b/navit/intl_cmake/localcharset.c diff --git a/intl_cmake/localcharset.h b/navit/intl_cmake/localcharset.h index 3b137e73..3b137e73 100644 --- a/intl_cmake/localcharset.h +++ b/navit/intl_cmake/localcharset.h diff --git a/intl_cmake/locale.alias b/navit/intl_cmake/locale.alias index bd6bb256..bd6bb256 100644 --- a/intl_cmake/locale.alias +++ b/navit/intl_cmake/locale.alias diff --git a/intl_cmake/localealias.c b/navit/intl_cmake/localealias.c index 2eaf8813..2eaf8813 100644 --- a/intl_cmake/localealias.c +++ b/navit/intl_cmake/localealias.c diff --git a/intl_cmake/localename.c b/navit/intl_cmake/localename.c index 5662e54f..5662e54f 100644 --- a/intl_cmake/localename.c +++ b/navit/intl_cmake/localename.c diff --git a/intl_cmake/log.c b/navit/intl_cmake/log.c index cb6076e8..cb6076e8 100644 --- a/intl_cmake/log.c +++ b/navit/intl_cmake/log.c diff --git a/intl_cmake/ngettext.c b/navit/intl_cmake/ngettext.c index e73e00c4..e73e00c4 100644 --- a/intl_cmake/ngettext.c +++ b/navit/intl_cmake/ngettext.c diff --git a/intl_cmake/os2compat.c b/navit/intl_cmake/os2compat.c index c8dc33e7..c8dc33e7 100644 --- a/intl_cmake/os2compat.c +++ b/navit/intl_cmake/os2compat.c diff --git a/intl_cmake/os2compat.h b/navit/intl_cmake/os2compat.h index 4f74e8c0..4f74e8c0 100644 --- a/intl_cmake/os2compat.h +++ b/navit/intl_cmake/os2compat.h diff --git a/intl_cmake/osdep.c b/navit/intl_cmake/osdep.c index b3725983..b3725983 100644 --- a/intl_cmake/osdep.c +++ b/navit/intl_cmake/osdep.c diff --git a/intl_cmake/plural-exp.c b/navit/intl_cmake/plural-exp.c index 8c04e642..8c04e642 100644 --- a/intl_cmake/plural-exp.c +++ b/navit/intl_cmake/plural-exp.c diff --git a/intl_cmake/plural-exp.h b/navit/intl_cmake/plural-exp.h index 49e2c5bf..49e2c5bf 100644 --- a/intl_cmake/plural-exp.h +++ b/navit/intl_cmake/plural-exp.h diff --git a/intl_cmake/plural.c b/navit/intl_cmake/plural.c index 72494f9e..72494f9e 100644 --- a/intl_cmake/plural.c +++ b/navit/intl_cmake/plural.c diff --git a/intl_cmake/plural.y b/navit/intl_cmake/plural.y index 4d33bd7c..4d33bd7c 100644 --- a/intl_cmake/plural.y +++ b/navit/intl_cmake/plural.y diff --git a/intl_cmake/printf-args.c b/navit/intl_cmake/printf-args.c index f6f3219e..f6f3219e 100644 --- a/intl_cmake/printf-args.c +++ b/navit/intl_cmake/printf-args.c diff --git a/intl_cmake/printf-args.h b/navit/intl_cmake/printf-args.h index f11e64c0..f11e64c0 100644 --- a/intl_cmake/printf-args.h +++ b/navit/intl_cmake/printf-args.h diff --git a/intl_cmake/printf-parse.c b/navit/intl_cmake/printf-parse.c index d19f903d..d19f903d 100644 --- a/intl_cmake/printf-parse.c +++ b/navit/intl_cmake/printf-parse.c diff --git a/intl_cmake/printf-parse.h b/navit/intl_cmake/printf-parse.h index 8aec50e2..8aec50e2 100644 --- a/intl_cmake/printf-parse.h +++ b/navit/intl_cmake/printf-parse.h diff --git a/intl_cmake/printf.c b/navit/intl_cmake/printf.c index 878646c2..878646c2 100644 --- a/intl_cmake/printf.c +++ b/navit/intl_cmake/printf.c diff --git a/intl_cmake/ref-add.sin b/navit/intl_cmake/ref-add.sin index 167374e3..167374e3 100644 --- a/intl_cmake/ref-add.sin +++ b/navit/intl_cmake/ref-add.sin diff --git a/intl_cmake/ref-del.sin b/navit/intl_cmake/ref-del.sin index 613cf37f..613cf37f 100644 --- a/intl_cmake/ref-del.sin +++ b/navit/intl_cmake/ref-del.sin diff --git a/intl_cmake/relocatable.c b/navit/intl_cmake/relocatable.c index bf7c7085..bf7c7085 100644 --- a/intl_cmake/relocatable.c +++ b/navit/intl_cmake/relocatable.c diff --git a/intl_cmake/relocatable.h b/navit/intl_cmake/relocatable.h index 48c5b71e..48c5b71e 100644 --- a/intl_cmake/relocatable.h +++ b/navit/intl_cmake/relocatable.h diff --git a/intl_cmake/textdomain.c b/navit/intl_cmake/textdomain.c index 8745a843..8745a843 100644 --- a/intl_cmake/textdomain.c +++ b/navit/intl_cmake/textdomain.c diff --git a/intl_cmake/vasnprintf.c b/navit/intl_cmake/vasnprintf.c index 8a62282d..8a62282d 100644 --- a/intl_cmake/vasnprintf.c +++ b/navit/intl_cmake/vasnprintf.c diff --git a/intl_cmake/vasnprintf.h b/navit/intl_cmake/vasnprintf.h index 65f1bc13..65f1bc13 100644 --- a/intl_cmake/vasnprintf.h +++ b/navit/intl_cmake/vasnprintf.h diff --git a/intl_cmake/vasnwprintf.h b/navit/intl_cmake/vasnwprintf.h index d3cef4cb..d3cef4cb 100644 --- a/intl_cmake/vasnwprintf.h +++ b/navit/intl_cmake/vasnwprintf.h diff --git a/intl_cmake/wprintf-parse.h b/navit/intl_cmake/wprintf-parse.h index 24a2cfc2..24a2cfc2 100644 --- a/intl_cmake/wprintf-parse.h +++ b/navit/intl_cmake/wprintf-parse.h diff --git a/intl_cmake/xsize.h b/navit/intl_cmake/xsize.h index 362e24b7..362e24b7 100644 --- a/intl_cmake/xsize.h +++ b/navit/intl_cmake/xsize.h |