mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

14
parse-xml.c
View file

@ -10,14 +10,9 @@
#include <libxml/parser.h>
#include <libxml/parserInternals.h>
#include <libxml/tree.h>
#ifdef XSLT
#include <libxslt/transform.h>
#endif
#include <glib/gi18n.h>
#ifdef SQLITE3
#include<sqlite3.h>
#endif
#include "dive.h"
#include "device.h"
@ -1601,15 +1596,12 @@ void parse_xml_buffer(const char *url, const char *buffer, int size,
}
reset_all();
dive_start();
#ifdef XSLT
doc = test_xslt_transforms(doc, error);
#endif
traverse(xmlDocGetRootElement(doc));
dive_end();
xmlFreeDoc(doc);
}
#ifdef SQLITE3
extern int dm4_events(void *handle, int columns, char **data, char **column)
{
event_start();
@ -1816,12 +1808,10 @@ extern int dm4_dive(void *param, int columns, char **data, char **column)
*/
return SQLITE_OK;
}
#endif
int parse_dm4_buffer(const char *url, const char *buffer, int size,
struct dive_table *table, GError **error)
{
#ifdef SQLITE3
int retval;
char *err = NULL;
sqlite3 *handle;
@ -1846,7 +1836,6 @@ int parse_dm4_buffer(const char *url, const char *buffer, int size,
}
sqlite3_close(handle);
#endif
return 0;
}
@ -1860,8 +1849,6 @@ void parse_xml_exit(void)
xmlCleanupParser();
}
#ifdef XSLT
/* Maybe we'll want a environment variable that can override this.. */
static const char *xslt_path = XSLT ":xslt:.";
@ -1962,4 +1949,3 @@ static xmlDoc *test_xslt_transforms(xmlDoc *doc, GError **error)
}
return doc;
}
#endif