From aa8c9e68b1d22cbe13e9c9320df0ea9ce37e5c9a Mon Sep 17 00:00:00 2001
From: martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Date: Wed, 1 Dec 2010 23:18:09 +0000
Subject: [PATCH] Fix:Build:Fixed locale generation

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@3745 ffa7fe5e-494d-0410-b361-a75ebd5db220
---
 navit/cmake/navit_xml_parser_glade.cmake | 6 ++++++
 navit/navit/intl_cmake/CMakeLists.txt    | 2 +-
 navit/po/CMakeLists.txt                  | 7 +++++++
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 navit/cmake/navit_xml_parser_glade.cmake

diff --git a/navit/cmake/navit_xml_parser_glade.cmake b/navit/cmake/navit_xml_parser_glade.cmake
new file mode 100644
index 0000000..dc9616f
--- /dev/null
+++ b/navit/cmake/navit_xml_parser_glade.cmake
@@ -0,0 +1,6 @@
+file(READ "${SRC}" OUTPUT_LINES)
+string(REGEX REPLACE "vehicleprofile" "atkaction" OUTPUT_LINES "${OUTPUT_LINES}")
+string(REGEX REPLACE "name=" "description=" OUTPUT_LINES "${OUTPUT_LINES}")
+string(REGEX REPLACE "...CDATA" " " OUTPUT_LINES "${OUTPUT_LINES}")
+string(REGEX REPLACE "\\]\\]" "" OUTPUT_LINES "${OUTPUT_LINES}")
+file(WRITE ${DST} ${OUTPUT_LINES})
diff --git a/navit/navit/intl_cmake/CMakeLists.txt b/navit/navit/intl_cmake/CMakeLists.txt
index b166052..d1162a9 100644
--- a/navit/navit/intl_cmake/CMakeLists.txt
+++ b/navit/navit/intl_cmake/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_definitions(-DLOCALEDIR="${LOCALE_DIR}/locale" -DLOCALE_ALIAS_PATH=LOCALEDIR -DIN_LIBINTL=1 -DHAVE_CONFIG_H=1)
+add_definitions(-DLOCALEDIR="${LOCALE_DIR}/locale" -DLOCALE_ALIAS_PATH=LOCALEDIR -DIN_LIBINTL=1 -DHAVE_CONFIG_H=1 -DIN_LIBINTL -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DNO_XMALLOC -Dset_relocation_prefix=libintl_set_relocation_prefix -Drelocate=libintl_relocate -DDEPENDS_ON_LIBICONV=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/po/CMakeLists.txt b/navit/po/CMakeLists.txt
index a5557d6..a0f66b3 100644
--- a/navit/po/CMakeLists.txt
+++ b/navit/po/CMakeLists.txt
@@ -11,6 +11,7 @@ set(POTFILES
       ${PROJECT_SOURCE_DIR}/navit/gui/gtk/gui_gtk_statusbar.c
       ${PROJECT_SOURCE_DIR}/navit/gui/internal/gui_internal.c
       ${CMAKE_CURRENT_BINARY_DIR}/navit_shipped.c
+      ${CMAKE_CURRENT_BINARY_DIR}/navit_shipped.glade
 )     
 
 ADD_CUSTOM_COMMAND(
@@ -20,6 +21,12 @@ ADD_CUSTOM_COMMAND(
                      -P ${PROJECT_SOURCE_DIR}/cmake/navit_xml_parser.cmake
 )
 
+ADD_CUSTOM_COMMAND(
+   OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/navit_shipped.glade
+   DEPENDS ${PROJECT_SOURCE_DIR}/navit/navit_shipped.xml
+   COMMAND ${CMAKE_COMMAND} -D SRC=${PROJECT_SOURCE_DIR}/navit/navit_shipped.xml -D DST=${CMAKE_CURRENT_BINARY_DIR}/navit_shipped.glade
+                     -P ${PROJECT_SOURCE_DIR}/cmake/navit_xml_parser_glade.cmake
+)
 
 ADD_CUSTOM_COMMAND(
    OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/navit.po
-- 
2.7.4