* first bunch of updates toward new release
[navit-package] / debian / patches / no-default-poi-geodownload
1 Don't build map/poi_geodownload by default
2 Index: navit/configure.in
3 ===================================================================
4 --- navit.orig/configure.in     2010-01-28 11:24:42.078308401 +0100
5 +++ navit/configure.in  2010-01-28 11:24:44.803720291 +0100
6 @@ -36,6 +36,7 @@
7  plugins=yes; plugins_reason=default
8  postgresql=yes; postgresql_reason=default
9  samplemap=yes; samplemap_reason=default
10 +map_poi_geodownload=no; map_poi_geodownload_reason=default
11  binding_dbus=yes; binding_dbus_reason=default
12  binding_python=yes; binding_python_reason=default
13  font_freetype=yes; font_freetype_reason=default
14 @@ -233,6 +234,9 @@
15  X_CFLAGS="-I$x_includes"
16  AS_IF([test -n "$ac_x_libraries"], [X_LIBS="-L$ac_x_libraries"])
17  
18 +# map_poi_geodownload
19 +AC_ARG_ENABLE(poi-geodownload, [  --enable-poi-geodownload     enable map/poi_geodownload support], MAP_POI_GEODOWNLOAD=$enableval, MAP_POI_GEODOWNLOAD=$map_poi_geodownload;map_poi_geodownload_reason="configure parameter")
20 +
21  # glib
22  AC_ARG_ENABLE(glib, [  --disable-glib             don't build with external glib], glib=$enableval, glib=yes)
23  if test x"${glib}" = "xyes"; then
24 @@ -284,7 +288,8 @@
25  AM_CONDITIONAL(EVENT_GLIB, [test "x$glib" = "xyes"])
26  AM_CONDITIONAL(SUPPORT_GLIB, [test "x$glib" = "xno"])
27  AM_CONDITIONAL(SUPPORT_EZXML, [test "x$glib" = "xno"])
28 -AM_CONDITIONAL(MAP_POI_GEODOWNLOAD, [test "x$glib" = "xyes"])
29 +
30 +AM_CONDITIONAL(MAP_POI_GEODOWNLOAD, [test "x$MAP_POI_GEODOWNLOAD" = "xyes" -a "x$glib" = "xyes"])
31  
32  AC_CHECK_HEADER(
33         zlib.h,