Fix:Core:Make gui_internal compile without glib

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

diff --git a/configure.in b/configure.in
index add2366..a328d94 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -102,7 +102,6 @@ else
        GLIB_CFLAGS="-I\$(top_srcdir)/navit/support -I\$(top_srcdir)/navit/support/glib -I\$(top_srcdir)/navit/support/ezxml"
        GLIB_LIBS="-L\$(top_builddir)/navit/support/glib -lsupport_glib -L\$(top_builddir)/navit/support/ezxml -lsupport_ezxml"
        speech_cmdline=no; speech_cmdline_reason="not yet supported without glib"
-       gui_internal=no; gui_internal_reason="not yet supported without glib"
        vehicle_demo=no; vehicle_demo_reason="not yet supported without glib"
        vehicle_file=no; vehicle_file_reason="not yet supported without glib"
 fi

diff --git a/navit/file.h b/navit/file.h
index bf05b6c..01c4c3f 100644 (file)
--- a/navit/file.h
+++ b/navit/file.h
@@ -20,6 +20,9 @@
 #ifndef NAVIT_FILE_H
 #define NAVIT_FILE_H
 
+#ifndef PATH_MAX
+#define PATH_MAX 4096
+#endif
 #ifndef __CEGCC__
 #include <time.h>
 #endif

diff --git a/navit/graphics.c b/navit/graphics.c
index 97acd90..dbe5573 100644 (file)
--- a/navit/graphics.c
+++ b/navit/graphics.c
@@ -46,6 +46,7 @@
 #include "route.h"
 #include "util.h"
 #include "callback.h"
+#include "file.h"
 
 static char *navit_sharedir;
 

diff --git a/navit/main.c b/navit/main.c
index c20c763..1b65c71 100644 (file)
--- a/navit/main.c
+++ b/navit/main.c
@@ -145,9 +145,6 @@ main_init(char *program)
        setlocale(LC_ALL,"");
        setlocale(LC_NUMERIC,"C");
        if (file_exists("navit.c") || file_exists("navit.o") || file_exists("navit.lo")) {
-#ifndef PATH_MAX
-#define PATH_MAX 4096
-#endif
                char buffer[PATH_MAX];
                printf(_("Running from source directory\n"));
                getcwd(buffer, PATH_MAX);

diff --git a/navit/support/glib/glib.h b/navit/support/glib/glib.h
index 0c3983c..3490194 100644 (file)
--- a/navit/support/glib/glib.h
+++ b/navit/support/glib/glib.h
@@ -33,6 +33,7 @@
 #include <glib/gerror.h>
 #include <glib/gmessages.h>
 #include <glib/gstrfuncs.h>
+#include <glib/gunicode.h>
 
 #undef __GLIB_H_INSIDE__
 

diff --git a/navit/support/glib/gutf8.c b/navit/support/glib/gutf8.c
index aa5c9d5..35829d3 100644 (file)
--- a/navit/support/glib/gutf8.c
+++ b/navit/support/glib/gutf8.c
@@ -36,6 +36,7 @@
 #undef STRICT
 #endif
 
+#ifdef NOT_NEEDED_FOR_NAVIT
 #include "libcharset/libcharset.h"
 
 #include "glibintl.h"
@@ -103,6 +104,7 @@
      ((Char) & 0xFFFE) != 0xFFFE)
    
      
+#endif
 static const gchar utf8_skip_data[256] = {
   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
@@ -248,6 +250,7 @@ g_utf8_strlen (const gchar *p,
   return len;
 }
 
+#ifdef NOT_NEEDED_FOR_NAVIT
 /**
  * g_utf8_get_char:
  * @p: a pointer to Unicode character encoded as UTF-8
@@ -1856,6 +1859,7 @@ _g_utf8_make_valid (const gchar *name)
   return g_string_free (string, FALSE);
 }
 
+#endif
 
 #define __G_UTF8_C__
 #include "galiasdef.c"