From 9507f1bbf200f81e76c8d09517d16302150b0245 Mon Sep 17 00:00:00 2001 From: Andreas Volz Date: Wed, 3 Oct 2007 10:41:08 +0000 Subject: [PATCH] build libxml2 loader --- configure.ac | 5 +++++ include/mapnik/load_map.hpp | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/configure.ac b/configure.ac index 0e218dfef..f67feb377 100644 --- a/configure.ac +++ b/configure.ac @@ -7,6 +7,10 @@ AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE +dnl Disable libtool 1.5 support for languages we don't use +define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl +define([AC_LIBTOOL_LANG_GCJ_CONFIG], [:])dnl + AC_ISC_POSIX AC_PROG_CXX AM_PROG_CC_STDC @@ -116,6 +120,7 @@ AM_CONDITIONAL(HAVE_LIBXML2, test "x$enable_libxml2" = "xyes") if [ test "x$enable_libxml2" = "xyes"]; then AC_MSG_RESULT(yes) PKG_CHECK_MODULES(LIBXML2, libxml-2.0) + AC_DEFINE(HAVE_LIBXML2, 1,"") else AC_MSG_RESULT(no) fi diff --git a/include/mapnik/load_map.hpp b/include/mapnik/load_map.hpp index 79c8367fb..e840304ae 100644 --- a/include/mapnik/load_map.hpp +++ b/include/mapnik/load_map.hpp @@ -24,6 +24,10 @@ #ifndef MAP_LOADER_HPP #define MAP_LOADER_HPP +#ifdef HAVE_CONFIG_H + #include +#endif + #include #include