Fix:Core:Added missing file to glib Makefile, force linking of g_utf8_strlen

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

diff --git a/navit/navit/support/glib/Makefile.am b/navit/navit/support/glib/Makefile.am
index d32f4f8..6412cbd 100644 (file)
--- a/navit/navit/support/glib/Makefile.am
+++ b/navit/navit/support/glib/Makefile.am
@@ -3,7 +3,7 @@ AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -I$(top_srcdir)/navit/support
 noinst_LTLIBRARIES = libsupport_glib.la
 libsupport_glib_la_SOURCES = fake.c galiasdef.c gatomic.c gerror.c \
   ghash.c glib_init.c glist.c gmem.c gmessages.c gprimes.c gprintf.c gslice.c \
-  gstrfuncs.c gstring.c gutils.c \
+  gstrfuncs.c gstring.c gutils.c gutf8.c \
   fake.h galias.h gerror.h ghash.h glib.h glibconfig.h glibintl.h glist.h \
   gmacros.h gmem.h gmessages.h gprintf.h gprintfint.h gquark.h gslice.h \
   gstrfuncs.h gthreadprivate.h gtypes.h

diff --git a/navit/navit/util.c b/navit/navit/util.c
index fa74a07..ec26896 100644 (file)
--- a/navit/navit/util.c
+++ b/navit/navit/util.c
@@ -72,6 +72,15 @@ g_strconcat_printf(gchar *buffer, gchar *fmt, ...)
        return ret;
 }
 
+#ifndef HAVE_GLIB
+int g_utf8_strlen_force_link(gchar *buffer, int max);
+int
+g_utf8_strlen_force_link(gchar *buffer, int max)
+{
+       return g_utf8_strlen(buffer, max);
+}
+#endif
+
 #if defined(_WIN32) || defined(__CEGCC__)
 #include <windows.h>
 #include <stdio.h>