added more modules

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@265 ffa7fe5e-494d-0410-b361-a75ebd5db220

7 files changed, 60 insertions, 10 deletions

diff --git a/Makefile.inc b/Makefile.inc
index 4dc3487d1..cc07c8349 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1,5 +1,8 @@
-moduleguidir=$(pkglibdir)/gui
-modulegraphicsdir=$(pkglibdir)/graphics
 moduledatadir=$(pkglibdir)/data
+modulegraphicsdir=$(pkglibdir)/graphics
+moduleguidir=$(pkglibdir)/gui
+modulespeechdir=$(pkglibdir)/speech
+moduleosddir=$(pkglibdir)/osd
+modulevehicledir=$(pkglibdir)/vehicle
 pkgdocdir=$(pkgdatadir)
 xpmdir=$(pkgdatadir)/xpm
diff --git a/README b/README
index 6507c9a28..73a862466 100644
--- a/README
+++ b/README
@@ -46,6 +46,7 @@ Navit read the current vehicle possition either directly from a file with
 	export GPSDATA=file:filename
 or from gpsd with
 	export GPSDATA=gpsd://host[:port]
+[now in navit.xml]
 
 
 Subdirectories:
diff --git a/configure.in b/configure.in
index d564b982a..ccd6516d1 100644
--- a/configure.in
+++ b/configure.in
@@ -42,6 +42,8 @@ if test "x$gtk2_pkgconfig" = "xyes"; then
 fi
 AC_SUBST(GTK2_CFLAGS)
 AC_SUBST(GTK2_LIBS)
+AM_CONDITIONAL(GUI_GTK, [test "x$gtk2_pkgconfig" = "xyes"])
+AM_CONDITIONAL(GRAPHICS_GTK_DRAWING_AREA, [test "x$gtk2_pkgconfig" = "xyes"])
 
 PKG_CHECK_MODULES(FREETYPE2, [freetype2], [freetype2_pkgconfig=yes], [freetype2_pkgconfig=no])
 if test "x$freetype2_pkgconfig" = "xyes"; then
@@ -57,9 +59,10 @@ fi
 AC_SUBST(IMLIB2_CFLAGS)
 AC_SUBST(IMLIB2_LIBS)
 
-AC_CHECK_HEADER(libspeechd.h, AC_DEFINE([HAVE_LIBSPEECHD],[],Define to 1 if you have the <libspeechd.h> header file.) SPEECHD_LIBS="-lspeechd",  AC_MSG_WARN([*** no libspeechd.h -- Speech output disabled]))
+AC_CHECK_HEADER(libspeechd.h, AC_DEFINE([HAVE_LIBSPEECHD],[],Define to 1 if you have the <libspeechd.h> header file.) SPEECHD_LIBS="-lspeechd" speechd=yes,  AC_MSG_WARN([*** no libspeechd.h -- Speech output disabled]))
 AC_SUBST(SPEECHD_CFLAGS)
 AC_SUBST(SPEECHD_LIBS)
+AM_CONDITIONAL(SPEECH_SPEECH_DISPATCHER, [test "x$speechd" = "xyes"])
 
 AC_CHECK_HEADER(
 	SDL/SDL.h,
@@ -106,14 +109,15 @@ AC_SUBST(OPENGL_CFLAGS)
 AC_SUBST(OPENGL_LIBS)
 
 AM_CONDITIONAL(GUI_SDL, [test "x$sdl" = "xyes" -a "x$cegui" = "xyes" -a "x$opengl" = "xyes" ])
-AM_CONDITIONAL(GUI_GTK, [test "x$gtk2_pkgconfig" = "xyes"])
 AM_CONDITIONAL(GRAPHICS_OPENGL, [test "x$opengl" = "xyes"])
-AM_CONDITIONAL(GRAPHICS_GTK_DRAWING_AREA, [test "x$sdl" = "xyes"])
 
 if test x"${USE_LIBGPS}" = xyes
 then
-	AC_CHECK_HEADER(gps.h, AC_DEFINE([HAVE_LIBGPS],[],Define to 1 if you have the <gps.h> header file.) LIBS="$LIBS -lgps",  AC_MSG_WARN([*** no gps.h -- gpsd support disabled]))
+	AC_CHECK_HEADER(gps.h, AC_DEFINE([HAVE_LIBGPS],[],Define to 1 if you have the <gps.h> header file.) GPSD_LIBS="-lgps" gpsd=yes,  AC_MSG_WARN([*** no gps.h -- gpsd support disabled]))
 fi
+AC_SUBST(GPSD_CFLAGS)
+AC_SUBST(GPSD_LIBS)
+AM_CONDITIONAL(VEHICLE_GPSD, [test "x$gpsd" = "xyes"])
 
 PYTHON_LIB=""
 PYTHON_INC=""
@@ -153,17 +157,25 @@ LIBS="$LIBS -rdynamic"
 AC_OUTPUT([
 Makefile
 src/Makefile
+src/binding/Makefile
 src/data/Makefile
 src/data/mg/Makefile
 src/data/textfile/Makefile
 src/data/garmin_img/Makefile
 src/fib-1.1/Makefile
-src/gui/Makefile
-src/gui/gtk/Makefile
-src/gui/sdl/Makefile
 src/graphics/Makefile
 src/graphics/gtk_drawing_area/Makefile
 src/graphics/opengl/Makefile
 src/graphics/null/Makefile
+src/gui/Makefile
+src/gui/gtk/Makefile
+src/gui/sdl/Makefile
+src/osd/Makefile
+src/speech/Makefile
+src/speech/cmdline/Makefile
+src/speech/speech_dispatcher/Makefile
+src/vehicle/Makefile
+src/vehicle/file/Makefile
+src/vehicle/gpsd/Makefile
 src/xpm/Makefile
 ])
diff --git a/src/Makefile.am b/src/Makefile.am
index dc7127918..57e58ab46 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 include $(top_srcdir)/Makefile.inc
-SUBDIRS=fib-1.1 data gui graphics xpm
+SUBDIRS=binding data fib-1.1 gui graphics osd speech vehicle xpm
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/fib-1.1 @NAVIT_CFLAGS@ @SPEECHD_CFLAGS@ -DMODULE=\"navit\"
 
diff --git a/src/binding/Makefile.am b/src/binding/Makefile.am
new file mode 100644
index 000000000..e2baa045f
--- /dev/null
+++ b/src/binding/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS=
diff --git a/src/navit.c b/src/navit.c
index 17ea56372..ca103f9d8 100644
--- a/src/navit.c
+++ b/src/navit.c
@@ -239,6 +239,37 @@ navit_set_destination(struct navit *this_, struct coord *c, char *description)
 struct navit *global_navit;
 
 static void
+navit_debug(struct navit *this_)
+{
+#if 0
+#include "attr.h"
+#include "item.h"
+#include "search.h"
+	struct attr attr;
+	struct search_list *sl;
+	struct search_list_result *res;
+
+	debug_level_set("data_mg:town_search_get_item",1);
+	debug_level_set("data_mg:town_search_compare",1);
+	debug_level_set("data_mg:tree_search_next",1);
+	sl=search_list_new(this_->mapsets->data);
+	attr.type=attr_country_all;
+	attr.u.str="Deu";
+	search_list_search(sl, &attr, 1);
+	while (res=search_list_get_result(sl)) {
+		printf("country result\n");
+	}
+	attr.type=attr_town_name;
+	attr.u.str="U";
+	search_list_search(sl, &attr, 1);
+	while (res=search_list_get_result(sl)) {
+		printf("town result\n");
+	}
+	search_list_destroy(sl);
+#endif
+}
+
+static void
 navit_show_roadbook(struct navigation *nav, void *data)
 {
 	struct navigation_list *list;
@@ -315,6 +346,7 @@ navit_init(struct navit *this_)
 		}
 	}
 	global_navit=this_;
+	navit_debug(this_);
 }
 
 void
diff --git a/src/osd/Makefile.am b/src/osd/Makefile.am
new file mode 100644
index 000000000..e2baa045f
--- /dev/null
+++ b/src/osd/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS=