From: <mar...@us...> - 2010-06-29 18:22:58
|
Revision: 3450 http://navit.svn.sourceforge.net/navit/?rev=3450&view=rev Author: martin-s Date: 2010-06-29 18:22:46 +0000 (Tue, 29 Jun 2010) Log Message: ----------- Add:Configure parameter for maptool Modified Paths: -------------- trunk/navit/configure.in trunk/navit/navit/Makefile.am Modified: trunk/navit/configure.in =================================================================== --- trunk/navit/configure.in 2010-06-29 17:57:15 UTC (rev 3449) +++ trunk/navit/configure.in 2010-06-29 18:22:46 UTC (rev 3450) @@ -54,6 +54,7 @@ graphics_opengl=yes; graphics_opengl_reason=default graphics_sdl=yes; graphics_sdl_reason=default graphics_win32=no; graphics_win32_reason=default +maptool=yes; maptool_reason=default map_binfile=yes; map_binfile_reason=default map_filter=yes; map_filter_reason=default map_mg=yes; map_mg_reason=default @@ -251,6 +252,11 @@ if test "x${_PATH_BZCAT}" = "x" ; then samplemap=no; samplemap_reason="bzcat missing" fi +AC_ARG_ENABLE(maptool, [ --disable-maptool don't build maptool], maptool=$enableval;maptool_reason="configure parameter") +AM_CONDITIONAL(MAPTOOL, [test "x$maptool" = "xyes"]) +if test "x$maptool" != "xyes"; then + samplemap=no; samplemap_reason="maptool disabled" +fi AC_ARG_ENABLE(samplemap, [ --disable-samplemap don't build the samplemap], samplemap=$enableval;samplemap_reason="configure parameter") AM_CONDITIONAL(BUILD_SAMPLEMAP, [test "x$samplemap" = "xyes"]) Modified: trunk/navit/navit/Makefile.am =================================================================== --- trunk/navit/navit/Makefile.am 2010-06-29 17:57:15 UTC (rev 3449) +++ trunk/navit/navit/Makefile.am 2010-06-29 18:22:46 UTC (rev 3450) @@ -16,7 +16,9 @@ SUBDIRS += . endif -SUBDIRS+=maptool +if MAPTOOL + SUBDIRS += maptool +endif if BUILD_SAMPLEMAP SUBDIRS += maps This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |