moved all headers into include dir

This commit is contained in:
Artem Pavlenko 2005-04-10 20:39:53 +00:00
parent 9bfb674ef2
commit 8e1d34f46e
77 changed files with 194 additions and 228 deletions

View file

@ -1,3 +1,3 @@
SUBDIRS = m4 libltdl src utils/shapeindex SUBDIRS = m4 libltdl include src utils/shapeindex
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = config.rpath mkinstalldirs EXTRA_DIST = config.rpath mkinstalldirs

View file

@ -49,7 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno configure.status.lineno configure.lineno configure.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/config.hh CONFIG_HEADER = $(top_builddir)/include/config.hh
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
SOURCES = SOURCES =
DIST_SOURCES = DIST_SOURCES =
@ -185,7 +185,7 @@ sharedstatedir = @sharedstatedir@
subdirs = @subdirs@ subdirs = @subdirs@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
target_alias = @target_alias@ target_alias = @target_alias@
SUBDIRS = m4 libltdl src utils/shapeindex SUBDIRS = m4 libltdl include src utils/shapeindex
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = config.rpath mkinstalldirs EXTRA_DIST = config.rpath mkinstalldirs
all: all-recursive all: all-recursive

7
configure vendored
View file

@ -1515,7 +1515,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_config_headers="$ac_config_headers src/config.hh" ac_config_headers="$ac_config_headers include/config.hh"
@ -23368,7 +23368,7 @@ POSTGRESQL_CFLAGS="-I${POSTGRESQL_PREFIX}/include"
fi fi
ac_config_files="$ac_config_files Makefile m4/Makefile src/Makefile src/shape/Makefile src/raster/Makefile src/postgis/Makefile" ac_config_files="$ac_config_files Makefile m4/Makefile include/Makefile src/Makefile src/shape/Makefile src/raster/Makefile src/postgis/Makefile"
pluginsdir="${prefix}/plugins" pluginsdir="${prefix}/plugins"
@ -24021,12 +24021,13 @@ do
# Handling of arguments. # Handling of arguments.
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"m4/Makefile" ) CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;; "m4/Makefile" ) CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
"include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
"src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"src/shape/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/shape/Makefile" ;; "src/shape/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/shape/Makefile" ;;
"src/raster/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/raster/Makefile" ;; "src/raster/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/raster/Makefile" ;;
"src/postgis/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/postgis/Makefile" ;; "src/postgis/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/postgis/Makefile" ;;
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"src/config.hh" ) CONFIG_HEADERS="$CONFIG_HEADERS src/config.hh" ;; "include/config.hh" ) CONFIG_HEADERS="$CONFIG_HEADERS include/config.hh" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;} echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };; { (exit 1); exit 1; }; };;

View file

@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59) AC_PREREQ(2.59)
AC_INIT([mapnik],[0.1]) AC_INIT([mapnik],[0.1])
AC_CONFIG_HEADERS([src/config.hh]) AC_CONFIG_HEADERS([include/config.hh])
AC_REVISION([$Revision: 1.1 $]) AC_REVISION([$Revision: 1.1 $])
AC_CONFIG_SRCDIR([src/params.cc]) AC_CONFIG_SRCDIR([src/params.cc])
AM_INIT_AUTOMAKE([dist-bzip2]) AM_INIT_AUTOMAKE([dist-bzip2])
@ -80,7 +80,7 @@ if test "$package_postgis_enabled" = yes ; then
AP_CHECK_POSTGRESQL AP_CHECK_POSTGRESQL
fi fi
AC_CONFIG_FILES([Makefile m4/Makefile src/Makefile src/shape/Makefile src/raster/Makefile src/postgis/Makefile]) AC_CONFIG_FILES([Makefile m4/Makefile include/Makefile src/Makefile src/shape/Makefile src/raster/Makefile src/postgis/Makefile])
AC_SUBST([pluginsdir],["${prefix}/plugins"]) AC_SUBST([pluginsdir],["${prefix}/plugins"])
AC_DEFINE_UNQUOTED([_DATASOURCE_PLUGINS_DIR],["$pluginsdir"],[datasource plugins dir]) AC_DEFINE_UNQUOTED([_DATASOURCE_PLUGINS_DIR],["$pluginsdir"],[datasource plugins dir])

1
include/Makefile.am Normal file
View file

@ -0,0 +1 @@
nobase_include_HEADERS = attribute.hh color.hh config.hh coord.hh coord_array.hh vertex_vector.hh ctrans.hh datasource.hh datasource_cache.hh factory.hh feature.hh query.hh filter.hh filter_visitor.hh envelope.hh gamma.hh geometry.hh geom_util.hh graphics.hh image_data.hh image_reader.hh image_util.hh layer.hh line_aa.hh map.hh mapnik.hh memory.hh params.hh plugin.hh line_symbolizer.hh polygon_symbolizer.hh image_symbolizer.hh pool.hh ptr.hh raster.hh render.hh scanline_aa.hh scanline.hh style.hh style_cache.hh style_factory.hh symbolizer.hh text.hh utils.hh vertex.hh vertex_transform.hh wkb.hh logical.hh rule.hh comparison.hh fill.hh spatial.hh expression.hh stroke.hh attribute_collector.hh colorcube.hh feature_type_style.hh

View file

@ -1,4 +1,4 @@
/* src/config.hh.in. Generated from configure.ac by autoheader. */ /* include/config.hh.in. Generated from configure.ac by autoheader. */
/* Define to 1 if the `closedir' function returns void instead of `int'. */ /* Define to 1 if the `closedir' function returns void instead of `int'. */
#undef CLOSEDIR_VOID #undef CLOSEDIR_VOID

View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
//$Id: ctrans.hh 59 2004-11-02 22:55:30Z artem $ //$Id$
#ifndef CTRANS_HH #ifndef CTRANS_HH
#define CTRANS_HH #define CTRANS_HH

View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
//$Id: dsfactory.hh 61 2004-11-04 23:16:30Z artem $ //$Id$
#ifndef DSFACTORY_HH #ifndef DSFACTORY_HH
#define DSFACTORY_HH #define DSFACTORY_HH

View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
//$Id: factory.hh 64 2004-11-12 10:29:32Z artem $ //$Id$
#ifndef FACTORY_HH #ifndef FACTORY_HH
#define FACTORY_HH #define FACTORY_HH

View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
//$Id: image_util.hh 58 2004-10-31 16:21:26Z artem $ //$Id$
#ifndef IMAGE_UTIL_HH #ifndef IMAGE_UTIL_HH
#define IMAGE_UTIL_HH #define IMAGE_UTIL_HH

View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
//$Id: layer.hh 68 2004-11-23 22:39:58Z artem $ //$Id$
#ifndef LAYER_HH #ifndef LAYER_HH
#define LAYER_HH #define LAYER_HH

View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
//$Id: line_aa.hh 60 2004-11-04 09:40:49Z artem $ //$Id$
#ifndef LINE_AA_HH #ifndef LINE_AA_HH
#define LINE_AA_HH #define LINE_AA_HH

View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
//$Id: map.hh 69 2004-11-24 11:08:45Z artem $ //$Id$
#ifndef MAP_HH #ifndef MAP_HH
#define MAP_HH #define MAP_HH

View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
//$Id: memory.hh 58 2004-10-31 16:21:26Z artem $ //$Id$
#ifndef MEMORY_HH #ifndef MEMORY_HH
#define MEMORY_HH #define MEMORY_HH

View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
//$Id: params.hh 68 2004-11-23 22:39:58Z artem $ //$Id$
#ifndef PARAMS_HH #ifndef PARAMS_HH
#define PARAMS_HH #define PARAMS_HH

View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
//$Id: plugin.hh 58 2004-10-31 16:21:26Z artem $ //$Id$
#ifndef PLUGIN_HH #ifndef PLUGIN_HH
#define PLUGIN_HH #define PLUGIN_HH

View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
//$Id: pool.hh 58 2004-10-31 16:21:26Z artem $ //$Id$
#ifndef POOL_HH #ifndef POOL_HH
#define POOL_HH #define POOL_HH

View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
//$Id: scanline.hh 60 2004-11-04 09:40:49Z artem $ //$Id$
#ifndef SCANLINE_HH #ifndef SCANLINE_HH
#define SCANLINE_HH #define SCANLINE_HH

43
include/shp_index.hh Normal file
View file

@ -0,0 +1,43 @@
/* This file is part of Mapnik (c++ mapping toolkit)
* Copyright (C) 2005 Artem Pavlenko
*
* Mapnik is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef SHP_INDEX_HH
#define SHP_INDEX_HH
#include "mapnik.hh"
#include <fstream>
#include <set>
using namespace mapnik;
template <typename filterT>
class shp_index
{
public:
static void query(const filterT& filter,std::ifstream& file,std::set<int>& pos);
private:
shp_index();
~shp_index();
shp_index(const shp_index&);
shp_index& operator=(const shp_index&);
static int read_ndr_integer(std::ifstream& in);
static void read_envelope(std::ifstream& in,Envelope<double> &envelope);
static void query_node(const filterT& filter,std::ifstream& file,std::set<int>& pos);
};
#endif //SHP_INDEX_HH

View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
//$Id: text.hh 58 2004-10-31 16:21:26Z artem $ //$Id$
#ifndef TEXT_HH #ifndef TEXT_HH
#define TEXT_HH #define TEXT_HH

View file

@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4) $(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/config.hh CONFIG_HEADER = $(top_builddir)/include/config.hh
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
SOURCES = SOURCES =
DIST_SOURCES = DIST_SOURCES =

View file

@ -1,15 +1,14 @@
#Copyright (C) 2005 by Artem Pavlenko #Copyright (C) 2005 by Artem Pavlenko
lib_LTLIBRARIES = libmapnik.la lib_LTLIBRARIES = libmapnik.la
nobase_include_HEADERS = attribute.hh color.hh config.hh coord.hh coord_array.hh vertex_vector.hh ctrans.hh datasource.hh datasource_cache.hh factory.hh feature.hh query.hh filter.hh filter_visitor.hh envelope.hh gamma.hh geometry.hh geom_util.hh graphics.hh image_data.hh image_reader.hh image_util.hh layer.hh line_aa.hh map.hh mapnik.hh memory.hh params.hh plugin.hh line_symbolizer.hh polygon_symbolizer.hh image_symbolizer.hh pool.hh ptr.hh raster.hh render.hh scanline_aa.hh scanline.hh style.hh style_cache.hh style_factory.hh symbolizer.hh text.hh utils.hh vertex.hh vertex_transform.hh wkb.hh logical.hh rule.hh comparison.hh fill.hh spatial.hh expression.hh stroke.hh attribute_collector.hh colorcube.hh feature_type_style.hh
libmapnik_la_SOURCES = attribute.hh color.cc color.hh coord.hh coord_array.hh vertex_vector.hh ctrans.hh datasource.hh datasource_cache.cc datasource_cache.hh envelope.cc envelope.hh query.hh factory.hh feature.hh filter.hh filter_visitor.hh geometry.hh gamma.hh geom_util.hh graphics.cc graphics.hh image_data.hh image_reader.cc image_reader.hh image_util.cc image_util.hh layer.cc layer.hh line_aa.cc line_aa.hh map.cc map.hh mapnik.hh memory.cc memory.hh params.cc params.hh plugin.cc plugin.hh png_reader.cc line_symbolizer.hh polygon_symbolizer.hh image_symbolizer.hh pool.hh ptr.hh raster.hh render.cc render.hh scanline_aa.cc scanline_aa.hh scanline.cc scanline.hh style.cc style.hh style_cache.cc style_cache.hh style_factory.hh symbolizer.hh text.cc text.hh utils.hh vertex.hh vertex_transform.hh wkb.cc wkb.hh rule.hh comparison.hh logical.hh fill.hh spatial.hh expression.hh stroke.hh attribute_collector.hh colorcube.hh feature_type_style.hh libmapnik_la_SOURCES = color.cc datasource_cache.cc envelope.cc graphics.cc image_reader.cc image_util.cc layer.cc line_aa.cc map.cc memory.cc params.cc plugin.cc png_reader.cc render.cc scanline_aa.cc scanline.cc style.cc style_cache.cc text.cc wkb.cc
if BUILD_TIFF_READER if BUILD_TIFF_READER
libmapnik_la_SOURCES += tiff_reader.cc libmapnik_la_SOURCES += tiff_reader.cc
endif endif
libmapnik_la_CPPFLAGS = $(FREETYPE2_CFLAGS) libmapnik_la_CPPFLAGS = -I$(top_srcdir)/include $(FREETYPE2_CFLAGS)
libmapnik_la_CPPFLAGS += @INCLTDL@ libmapnik_la_CPPFLAGS += @INCLTDL@
libmapnik_la_LIBADD = @LIBLTDL@ -lpthread -lpng -ljpeg $(FREETYPE2_LIBS) -lz -lm libmapnik_la_LIBADD = @LIBLTDL@ -lpthread -lpng -ljpeg $(FREETYPE2_LIBS) -lz -lm
libmapnik_la_LDFLAGS= -version-info 0:0:0 $(TIFF_LDFLAGS) libmapnik_la_LDFLAGS= -version-info 0:0:0 $(TIFF_LDFLAGS)

View file

@ -16,7 +16,6 @@
#Copyright (C) 2005 by Artem Pavlenko #Copyright (C) 2005 by Artem Pavlenko
SOURCES = $(libmapnik_la_SOURCES) SOURCES = $(libmapnik_la_SOURCES)
srcdir = @srcdir@ srcdir = @srcdir@
@ -43,15 +42,14 @@ build_triplet = @build@
host_triplet = @host@ host_triplet = @host@
@BUILD_TIFF_READER_TRUE@am__append_1 = tiff_reader.cc @BUILD_TIFF_READER_TRUE@am__append_1 = tiff_reader.cc
subdir = src subdir = src
DIST_COMMON = $(nobase_include_HEADERS) $(srcdir)/Makefile.am \ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
$(srcdir)/Makefile.in $(srcdir)/config.hh.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/configure.ac $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4) $(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.hh CONFIG_HEADER = $(top_builddir)/include/config.hh
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \ am__vpath_adj = case $$p in \
@ -59,28 +57,15 @@ am__vpath_adj = case $$p in \
*) f=$$p;; \ *) f=$$p;; \
esac; esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" am__installdirs = "$(DESTDIR)$(libdir)"
libLTLIBRARIES_INSTALL = $(INSTALL) libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES) LTLIBRARIES = $(lib_LTLIBRARIES)
libmapnik_la_DEPENDENCIES = libmapnik_la_DEPENDENCIES =
am__libmapnik_la_SOURCES_DIST = attribute.hh color.cc color.hh \ am__libmapnik_la_SOURCES_DIST = color.cc datasource_cache.cc \
coord.hh coord_array.hh vertex_vector.hh ctrans.hh \ envelope.cc graphics.cc image_reader.cc image_util.cc layer.cc \
datasource.hh datasource_cache.cc datasource_cache.hh \ line_aa.cc map.cc memory.cc params.cc plugin.cc png_reader.cc \
envelope.cc envelope.hh query.hh factory.hh feature.hh \ render.cc scanline_aa.cc scanline.cc style.cc style_cache.cc \
filter.hh filter_visitor.hh geometry.hh gamma.hh geom_util.hh \ text.cc wkb.cc tiff_reader.cc
graphics.cc graphics.hh image_data.hh image_reader.cc \
image_reader.hh image_util.cc image_util.hh layer.cc layer.hh \
line_aa.cc line_aa.hh map.cc map.hh mapnik.hh memory.cc \
memory.hh params.cc params.hh plugin.cc plugin.hh \
png_reader.cc line_symbolizer.hh polygon_symbolizer.hh \
image_symbolizer.hh pool.hh ptr.hh raster.hh render.cc \
render.hh scanline_aa.cc scanline_aa.hh scanline.cc \
scanline.hh style.cc style.hh style_cache.cc style_cache.hh \
style_factory.hh symbolizer.hh text.cc text.hh utils.hh \
vertex.hh vertex_transform.hh wkb.cc wkb.hh rule.hh \
comparison.hh logical.hh fill.hh spatial.hh expression.hh \
stroke.hh attribute_collector.hh colorcube.hh \
feature_type_style.hh tiff_reader.cc
@BUILD_TIFF_READER_TRUE@am__objects_1 = libmapnik_la-tiff_reader.lo @BUILD_TIFF_READER_TRUE@am__objects_1 = libmapnik_la-tiff_reader.lo
am_libmapnik_la_OBJECTS = libmapnik_la-color.lo \ am_libmapnik_la_OBJECTS = libmapnik_la-color.lo \
libmapnik_la-datasource_cache.lo libmapnik_la-envelope.lo \ libmapnik_la-datasource_cache.lo libmapnik_la-envelope.lo \
@ -94,7 +79,7 @@ am_libmapnik_la_OBJECTS = libmapnik_la-color.lo \
libmapnik_la-style_cache.lo libmapnik_la-text.lo \ libmapnik_la-style_cache.lo libmapnik_la-text.lo \
libmapnik_la-wkb.lo $(am__objects_1) libmapnik_la-wkb.lo $(am__objects_1)
libmapnik_la_OBJECTS = $(am_libmapnik_la_OBJECTS) libmapnik_la_OBJECTS = $(am_libmapnik_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I. DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
depcomp = $(SHELL) $(top_srcdir)/depcomp depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@ -105,14 +90,6 @@ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
CXXLD = $(CXX) CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libmapnik_la_SOURCES) SOURCES = $(libmapnik_la_SOURCES)
DIST_SOURCES = $(am__libmapnik_la_SOURCES_DIST) DIST_SOURCES = $(am__libmapnik_la_SOURCES_DIST)
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@ -121,8 +98,6 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
install-recursive installcheck-recursive installdirs-recursive \ install-recursive installcheck-recursive installdirs-recursive \
pdf-recursive ps-recursive uninstall-info-recursive \ pdf-recursive ps-recursive uninstall-info-recursive \
uninstall-recursive uninstall-recursive
nobase_includeHEADERS_INSTALL = $(install_sh_DATA)
HEADERS = $(nobase_include_HEADERS)
ETAGS = etags ETAGS = etags
CTAGS = ctags CTAGS = ctags
DIST_SUBDIRS = shape raster postgis DIST_SUBDIRS = shape raster postgis
@ -240,34 +215,20 @@ subdirs = @subdirs@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
target_alias = @target_alias@ target_alias = @target_alias@
lib_LTLIBRARIES = libmapnik.la lib_LTLIBRARIES = libmapnik.la
nobase_include_HEADERS = attribute.hh color.hh config.hh coord.hh coord_array.hh vertex_vector.hh ctrans.hh datasource.hh datasource_cache.hh factory.hh feature.hh query.hh filter.hh filter_visitor.hh envelope.hh gamma.hh geometry.hh geom_util.hh graphics.hh image_data.hh image_reader.hh image_util.hh layer.hh line_aa.hh map.hh mapnik.hh memory.hh params.hh plugin.hh line_symbolizer.hh polygon_symbolizer.hh image_symbolizer.hh pool.hh ptr.hh raster.hh render.hh scanline_aa.hh scanline.hh style.hh style_cache.hh style_factory.hh symbolizer.hh text.hh utils.hh vertex.hh vertex_transform.hh wkb.hh logical.hh rule.hh comparison.hh fill.hh spatial.hh expression.hh stroke.hh attribute_collector.hh colorcube.hh feature_type_style.hh libmapnik_la_SOURCES = color.cc datasource_cache.cc envelope.cc \
libmapnik_la_SOURCES = attribute.hh color.cc color.hh coord.hh \ graphics.cc image_reader.cc image_util.cc layer.cc line_aa.cc \
coord_array.hh vertex_vector.hh ctrans.hh datasource.hh \ map.cc memory.cc params.cc plugin.cc png_reader.cc render.cc \
datasource_cache.cc datasource_cache.hh envelope.cc \ scanline_aa.cc scanline.cc style.cc style_cache.cc text.cc \
envelope.hh query.hh factory.hh feature.hh filter.hh \ wkb.cc $(am__append_1)
filter_visitor.hh geometry.hh gamma.hh geom_util.hh \ libmapnik_la_CPPFLAGS = -I$(top_srcdir)/include $(FREETYPE2_CFLAGS) \
graphics.cc graphics.hh image_data.hh image_reader.cc \ @INCLTDL@ $(am__empty)
image_reader.hh image_util.cc image_util.hh layer.cc layer.hh \
line_aa.cc line_aa.hh map.cc map.hh mapnik.hh memory.cc \
memory.hh params.cc params.hh plugin.cc plugin.hh \
png_reader.cc line_symbolizer.hh polygon_symbolizer.hh \
image_symbolizer.hh pool.hh ptr.hh raster.hh render.cc \
render.hh scanline_aa.cc scanline_aa.hh scanline.cc \
scanline.hh style.cc style.hh style_cache.cc style_cache.hh \
style_factory.hh symbolizer.hh text.cc text.hh utils.hh \
vertex.hh vertex_transform.hh wkb.cc wkb.hh rule.hh \
comparison.hh logical.hh fill.hh spatial.hh expression.hh \
stroke.hh attribute_collector.hh colorcube.hh \
feature_type_style.hh $(am__append_1)
libmapnik_la_CPPFLAGS = $(FREETYPE2_CFLAGS) @INCLTDL@
libmapnik_la_LIBADD = @LIBLTDL@ -lpthread -lpng -ljpeg $(FREETYPE2_LIBS) -lz -lm libmapnik_la_LIBADD = @LIBLTDL@ -lpthread -lpng -ljpeg $(FREETYPE2_LIBS) -lz -lm
libmapnik_la_LDFLAGS = -version-info 0:0:0 $(TIFF_LDFLAGS) libmapnik_la_LDFLAGS = -version-info 0:0:0 $(TIFF_LDFLAGS)
@SHAPE_DATASOURCE_TRUE@SHAPE_DATASOURCE_DIR = shape @SHAPE_DATASOURCE_TRUE@SHAPE_DATASOURCE_DIR = shape
@RASTER_DATASOURCE_TRUE@RASTER_DATASOURCE_DIR = raster @RASTER_DATASOURCE_TRUE@RASTER_DATASOURCE_DIR = raster
@POSTGIS_DATASOURCE_TRUE@POSTGIS_DATASOURCE_DIR = postgis @POSTGIS_DATASOURCE_TRUE@POSTGIS_DATASOURCE_DIR = postgis
SUBDIRS = $(SHAPE_DATASOURCE_DIR) $(RASTER_DATASOURCE_DIR) $(POSTGIS_DATASOURCE_DIR) SUBDIRS = $(SHAPE_DATASOURCE_DIR) $(RASTER_DATASOURCE_DIR) $(POSTGIS_DATASOURCE_DIR)
all: config.hh all: all-recursive
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .cc .lo .o .obj .SUFFIXES: .cc .lo .o .obj
@ -300,23 +261,6 @@ $(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
config.hh: stamp-h1
@if test ! -f $@; then \
rm -f stamp-h1; \
$(MAKE) stamp-h1; \
else :; fi
stamp-h1: $(srcdir)/config.hh.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status src/config.hh
$(srcdir)/config.hh.in: $(am__configure_deps)
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h1
touch $@
distclean-hdr:
-rm -f config.hh stamp-h1
install-libLTLIBRARIES: $(lib_LTLIBRARIES) install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
@ -552,25 +496,6 @@ clean-libtool:
distclean-libtool: distclean-libtool:
-rm -f libtool -rm -f libtool
uninstall-info-am: uninstall-info-am:
install-nobase_includeHEADERS: $(nobase_include_HEADERS)
@$(NORMAL_INSTALL)
test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
@$(am__vpath_adj_setup) \
list='$(nobase_include_HEADERS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
$(am__vpath_adj) \
echo " $(nobase_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
$(nobase_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
done
uninstall-nobase_includeHEADERS:
@$(NORMAL_UNINSTALL)
@$(am__vpath_adj_setup) \
list='$(nobase_include_HEADERS)'; for p in $$list; do \
$(am__vpath_adj) \
echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
rm -f "$(DESTDIR)$(includedir)/$$f"; \
done
# This directory's subdirectories are mostly independent; you can cd # This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile. # into them and run `make' without going through this Makefile.
@ -641,7 +566,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
mkid -fID $$unique mkid -fID $$unique
tags: TAGS tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) config.hh.in $(TAGS_DEPENDENCIES) \ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP) $(TAGS_FILES) $(LISP)
tags=; \ tags=; \
here=`pwd`; \ here=`pwd`; \
@ -658,7 +583,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.hh.in $(TAGS_DEPENDENCIES) \
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \ fi; \
done; \ done; \
list='$(SOURCES) $(HEADERS) config.hh.in $(LISP) $(TAGS_FILES)'; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \ unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \ done | \
@ -670,11 +595,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.hh.in $(TAGS_DEPENDENCIES) \
$$tags $$unique; \ $$tags $$unique; \
fi fi
ctags: CTAGS ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.hh.in $(TAGS_DEPENDENCIES) \ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP) $(TAGS_FILES) $(LISP)
tags=; \ tags=; \
here=`pwd`; \ here=`pwd`; \
list='$(SOURCES) $(HEADERS) config.hh.in $(LISP) $(TAGS_FILES)'; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \ unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \ done | \
@ -736,10 +661,10 @@ distdir: $(DISTFILES)
done done
check-am: all-am check-am: all-am
check: check-recursive check: check-recursive
all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.hh all-am: Makefile $(LTLIBRARIES)
installdirs: installdirs-recursive installdirs: installdirs-recursive
installdirs-am: installdirs-am:
for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \ for dir in "$(DESTDIR)$(libdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \ test -z "$$dir" || $(mkdir_p) "$$dir"; \
done done
install: install-recursive install: install-recursive
@ -775,7 +700,7 @@ distclean: distclean-recursive
-rm -rf ./$(DEPDIR) -rm -rf ./$(DEPDIR)
-rm -f Makefile -rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \ distclean-am: clean-am distclean-compile distclean-generic \
distclean-hdr distclean-libtool distclean-tags distclean-libtool distclean-tags
dvi: dvi-recursive dvi: dvi-recursive
@ -787,7 +712,7 @@ info: info-recursive
info-am: info-am:
install-data-am: install-nobase_includeHEADERS install-data-am:
install-exec-am: install-libLTLIBRARIES install-exec-am: install-libLTLIBRARIES
@ -815,27 +740,24 @@ ps: ps-recursive
ps-am: ps-am:
uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
uninstall-nobase_includeHEADERS
uninstall-info: uninstall-info-recursive uninstall-info: uninstall-info-recursive
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
clean clean-generic clean-libLTLIBRARIES clean-libtool \ clean clean-generic clean-libLTLIBRARIES clean-libtool \
clean-recursive ctags ctags-recursive distclean \ clean-recursive ctags ctags-recursive distclean \
distclean-compile distclean-generic distclean-hdr \ distclean-compile distclean-generic distclean-libtool \
distclean-libtool distclean-recursive distclean-tags distdir \ distclean-recursive distclean-tags distdir dvi dvi-am html \
dvi dvi-am html html-am info info-am install install-am \ html-am info info-am install install-am install-data \
install-data install-data-am install-exec install-exec-am \ install-data-am install-exec install-exec-am install-info \
install-info install-info-am install-libLTLIBRARIES \ install-info-am install-libLTLIBRARIES install-man \
install-man install-nobase_includeHEADERS install-strip \ install-strip installcheck installcheck-am installdirs \
installcheck installcheck-am installdirs installdirs-am \ installdirs-am maintainer-clean maintainer-clean-generic \
maintainer-clean maintainer-clean-generic \
maintainer-clean-recursive mostlyclean mostlyclean-compile \ maintainer-clean-recursive mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
uninstall-info-am uninstall-libLTLIBRARIES \ uninstall-info-am uninstall-libLTLIBRARIES
uninstall-nobase_includeHEADERS
# Tell versions [3.59,3.63) of GNU make to not export all variables. # Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded. # Otherwise a system limit (for SysV at least) may be exceeded.

View file

@ -3,5 +3,5 @@ postgis_la_SOURCES = resultset.hh connection.hh connection_manager.hh postgis.cc
postgis_la_LIBDADD = postgis_la_LIBDADD =
postgis_la_LDFLAGS = -module -version-info 0:0:0 $(POSTGRESQL_LIBS) -lpthread postgis_la_LDFLAGS = -module -version-info 0:0:0 $(POSTGRESQL_LIBS) -lpthread
postgis_la_CXXFLAGS = -I$(top_srcdir)/src postgis_la_CXXFLAGS = -I$(top_srcdir)/include
postgis_la_CXXFLAGS += $(POSTGRESQL_CFLAGS) postgis_la_CXXFLAGS += $(POSTGRESQL_CFLAGS)

View file

@ -46,7 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4) $(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/config.hh CONFIG_HEADER = $(top_builddir)/include/config.hh
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \ am__vpath_adj = case $$p in \
@ -60,7 +60,7 @@ LTLIBRARIES = $(plugins_LTLIBRARIES)
postgis_la_LIBADD = postgis_la_LIBADD =
am_postgis_la_OBJECTS = postgis_la-postgis.lo postgis_la-postgisfs.lo am_postgis_la_OBJECTS = postgis_la-postgis.lo postgis_la-postgisfs.lo
postgis_la_OBJECTS = $(am_postgis_la_OBJECTS) postgis_la_OBJECTS = $(am_postgis_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
depcomp = $(SHELL) $(top_srcdir)/depcomp depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@ -200,7 +200,7 @@ plugins_LTLIBRARIES = postgis.la
postgis_la_SOURCES = resultset.hh connection.hh connection_manager.hh postgis.cc postgisfs.cc postgis.hh postgis_la_SOURCES = resultset.hh connection.hh connection_manager.hh postgis.cc postgisfs.cc postgis.hh
postgis_la_LIBDADD = postgis_la_LIBDADD =
postgis_la_LDFLAGS = -module -version-info 0:0:0 $(POSTGRESQL_LIBS) -lpthread postgis_la_LDFLAGS = -module -version-info 0:0:0 $(POSTGRESQL_LIBS) -lpthread
postgis_la_CXXFLAGS = -I$(top_srcdir)/src $(POSTGRESQL_CFLAGS) postgis_la_CXXFLAGS = -I$(top_srcdir)/include $(POSTGRESQL_CFLAGS)
all: all-am all: all-am
.SUFFIXES: .SUFFIXES:

View file

@ -46,7 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4) $(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/config.hh CONFIG_HEADER = $(top_builddir)/include/config.hh
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \ am__vpath_adj = case $$p in \
@ -61,7 +61,7 @@ raster_la_LIBADD =
am_raster_la_OBJECTS = raster_la-raster_datasource.lo \ am_raster_la_OBJECTS = raster_la-raster_datasource.lo \
raster_la-raster_featureset.lo raster_la-raster_info.lo raster_la-raster_featureset.lo raster_la-raster_info.lo
raster_la_OBJECTS = $(am_raster_la_OBJECTS) raster_la_OBJECTS = $(am_raster_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
depcomp = $(SHELL) $(top_srcdir)/depcomp depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \

View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
//$Id: raster_datasource.cc 68 2004-11-23 22:39:58Z artem $ //$Id$
#include "raster_datasource.hh" #include "raster_datasource.hh"
#include "image_reader.hh" #include "image_reader.hh"

View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
//$Id: raster_datasource.hh 68 2004-11-23 22:39:58Z artem $ //$Id$
#ifndef RASTER_DATASOURCE_HH #ifndef RASTER_DATASOURCE_HH
#define RASTER_DATASOURCE_HH #define RASTER_DATASOURCE_HH

View file

@ -4,5 +4,5 @@ shape_la_SOURCES = dbffile.cc shape.cc shape_io.cc shape_featureset.cc shape_ind
shape_la_LIBDADD = shape_la_LIBDADD =
shape_la_LDFLAGS = -module -version-info 0:0:0 -lpthread shape_la_LDFLAGS = -module -version-info 0:0:0 -lpthread
shape_la_CXXFLAGS = -I$(top_srcdir)/src shape_la_CXXFLAGS = -I$(top_srcdir)/include

View file

@ -46,7 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4) $(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/config.hh CONFIG_HEADER = $(top_builddir)/include/config.hh
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \ am__vpath_adj = case $$p in \
@ -63,7 +63,7 @@ am_shape_la_OBJECTS = shape_la-dbffile.lo shape_la-shape.lo \
shape_la-shapefile.lo shape_la-shp_index.lo \ shape_la-shapefile.lo shape_la-shp_index.lo \
shape_la-dbf_test.lo shape_la-shape_index_featureset.lo shape_la-dbf_test.lo shape_la-shape_index_featureset.lo
shape_la_OBJECTS = $(am_shape_la_OBJECTS) shape_la_OBJECTS = $(am_shape_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
depcomp = $(SHELL) $(top_srcdir)/depcomp depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@ -203,7 +203,7 @@ plugins_LTLIBRARIES = shape.la
shape_la_SOURCES = dbffile.cc shape.cc shape_io.cc shape_featureset.cc shape_index_featureset.hh dbffile.hh shapefile.cc shape_featureset.hh shape_io.hh shp_index.cc dbf_test.cc shapefile.hh shape.hh shape_index_featureset.cc shp_index.hh shape_la_SOURCES = dbffile.cc shape.cc shape_io.cc shape_featureset.cc shape_index_featureset.hh dbffile.hh shapefile.cc shape_featureset.hh shape_io.hh shp_index.cc dbf_test.cc shapefile.hh shape.hh shape_index_featureset.cc shp_index.hh
shape_la_LIBDADD = shape_la_LIBDADD =
shape_la_LDFLAGS = -module -version-info 0:0:0 -lpthread shape_la_LDFLAGS = -module -version-info 0:0:0 -lpthread
shape_la_CXXFLAGS = -I$(top_srcdir)/src shape_la_CXXFLAGS = -I$(top_srcdir)/include
all: all-am all: all-am
.SUFFIXES: .SUFFIXES:

View file

@ -1,6 +1,6 @@
bin_PROGRAMS = shapeindex bin_PROGRAMS = shapeindex
shapeindex_SOURCES = quadtree.cc quadtree.hh shapeindex.cc shapeindex_SOURCES = quadtree.cc quadtree.hh shapeindex.cc
shapeindex_CXXFLAGS = -I$(srcdir)/../../src -I$(srcdir)/../../src/shape shapeindex_CXXFLAGS = -I$(srcdir)/../../include -I$(srcdir)/../../src/shape
SHAPELIB = ../../src/shape/.libs/shape.a SHAPELIB = ../../src/shape/.libs/shape.a
MAPNIKLIB = ../../src/.libs/libmapnik.a MAPNIKLIB = ../../src/.libs/libmapnik.a
shapeindex_LDADD = $(SHAPELIB) $(MAPNIKLIB) shapeindex_LDADD = $(SHAPELIB) $(MAPNIKLIB)

View file

@ -158,7 +158,7 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
target_alias = @target_alias@ target_alias = @target_alias@
shapeindex_SOURCES = quadtree.cc quadtree.hh shapeindex.cc shapeindex_SOURCES = quadtree.cc quadtree.hh shapeindex.cc
shapeindex_CXXFLAGS = -I$(srcdir)/../../src -I$(srcdir)/../../src/shape shapeindex_CXXFLAGS = -I$(srcdir)/../../include -I$(srcdir)/../../src/shape
SHAPELIB = ../../src/shape/.libs/shape.a SHAPELIB = ../../src/shape/.libs/shape.a
MAPNIKLIB = ../../src/.libs/libmapnik.a MAPNIKLIB = ../../src/.libs/libmapnik.a
shapeindex_LDADD = $(SHAPELIB) $(MAPNIKLIB) shapeindex_LDADD = $(SHAPELIB) $(MAPNIKLIB)

View file

@ -18,22 +18,22 @@
'm4_pattern_forbid' => 1, 'm4_pattern_forbid' => 1,
'AC_CANONICAL_TARGET' => 1, 'AC_CANONICAL_TARGET' => 1,
'AC_CONFIG_LIBOBJ_DIR' => 1, 'AC_CONFIG_LIBOBJ_DIR' => 1,
'AC_TYPE_OFF_T' => 1,
'AC_C_VOLATILE' => 1, 'AC_C_VOLATILE' => 1,
'AC_TYPE_OFF_T' => 1,
'AC_FUNC_CLOSEDIR_VOID' => 1, 'AC_FUNC_CLOSEDIR_VOID' => 1,
'AC_DEFUN' => 1,
'AC_REPLACE_FNMATCH' => 1, 'AC_REPLACE_FNMATCH' => 1,
'AC_DEFUN' => 1,
'AC_PROG_LIBTOOL' => 1, 'AC_PROG_LIBTOOL' => 1,
'AC_FUNC_STAT' => 1, 'AC_FUNC_STAT' => 1,
'AC_HEADER_TIME' => 1,
'AC_FUNC_WAIT3' => 1, 'AC_FUNC_WAIT3' => 1,
'AM_AUTOMAKE_VERSION' => 1, 'AC_HEADER_TIME' => 1,
'AC_STRUCT_TM' => 1,
'AC_FUNC_LSTAT' => 1, 'AC_FUNC_LSTAT' => 1,
'AC_TYPE_MODE_T' => 1, 'AC_STRUCT_TM' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'AC_FUNC_GETMNTENT' => 1, 'AC_FUNC_GETMNTENT' => 1,
'AC_FUNC_STRTOD' => 1, 'AC_TYPE_MODE_T' => 1,
'AC_CHECK_HEADERS' => 1, 'AC_CHECK_HEADERS' => 1,
'AC_FUNC_STRTOD' => 1,
'AC_FUNC_STRNLEN' => 1, 'AC_FUNC_STRNLEN' => 1,
'm4_sinclude' => 1, 'm4_sinclude' => 1,
'AC_PROG_CXX' => 1, 'AC_PROG_CXX' => 1,
@ -42,28 +42,28 @@
'AC_PROG_AWK' => 1, 'AC_PROG_AWK' => 1,
'_m4_warn' => 1, '_m4_warn' => 1,
'AC_HEADER_STDC' => 1, 'AC_HEADER_STDC' => 1,
'AC_PREREQ' => 1,
'AC_HEADER_MAJOR' => 1, 'AC_HEADER_MAJOR' => 1,
'AC_PREREQ' => 1,
'AC_FUNC_ERROR_AT_LINE' => 1, 'AC_FUNC_ERROR_AT_LINE' => 1,
'AC_PROG_GCC_TRADITIONAL' => 1, 'AC_PROG_GCC_TRADITIONAL' => 1,
'AC_LIBSOURCE' => 1, 'AC_LIBSOURCE' => 1,
'AC_FUNC_MBRTOWC' => 1, 'AC_FUNC_MBRTOWC' => 1,
'AC_STRUCT_ST_BLOCKS' => 1, 'AC_STRUCT_ST_BLOCKS' => 1,
'AC_TYPE_SIGNAL' => 1,
'AC_CANONICAL_BUILD' => 1, 'AC_CANONICAL_BUILD' => 1,
'AC_TYPE_SIGNAL' => 1,
'AC_TYPE_UID_T' => 1, 'AC_TYPE_UID_T' => 1,
'AC_CONFIG_AUX_DIR' => 1,
'AC_PROG_MAKE_SET' => 1, 'AC_PROG_MAKE_SET' => 1,
'sinclude' => 1, 'AC_CONFIG_AUX_DIR' => 1,
'm4_pattern_allow' => 1, 'm4_pattern_allow' => 1,
'sinclude' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1, 'AC_DEFINE_TRACE_LITERAL' => 1,
'AC_FUNC_STRERROR_R' => 1, 'AC_FUNC_STRERROR_R' => 1,
'AC_PROG_CC' => 1, 'AC_PROG_CC' => 1,
'AC_DECL_SYS_SIGLIST' => 1,
'AC_FUNC_FORK' => 1, 'AC_FUNC_FORK' => 1,
'AC_FUNC_VPRINTF' => 1, 'AC_DECL_SYS_SIGLIST' => 1,
'AC_FUNC_STRCOLL' => 1,
'AU_DEFUN' => 1, 'AU_DEFUN' => 1,
'AC_FUNC_STRCOLL' => 1,
'AC_FUNC_VPRINTF' => 1,
'AC_PROG_YACC' => 1, 'AC_PROG_YACC' => 1,
'AC_INIT' => 1, 'AC_INIT' => 1,
'AC_STRUCT_TIMEZONE' => 1, 'AC_STRUCT_TIMEZONE' => 1,
@ -79,42 +79,42 @@
'AC_FUNC_MMAP' => 1, 'AC_FUNC_MMAP' => 1,
'AC_FUNC_REALLOC' => 1, 'AC_FUNC_REALLOC' => 1,
'AC_TYPE_SIZE_T' => 1, 'AC_TYPE_SIZE_T' => 1,
'AC_CHECK_TYPES' => 1,
'AC_CONFIG_LINKS' => 1, 'AC_CONFIG_LINKS' => 1,
'AC_CHECK_TYPES' => 1,
'LT_SUPPORTED_TAG' => 1, 'LT_SUPPORTED_TAG' => 1,
'AC_CHECK_MEMBERS' => 1, 'AC_CHECK_MEMBERS' => 1,
'AM_MAINTAINER_MODE' => 1, 'AM_MAINTAINER_MODE' => 1,
'AC_DEFUN_ONCE' => 1, 'AC_DEFUN_ONCE' => 1,
'AC_FUNC_UTIME_NULL' => 1, 'AC_FUNC_UTIME_NULL' => 1,
'AC_FUNC_SELECT_ARGTYPES' => 1, 'AC_FUNC_SELECT_ARGTYPES' => 1,
'AC_FUNC_STRFTIME' => 1,
'AC_HEADER_STAT' => 1, 'AC_HEADER_STAT' => 1,
'AC_C_INLINE' => 1, 'AC_FUNC_STRFTIME' => 1,
'AC_PROG_CPP' => 1, 'AC_PROG_CPP' => 1,
'AC_TYPE_PID_T' => 1, 'AC_C_INLINE' => 1,
'AC_C_CONST' => 1,
'AC_PROG_LEX' => 1,
'AM_ENABLE_MULTILIB' => 1, 'AM_ENABLE_MULTILIB' => 1,
'AC_PROG_LEX' => 1,
'AC_C_CONST' => 1,
'AC_TYPE_PID_T' => 1,
'AC_CONFIG_FILES' => 1, 'AC_CONFIG_FILES' => 1,
'include' => 1, 'include' => 1,
'AC_FUNC_SETVBUF_REVERSED' => 1, 'AC_FUNC_SETVBUF_REVERSED' => 1,
'AC_PROG_INSTALL' => 1, 'AC_PROG_INSTALL' => 1,
'AM_GNU_GETTEXT' => 1, 'AM_GNU_GETTEXT' => 1,
'AC_CHECK_LIB' => 1,
'AC_FUNC_OBSTACK' => 1, 'AC_FUNC_OBSTACK' => 1,
'AC_CHECK_LIB' => 1,
'AC_FUNC_MALLOC' => 1, 'AC_FUNC_MALLOC' => 1,
'AC_FUNC_GETGROUPS' => 1, 'AC_FUNC_GETGROUPS' => 1,
'AC_FUNC_GETLOADAVG' => 1, 'AC_FUNC_GETLOADAVG' => 1,
'AH_OUTPUT' => 1, 'AH_OUTPUT' => 1,
'AC_FUNC_FSEEKO' => 1, 'AC_FUNC_FSEEKO' => 1,
'AM_PROG_CC_C_O' => 1, 'AM_PROG_CC_C_O' => 1,
'AM_CONDITIONAL' => 1,
'AC_CANONICAL_SYSTEM' => 1,
'AC_FUNC_MKTIME' => 1, 'AC_FUNC_MKTIME' => 1,
'AC_CANONICAL_SYSTEM' => 1,
'AM_CONDITIONAL' => 1,
'AC_CONFIG_HEADERS' => 1, 'AC_CONFIG_HEADERS' => 1,
'AC_HEADER_SYS_WAIT' => 1, 'AC_HEADER_SYS_WAIT' => 1,
'AC_FUNC_MEMCMP' => 1,
'AC_PROG_LN_S' => 1, 'AC_PROG_LN_S' => 1,
'AC_FUNC_MEMCMP' => 1,
'm4_include' => 1, 'm4_include' => 1,
'AC_HEADER_DIRENT' => 1, 'AC_HEADER_DIRENT' => 1,
'AC_CHECK_FUNCS' => 1 'AC_CHECK_FUNCS' => 1
@ -149,24 +149,24 @@
{ {
'm4_pattern_forbid' => 1, 'm4_pattern_forbid' => 1,
'AC_CONFIG_LIBOBJ_DIR' => 1, 'AC_CONFIG_LIBOBJ_DIR' => 1,
'AC_C_VOLATILE' => 1,
'AC_TYPE_OFF_T' => 1, 'AC_TYPE_OFF_T' => 1,
'AC_C_VOLATILE' => 1,
'AC_FUNC_CLOSEDIR_VOID' => 1, 'AC_FUNC_CLOSEDIR_VOID' => 1,
'AC_REPLACE_FNMATCH' => 1, 'AC_REPLACE_FNMATCH' => 1,
'AC_DEFUN' => 1, 'AC_DEFUN' => 1,
'AC_PROG_LIBTOOL' => 1, 'AC_PROG_LIBTOOL' => 1,
'AM_PROG_MKDIR_P' => 1,
'AC_FUNC_STAT' => 1, 'AC_FUNC_STAT' => 1,
'AC_FUNC_WAIT3' => 1, 'AM_PROG_MKDIR_P' => 1,
'AC_HEADER_TIME' => 1, 'AC_HEADER_TIME' => 1,
'AM_AUTOMAKE_VERSION' => 1, 'AC_FUNC_WAIT3' => 1,
'AC_FUNC_LSTAT' => 1,
'AC_STRUCT_TM' => 1, 'AC_STRUCT_TM' => 1,
'AM_MISSING_HAS_RUN' => 1, 'AC_FUNC_LSTAT' => 1,
'AC_FUNC_GETMNTENT' => 1, 'AM_AUTOMAKE_VERSION' => 1,
'AC_TYPE_MODE_T' => 1, 'AC_TYPE_MODE_T' => 1,
'AC_CHECK_HEADERS' => 1, 'AC_FUNC_GETMNTENT' => 1,
'AM_MISSING_HAS_RUN' => 1,
'AC_FUNC_STRTOD' => 1, 'AC_FUNC_STRTOD' => 1,
'AC_CHECK_HEADERS' => 1,
'AM_MISSING_PROG' => 1, 'AM_MISSING_PROG' => 1,
'AC_FUNC_STRNLEN' => 1, 'AC_FUNC_STRNLEN' => 1,
'm4_sinclude' => 1, 'm4_sinclude' => 1,
@ -182,27 +182,27 @@
'_AM_PROG_TAR' => 1, '_AM_PROG_TAR' => 1,
'AC_FUNC_ERROR_AT_LINE' => 1, 'AC_FUNC_ERROR_AT_LINE' => 1,
'AC_PROG_GCC_TRADITIONAL' => 1, 'AC_PROG_GCC_TRADITIONAL' => 1,
'AM_DEP_TRACK' => 1,
'AC_LIBSOURCE' => 1, 'AC_LIBSOURCE' => 1,
'AM_DEP_TRACK' => 1,
'AC_FUNC_MBRTOWC' => 1, 'AC_FUNC_MBRTOWC' => 1,
'AC_STRUCT_ST_BLOCKS' => 1, 'AC_STRUCT_ST_BLOCKS' => 1,
'AC_TYPE_SIGNAL' => 1, 'AC_TYPE_SIGNAL' => 1,
'_AM_IF_OPTION' => 1,
'AC_TYPE_UID_T' => 1, 'AC_TYPE_UID_T' => 1,
'AC_PROG_MAKE_SET' => 1, '_AM_IF_OPTION' => 1,
'AC_CONFIG_AUX_DIR' => 1, 'AC_CONFIG_AUX_DIR' => 1,
'm4_pattern_allow' => 1, 'AC_PROG_MAKE_SET' => 1,
'sinclude' => 1, 'sinclude' => 1,
'm4_pattern_allow' => 1,
'AM_SET_LEADING_DOT' => 1, 'AM_SET_LEADING_DOT' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1, 'AC_DEFINE_TRACE_LITERAL' => 1,
'_AM_DEPENDENCIES' => 1, '_AM_DEPENDENCIES' => 1,
'AC_FUNC_STRERROR_R' => 1, 'AC_FUNC_STRERROR_R' => 1,
'AC_PROG_CC' => 1, 'AC_PROG_CC' => 1,
'AC_DECL_SYS_SIGLIST' => 1,
'AC_FUNC_FORK' => 1, 'AC_FUNC_FORK' => 1,
'AU_DEFUN' => 1, 'AC_DECL_SYS_SIGLIST' => 1,
'AC_FUNC_STRCOLL' => 1,
'AC_FUNC_VPRINTF' => 1, 'AC_FUNC_VPRINTF' => 1,
'AC_FUNC_STRCOLL' => 1,
'AU_DEFUN' => 1,
'AC_PROG_YACC' => 1, 'AC_PROG_YACC' => 1,
'AC_INIT' => 1, 'AC_INIT' => 1,
'AC_STRUCT_TIMEZONE' => 1, 'AC_STRUCT_TIMEZONE' => 1,
@ -211,61 +211,61 @@
'AC_SUBST' => 1, 'AC_SUBST' => 1,
'AC_FUNC_ALLOCA' => 1, 'AC_FUNC_ALLOCA' => 1,
'_AM_SET_OPTION' => 1, '_AM_SET_OPTION' => 1,
'AC_FUNC_GETPGRP' => 1,
'AC_CANONICAL_HOST' => 1, 'AC_CANONICAL_HOST' => 1,
'AC_FUNC_GETPGRP' => 1,
'AC_PROG_RANLIB' => 1, 'AC_PROG_RANLIB' => 1,
'AC_FUNC_SETPGRP' => 1,
'AM_INIT_AUTOMAKE' => 1, 'AM_INIT_AUTOMAKE' => 1,
'AC_FUNC_SETPGRP' => 1,
'AC_CONFIG_SUBDIRS' => 1, 'AC_CONFIG_SUBDIRS' => 1,
'AC_FUNC_MMAP' => 1, 'AC_FUNC_MMAP' => 1,
'AC_FUNC_REALLOC' => 1, 'AC_FUNC_REALLOC' => 1,
'AC_TYPE_SIZE_T' => 1, 'AC_TYPE_SIZE_T' => 1,
'AC_CHECK_TYPES' => 1,
'AC_CONFIG_LINKS' => 1, 'AC_CONFIG_LINKS' => 1,
'AC_CHECK_TYPES' => 1,
'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'AC_CHECK_MEMBERS' => 1, 'AC_CHECK_MEMBERS' => 1,
'AM_MAINTAINER_MODE' => 1, 'AM_MAINTAINER_MODE' => 1,
'AC_DEFUN_ONCE' => 1, 'AC_DEFUN_ONCE' => 1,
'AC_FUNC_UTIME_NULL' => 1, 'AC_FUNC_UTIME_NULL' => 1,
'AC_FUNC_SELECT_ARGTYPES' => 1, 'AC_FUNC_SELECT_ARGTYPES' => 1,
'AC_FUNC_STRFTIME' => 1,
'AC_HEADER_STAT' => 1, 'AC_HEADER_STAT' => 1,
'AC_C_INLINE' => 1, 'AC_FUNC_STRFTIME' => 1,
'AC_PROG_CPP' => 1, 'AC_PROG_CPP' => 1,
'AC_C_CONST' => 1, 'AC_C_INLINE' => 1,
'AC_PROG_LEX' => 1,
'AC_TYPE_PID_T' => 1, 'AC_TYPE_PID_T' => 1,
'AC_PROG_LEX' => 1,
'AC_C_CONST' => 1,
'AC_CONFIG_FILES' => 1, 'AC_CONFIG_FILES' => 1,
'include' => 1, 'include' => 1,
'AC_FUNC_SETVBUF_REVERSED' => 1, 'AC_FUNC_SETVBUF_REVERSED' => 1,
'AM_AUX_DIR_EXPAND' => 1,
'AC_PROG_INSTALL' => 1, 'AC_PROG_INSTALL' => 1,
'AM_AUX_DIR_EXPAND' => 1,
'AM_GNU_GETTEXT' => 1, 'AM_GNU_GETTEXT' => 1,
'AC_FUNC_OBSTACK' => 1,
'AC_CHECK_LIB' => 1, 'AC_CHECK_LIB' => 1,
'AC_FUNC_MALLOC' => 1, 'AC_FUNC_OBSTACK' => 1,
'_AM_SET_OPTIONS' => 1, '_AM_SET_OPTIONS' => 1,
'AC_FUNC_GETGROUPS' => 1, 'AC_FUNC_MALLOC' => 1,
'AM_RUN_LOG' => 1,
'_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'AM_RUN_LOG' => 1,
'AC_FUNC_GETGROUPS' => 1,
'AC_FUNC_GETLOADAVG' => 1, 'AC_FUNC_GETLOADAVG' => 1,
'AH_OUTPUT' => 1, 'AH_OUTPUT' => 1,
'AC_FUNC_FSEEKO' => 1, 'AC_FUNC_FSEEKO' => 1,
'AM_PROG_CC_C_O' => 1, 'AM_PROG_CC_C_O' => 1,
'_AM_MANGLE_OPTION' => 1, '_AM_MANGLE_OPTION' => 1,
'AC_FUNC_MKTIME' => 1,
'AM_CONDITIONAL' => 1,
'AC_CANONICAL_SYSTEM' => 1, 'AC_CANONICAL_SYSTEM' => 1,
'AM_CONDITIONAL' => 1,
'AC_FUNC_MKTIME' => 1,
'AC_CONFIG_HEADERS' => 1, 'AC_CONFIG_HEADERS' => 1,
'AM_SET_DEPDIR' => 1, 'AM_SET_DEPDIR' => 1,
'AC_HEADER_SYS_WAIT' => 1, 'AC_HEADER_SYS_WAIT' => 1,
'AC_FUNC_MEMCMP' => 1,
'AC_PROG_LN_S' => 1, 'AC_PROG_LN_S' => 1,
'AM_PROG_INSTALL_SH' => 1, 'AC_FUNC_MEMCMP' => 1,
'm4_include' => 1, 'm4_include' => 1,
'AM_PROG_INSTALL_SH' => 1,
'AC_HEADER_DIRENT' => 1, 'AC_HEADER_DIRENT' => 1,
'_AC_AM_CONFIG_HEADER_HOOK' => 1,
'AC_CHECK_FUNCS' => 1, 'AC_CHECK_FUNCS' => 1,
'_AC_AM_CONFIG_HEADER_HOOK' => 1,
'AM_MAKE_INCLUDE' => 1 'AM_MAKE_INCLUDE' => 1
} }
], 'Autom4te::Request' ), ], 'Autom4te::Request' ),
@ -285,21 +285,21 @@
'm4_pattern_forbid' => 1, 'm4_pattern_forbid' => 1,
'AC_CANONICAL_TARGET' => 1, 'AC_CANONICAL_TARGET' => 1,
'AC_CONFIG_LIBOBJ_DIR' => 1, 'AC_CONFIG_LIBOBJ_DIR' => 1,
'AC_TYPE_OFF_T' => 1,
'AC_C_VOLATILE' => 1, 'AC_C_VOLATILE' => 1,
'AC_TYPE_OFF_T' => 1,
'AC_FUNC_CLOSEDIR_VOID' => 1, 'AC_FUNC_CLOSEDIR_VOID' => 1,
'AC_REPLACE_FNMATCH' => 1, 'AC_REPLACE_FNMATCH' => 1,
'AC_PROG_LIBTOOL' => 1, 'AC_PROG_LIBTOOL' => 1,
'AC_FUNC_STAT' => 1, 'AC_FUNC_STAT' => 1,
'AC_HEADER_TIME' => 1,
'AC_FUNC_WAIT3' => 1, 'AC_FUNC_WAIT3' => 1,
'AC_STRUCT_TM' => 1, 'AC_HEADER_TIME' => 1,
'AC_FUNC_LSTAT' => 1,
'AM_AUTOMAKE_VERSION' => 1, 'AM_AUTOMAKE_VERSION' => 1,
'AC_TYPE_MODE_T' => 1, 'AC_FUNC_LSTAT' => 1,
'AC_STRUCT_TM' => 1,
'AC_FUNC_GETMNTENT' => 1, 'AC_FUNC_GETMNTENT' => 1,
'AC_FUNC_STRTOD' => 1, 'AC_TYPE_MODE_T' => 1,
'AC_CHECK_HEADERS' => 1, 'AC_CHECK_HEADERS' => 1,
'AC_FUNC_STRTOD' => 1,
'AC_FUNC_STRNLEN' => 1, 'AC_FUNC_STRNLEN' => 1,
'm4_sinclude' => 1, 'm4_sinclude' => 1,
'AC_PROG_CXX' => 1, 'AC_PROG_CXX' => 1,
@ -314,20 +314,20 @@
'AC_LIBSOURCE' => 1, 'AC_LIBSOURCE' => 1,
'AC_FUNC_MBRTOWC' => 1, 'AC_FUNC_MBRTOWC' => 1,
'AC_STRUCT_ST_BLOCKS' => 1, 'AC_STRUCT_ST_BLOCKS' => 1,
'AC_TYPE_SIGNAL' => 1,
'AC_CANONICAL_BUILD' => 1, 'AC_CANONICAL_BUILD' => 1,
'AC_TYPE_SIGNAL' => 1,
'AC_TYPE_UID_T' => 1, 'AC_TYPE_UID_T' => 1,
'AC_PROG_MAKE_SET' => 1,
'AC_CONFIG_AUX_DIR' => 1, 'AC_CONFIG_AUX_DIR' => 1,
'sinclude' => 1, 'AC_PROG_MAKE_SET' => 1,
'm4_pattern_allow' => 1, 'm4_pattern_allow' => 1,
'sinclude' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1, 'AC_DEFINE_TRACE_LITERAL' => 1,
'AC_FUNC_STRERROR_R' => 1, 'AC_FUNC_STRERROR_R' => 1,
'AC_PROG_CC' => 1, 'AC_PROG_CC' => 1,
'AC_FUNC_FORK' => 1,
'AC_DECL_SYS_SIGLIST' => 1, 'AC_DECL_SYS_SIGLIST' => 1,
'AC_FUNC_VPRINTF' => 1, 'AC_FUNC_FORK' => 1,
'AC_FUNC_STRCOLL' => 1, 'AC_FUNC_STRCOLL' => 1,
'AC_FUNC_VPRINTF' => 1,
'AC_PROG_YACC' => 1, 'AC_PROG_YACC' => 1,
'AC_STRUCT_TIMEZONE' => 1, 'AC_STRUCT_TIMEZONE' => 1,
'AC_INIT' => 1, 'AC_INIT' => 1,
@ -350,34 +350,34 @@
'AM_MAINTAINER_MODE' => 1, 'AM_MAINTAINER_MODE' => 1,
'AC_FUNC_UTIME_NULL' => 1, 'AC_FUNC_UTIME_NULL' => 1,
'AC_FUNC_SELECT_ARGTYPES' => 1, 'AC_FUNC_SELECT_ARGTYPES' => 1,
'AC_HEADER_STAT' => 1,
'AC_FUNC_STRFTIME' => 1, 'AC_FUNC_STRFTIME' => 1,
'AC_PROG_CPP' => 1, 'AC_HEADER_STAT' => 1,
'AC_C_INLINE' => 1, 'AC_C_INLINE' => 1,
'AC_TYPE_PID_T' => 1, 'AC_PROG_CPP' => 1,
'AC_PROG_LEX' => 1,
'AC_C_CONST' => 1,
'AM_ENABLE_MULTILIB' => 1, 'AM_ENABLE_MULTILIB' => 1,
'AC_C_CONST' => 1,
'AC_PROG_LEX' => 1,
'AC_TYPE_PID_T' => 1,
'AC_CONFIG_FILES' => 1, 'AC_CONFIG_FILES' => 1,
'include' => 1, 'include' => 1,
'AC_FUNC_SETVBUF_REVERSED' => 1, 'AC_FUNC_SETVBUF_REVERSED' => 1,
'AC_PROG_INSTALL' => 1, 'AC_PROG_INSTALL' => 1,
'AM_GNU_GETTEXT' => 1, 'AM_GNU_GETTEXT' => 1,
'AC_CHECK_LIB' => 1,
'AC_FUNC_OBSTACK' => 1, 'AC_FUNC_OBSTACK' => 1,
'AC_CHECK_LIB' => 1,
'AC_FUNC_MALLOC' => 1, 'AC_FUNC_MALLOC' => 1,
'AC_FUNC_GETGROUPS' => 1, 'AC_FUNC_GETGROUPS' => 1,
'AC_FUNC_GETLOADAVG' => 1, 'AC_FUNC_GETLOADAVG' => 1,
'AH_OUTPUT' => 1, 'AH_OUTPUT' => 1,
'AC_FUNC_FSEEKO' => 1, 'AC_FUNC_FSEEKO' => 1,
'AM_PROG_CC_C_O' => 1, 'AM_PROG_CC_C_O' => 1,
'AC_CANONICAL_SYSTEM' => 1,
'AM_CONDITIONAL' => 1,
'AC_FUNC_MKTIME' => 1, 'AC_FUNC_MKTIME' => 1,
'AM_CONDITIONAL' => 1,
'AC_CANONICAL_SYSTEM' => 1,
'AC_CONFIG_HEADERS' => 1, 'AC_CONFIG_HEADERS' => 1,
'AC_HEADER_SYS_WAIT' => 1, 'AC_HEADER_SYS_WAIT' => 1,
'AC_PROG_LN_S' => 1,
'AC_FUNC_MEMCMP' => 1, 'AC_FUNC_MEMCMP' => 1,
'AC_PROG_LN_S' => 1,
'm4_include' => 1, 'm4_include' => 1,
'AC_HEADER_DIRENT' => 1, 'AC_HEADER_DIRENT' => 1,
'AC_CHECK_FUNCS' => 1 'AC_CHECK_FUNCS' => 1