Require libzip, xslt and osm-gps-map in all builds

Conditional inclusion of libzip, xslt and osm-gps-map just
makes testing more cumbersome, since testers might lack
Subsurface features without knowing.

Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Henrik Brautaset Aronsen 2013-05-11 21:33:46 +02:00 committed by Dirk Hohndel
parent 5775905727
commit f5ef74202b
9 changed files with 4 additions and 89 deletions

4
main.c
View file

@ -10,9 +10,7 @@
#include "dive.h"
#include "divelist.h"
#if HAVE_OSM_GPS_MAP
#include <osm-gps-map.h>
#endif
#ifdef DEBUGFILE
char *debugfilename;
FILE *debugfile;
@ -38,9 +36,7 @@ struct preferences default_prefs = {
.calc_ceiling_3m_incr = FALSE,
.gflow = 0.30,
.gfhigh = 0.75,
#if HAVE_OSM_GPS_MAP
.map_provider = OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_HYBRID,
#endif
};
/* random helper functions, used here or elsewhere */