Fix:Build:Made maptool compile on windows

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

diff --git a/configure.in b/configure.in
index 970ef5b..80de0db 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -654,6 +654,7 @@ AC_ARG_ENABLE(support_libc, [  --enable-support-libc enable builtin mini libc ],
 AM_CONDITIONAL(SUPPORT_LIBC, [test "x$support_libc" = "xyes"])
 if test "x$support_libc" = "xyes"; then
        CFLAGS="$CFLAGS -I\$(top_srcdir)/navit/support/libc"
+       LIBC_LIBS="-L\$(top_builddir)/navit/support/libc -lsupport_libc"
 fi
 
 ## graphics
@@ -789,6 +790,7 @@ NAVIT_LIBS="$NAVIT_LIBS $GLIB_LIBS $GMODULE_LIBS $LIBINTL"
 AC_SUBST(NAVIT_CFLAGS)
 AC_SUBST(NAVIT_LIBS)
 AC_SUBST(WORDEXP_LIBS)
+AC_SUBST(LIBC_LIBS)
 AC_SUBST(WINDRES)
 
 AC_CONFIG_FILES([

diff --git a/navit/maptool/Makefile.am b/navit/maptool/Makefile.am
index dad6540..5f2057e 100644 (file)
--- a/navit/maptool/Makefile.am
+++ b/navit/maptool/Makefile.am
@@ -5,4 +5,4 @@ endif
 
 AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit @ZLIB_CFLAGS@ @POSTGRESQL_CFLAGS@
 maptool_SOURCES = buffer.c coastline.c geom.c itembin.c maptool.c misc.c osm.c sourcesink.c tempfile.c tile.c zip.c maptool.h
-maptool_LDADD = ../libnavit.la @NAVIT_LIBS@ @ZLIB_LIBS@ @POSTGRESQL_LIBS@ @INTLLIBS@
+maptool_LDADD = ../libnavit.la @NAVIT_LIBS@ @WORDEXP_LIBS@ @ZLIB_LIBS@ @POSTGRESQL_LIBS@ @INTLLIBS@