Added a switch to configure to disable the sample map

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

diff --git a/Makefile.am b/Makefile.am
index a8ea10b..e67fdfc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,19 +2,3 @@ include $(top_srcdir)/Makefile.inc
 SUBDIRS=src po intl
 pkgdoc_DATA = README
 EXTRA_DIST = README
-
-all-local:
-       @echo ------------------------
-       @echo Navit build complete
-       @echo To build the sample map:
-       @echo make samplemap
-       @echo To install the sample map:
-       @echo make installsamplemap
-       @echo ------------------------
-
-samplemap:
-       make -C src samplemap
-
-installsamplemap:
-       make -C src installsamplemap
-

diff --git a/configure.in b/configure.in
index f69b0e7..cb078a3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -28,6 +28,10 @@ AC_ARG_ENABLE(avoid-float, [  --enable-avoid-float              avoid floating p
 test x"${AVOID_FLOAT}" = xyes && AC_DEFINE(AVOID_FLOAT,[],Define to avoid floating point)
 
 AC_ARG_ENABLE(libgps, [  --disable-libgps             don't use libgps], USE_LIBGPS=$enableval, USE_LIBGPS=yes)
+
+AC_ARG_ENABLE(samplemap, [  --disable-samplemap             don't build the samplemap], samplemap=$enableval, samplemap=yes)
+AM_CONDITIONAL(BUILD_SAMPLEMAP, [test "x$samplemap" = "xyes"])
+
 AC_PATH_X
 if test x"$have_x" != xyes; then
         echo "Can not find X"
@@ -431,6 +435,12 @@ if test "x$use_libgarmin" = "xyes"
        else
        echo "Garmin IMG  : DISABLED (you don't have libgarmin)"
 fi
+if test "x$samplemap" = "xyes"
+       then
+       echo "Samplemap   : ENABLED"
+       else
+       echo "Samplemap   : DISABLED"
+fi
 if  [ test x"$gtk2_pkgconfig" != xyes ] && [ test x"$sdl" != xyes ]
        then
        echo ""

diff --git a/src/Makefile.am b/src/Makefile.am
index 60a9cab..dd9d935 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,9 +1,9 @@
 include $(top_srcdir)/Makefile.inc
-SUBDIRS=binding data fib-1.1 gui graphics osd speech vehicle xpm
-
 DIST_SUBDIRS=binding data fib-1.1 gui graphics osd speech vehicle xpm maps
-
-SAMPLE_MAP=osm_bbox_11.3,47.9,11.7,48.2
+SUBDIRS=binding data fib-1.1 gui graphics osd speech vehicle xpm
+if BUILD_SAMPLEMAP
+  SUBDIRS += maps
+endif
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/fib-1.1 @NAVIT_CFLAGS@ -DPREFIX=\"@prefix@\" -DMODULE=\"navit\"
 BUILT_SOURCES=osm2navit
@@ -29,10 +29,3 @@ osm2navit_SOURCES = osm2navit.c item.c debug.c zipfile.h
 navit_LDADD = @NAVIT_LIBS@ @GPSD_LIBS@ -Lfib-1.1 -lfib
 
 osm2navit_LDADD = @NAVIT_LIBS@  @ZLIB_LIBS@
-
-samplemap:
-       make -C maps
-
-installsamplemap:
-       make -C maps install
-