From 8e1d34f46e5fb97fdca96406c2d68203dd674a9c Mon Sep 17 00:00:00 2001 From: Artem Pavlenko Date: Sun, 10 Apr 2005 20:39:53 +0000 Subject: [PATCH] moved all headers into include dir --- Makefile.am | 2 +- Makefile.in | 4 +- configure | 7 +- configure.ac | 4 +- include/Makefile.am | 1 + {src => include}/attribute.hh | 0 {src => include}/attribute_collector.hh | 0 {src => include}/attribute_descriptor.hh | 0 {src => include}/color.hh | 0 {src => include}/colorcube.hh | 0 {src => include}/comparison.hh | 0 {src => include}/config.hh.in | 2 +- {src => include}/coord.hh | 0 {src => include}/coord_array.hh | 0 {src => include}/ctrans.hh | 2 +- {src => include}/datasource.hh | 0 {src => include}/datasource_cache.hh | 2 +- {src => include}/envelope.hh | 0 {src => include}/expression.hh | 0 {src => include}/factory.hh | 2 +- {src => include}/feature.hh | 0 {src => include}/feature_type_style.hh | 0 {src => include}/fill.hh | 0 {src => include}/filter.hh | 0 {src => include}/filter_visitor.hh | 0 {src => include}/gamma.hh | 0 {src => include}/geom_util.hh | 0 {src => include}/geometry.hh | 0 {src => include}/graphics.hh | 0 {src => include}/image_data.hh | 0 {src => include}/image_reader.hh | 0 {src => include}/image_symbolizer.hh | 0 {src => include}/image_util.hh | 2 +- {src => include}/layer.hh | 2 +- {src => include}/line_aa.hh | 2 +- {src => include}/line_symbolizer.hh | 0 {src => include}/logical.hh | 0 {src => include}/map.hh | 2 +- {src => include}/mapnik.hh | 0 {src => include}/memory.hh | 2 +- {src => include}/params.hh | 2 +- {src => include}/plugin.hh | 2 +- {src => include}/polygon_symbolizer.hh | 0 {src => include}/pool.hh | 2 +- {src => include}/ptr.hh | 0 {src => include}/query.hh | 0 {src => include}/raster.hh | 0 {src => include}/render.hh | 0 {src => include}/rule.hh | 0 {src => include}/scanline.hh | 2 +- {src => include}/scanline_aa.hh | 0 include/shp_index.hh | 43 +++++++ {src => include}/spatial.hh | 0 {src => include}/stroke.hh | 0 {src => include}/style.hh | 0 {src => include}/style_cache.hh | 0 {src => include}/style_factory.hh | 0 {src => include}/symbolizer.hh | 0 {src => include}/text.hh | 2 +- {src => include}/utils.hh | 0 {src => include}/vertex.hh | 0 {src => include}/vertex_transform.hh | 0 {src => include}/vertex_vector.hh | 0 {src => include}/wkb.hh | 0 m4/Makefile.in | 2 +- src/Makefile.am | 5 +- src/Makefile.in | 146 +++++----------------- src/postgis/Makefile.am | 2 +- src/postgis/Makefile.in | 6 +- src/raster/Makefile.in | 4 +- src/raster/raster_datasource.cc | 2 +- src/raster/raster_datasource.hh | 2 +- src/shape/Makefile.am | 2 +- src/shape/Makefile.in | 6 +- utils/shapeindex/Makefile.am | 2 +- utils/shapeindex/Makefile.in | 2 +- utils/shapeindex/autom4te.cache/requests | 152 +++++++++++------------ 77 files changed, 194 insertions(+), 228 deletions(-) create mode 100644 include/Makefile.am rename {src => include}/attribute.hh (100%) rename {src => include}/attribute_collector.hh (100%) rename {src => include}/attribute_descriptor.hh (100%) rename {src => include}/color.hh (100%) rename {src => include}/colorcube.hh (100%) rename {src => include}/comparison.hh (100%) rename {src => include}/config.hh.in (98%) rename {src => include}/coord.hh (100%) rename {src => include}/coord_array.hh (100%) rename {src => include}/ctrans.hh (98%) rename {src => include}/datasource.hh (100%) rename {src => include}/datasource_cache.hh (96%) rename {src => include}/envelope.hh (100%) rename {src => include}/expression.hh (100%) rename {src => include}/factory.hh (97%) rename {src => include}/feature.hh (100%) rename {src => include}/feature_type_style.hh (100%) rename {src => include}/fill.hh (100%) rename {src => include}/filter.hh (100%) rename {src => include}/filter_visitor.hh (100%) rename {src => include}/gamma.hh (100%) rename {src => include}/geom_util.hh (100%) rename {src => include}/geometry.hh (100%) rename {src => include}/graphics.hh (100%) rename {src => include}/image_data.hh (100%) rename {src => include}/image_reader.hh (100%) rename {src => include}/image_symbolizer.hh (100%) rename {src => include}/image_util.hh (99%) rename {src => include}/layer.hh (97%) rename {src => include}/line_aa.hh (96%) rename {src => include}/line_symbolizer.hh (100%) rename {src => include}/logical.hh (100%) rename {src => include}/map.hh (97%) rename {src => include}/mapnik.hh (100%) rename {src => include}/memory.hh (97%) rename {src => include}/params.hh (96%) rename {src => include}/plugin.hh (96%) rename {src => include}/polygon_symbolizer.hh (100%) rename {src => include}/pool.hh (98%) rename {src => include}/ptr.hh (100%) rename {src => include}/query.hh (100%) rename {src => include}/raster.hh (100%) rename {src => include}/render.hh (100%) rename {src => include}/rule.hh (100%) rename {src => include}/scanline.hh (96%) rename {src => include}/scanline_aa.hh (100%) create mode 100644 include/shp_index.hh rename {src => include}/spatial.hh (100%) rename {src => include}/stroke.hh (100%) rename {src => include}/style.hh (100%) rename {src => include}/style_cache.hh (100%) rename {src => include}/style_factory.hh (100%) rename {src => include}/symbolizer.hh (100%) rename {src => include}/text.hh (97%) rename {src => include}/utils.hh (100%) rename {src => include}/vertex.hh (100%) rename {src => include}/vertex_transform.hh (100%) rename {src => include}/vertex_vector.hh (100%) rename {src => include}/wkb.hh (100%) diff --git a/Makefile.am b/Makefile.am index 023c0fec7..5d3f7f19c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = m4 libltdl src utils/shapeindex +SUBDIRS = m4 libltdl include src utils/shapeindex ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = config.rpath mkinstalldirs diff --git a/Makefile.in b/Makefile.in index 97f74a728..b12b83cb2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -49,7 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno configure.status.lineno mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/src/config.hh +CONFIG_HEADER = $(top_builddir)/include/config.hh CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = @@ -185,7 +185,7 @@ sharedstatedir = @sharedstatedir@ subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -SUBDIRS = m4 libltdl src utils/shapeindex +SUBDIRS = m4 libltdl include src utils/shapeindex ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = config.rpath mkinstalldirs all: all-recursive diff --git a/configure b/configure index 0bdc81059..50992fe2b 100755 --- a/configure +++ b/configure @@ -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 - 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" @@ -24021,12 +24021,13 @@ do # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES 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/shape/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/shape/Makefile" ;; "src/raster/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/raster/Makefile" ;; "src/postgis/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/postgis/Makefile" ;; "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: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; diff --git a/configure.ac b/configure.ac index 44633998d..b065ae203 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) AC_INIT([mapnik],[0.1]) -AC_CONFIG_HEADERS([src/config.hh]) +AC_CONFIG_HEADERS([include/config.hh]) AC_REVISION([$Revision: 1.1 $]) AC_CONFIG_SRCDIR([src/params.cc]) AM_INIT_AUTOMAKE([dist-bzip2]) @@ -80,7 +80,7 @@ if test "$package_postgis_enabled" = yes ; then AP_CHECK_POSTGRESQL 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_DEFINE_UNQUOTED([_DATASOURCE_PLUGINS_DIR],["$pluginsdir"],[datasource plugins dir]) diff --git a/include/Makefile.am b/include/Makefile.am new file mode 100644 index 000000000..a7907003e --- /dev/null +++ b/include/Makefile.am @@ -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 diff --git a/src/attribute.hh b/include/attribute.hh similarity index 100% rename from src/attribute.hh rename to include/attribute.hh diff --git a/src/attribute_collector.hh b/include/attribute_collector.hh similarity index 100% rename from src/attribute_collector.hh rename to include/attribute_collector.hh diff --git a/src/attribute_descriptor.hh b/include/attribute_descriptor.hh similarity index 100% rename from src/attribute_descriptor.hh rename to include/attribute_descriptor.hh diff --git a/src/color.hh b/include/color.hh similarity index 100% rename from src/color.hh rename to include/color.hh diff --git a/src/colorcube.hh b/include/colorcube.hh similarity index 100% rename from src/colorcube.hh rename to include/colorcube.hh diff --git a/src/comparison.hh b/include/comparison.hh similarity index 100% rename from src/comparison.hh rename to include/comparison.hh diff --git a/src/config.hh.in b/include/config.hh.in similarity index 98% rename from src/config.hh.in rename to include/config.hh.in index fe0e2c866..0c0ce550f 100644 --- a/src/config.hh.in +++ b/include/config.hh.in @@ -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'. */ #undef CLOSEDIR_VOID diff --git a/src/coord.hh b/include/coord.hh similarity index 100% rename from src/coord.hh rename to include/coord.hh diff --git a/src/coord_array.hh b/include/coord_array.hh similarity index 100% rename from src/coord_array.hh rename to include/coord_array.hh diff --git a/src/ctrans.hh b/include/ctrans.hh similarity index 98% rename from src/ctrans.hh rename to include/ctrans.hh index 0571a5f95..de96a78b8 100644 --- a/src/ctrans.hh +++ b/include/ctrans.hh @@ -16,7 +16,7 @@ * 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 #define CTRANS_HH diff --git a/src/datasource.hh b/include/datasource.hh similarity index 100% rename from src/datasource.hh rename to include/datasource.hh diff --git a/src/datasource_cache.hh b/include/datasource_cache.hh similarity index 96% rename from src/datasource_cache.hh rename to include/datasource_cache.hh index 3d55a52a6..e25c2d851 100644 --- a/src/datasource_cache.hh +++ b/include/datasource_cache.hh @@ -16,7 +16,7 @@ * 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 #define DSFACTORY_HH diff --git a/src/envelope.hh b/include/envelope.hh similarity index 100% rename from src/envelope.hh rename to include/envelope.hh diff --git a/src/expression.hh b/include/expression.hh similarity index 100% rename from src/expression.hh rename to include/expression.hh diff --git a/src/factory.hh b/include/factory.hh similarity index 97% rename from src/factory.hh rename to include/factory.hh index e06edb7b2..62c791b56 100644 --- a/src/factory.hh +++ b/include/factory.hh @@ -16,7 +16,7 @@ * 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 #define FACTORY_HH diff --git a/src/feature.hh b/include/feature.hh similarity index 100% rename from src/feature.hh rename to include/feature.hh diff --git a/src/feature_type_style.hh b/include/feature_type_style.hh similarity index 100% rename from src/feature_type_style.hh rename to include/feature_type_style.hh diff --git a/src/fill.hh b/include/fill.hh similarity index 100% rename from src/fill.hh rename to include/fill.hh diff --git a/src/filter.hh b/include/filter.hh similarity index 100% rename from src/filter.hh rename to include/filter.hh diff --git a/src/filter_visitor.hh b/include/filter_visitor.hh similarity index 100% rename from src/filter_visitor.hh rename to include/filter_visitor.hh diff --git a/src/gamma.hh b/include/gamma.hh similarity index 100% rename from src/gamma.hh rename to include/gamma.hh diff --git a/src/geom_util.hh b/include/geom_util.hh similarity index 100% rename from src/geom_util.hh rename to include/geom_util.hh diff --git a/src/geometry.hh b/include/geometry.hh similarity index 100% rename from src/geometry.hh rename to include/geometry.hh diff --git a/src/graphics.hh b/include/graphics.hh similarity index 100% rename from src/graphics.hh rename to include/graphics.hh diff --git a/src/image_data.hh b/include/image_data.hh similarity index 100% rename from src/image_data.hh rename to include/image_data.hh diff --git a/src/image_reader.hh b/include/image_reader.hh similarity index 100% rename from src/image_reader.hh rename to include/image_reader.hh diff --git a/src/image_symbolizer.hh b/include/image_symbolizer.hh similarity index 100% rename from src/image_symbolizer.hh rename to include/image_symbolizer.hh diff --git a/src/image_util.hh b/include/image_util.hh similarity index 99% rename from src/image_util.hh rename to include/image_util.hh index ed7d78484..b62459566 100644 --- a/src/image_util.hh +++ b/include/image_util.hh @@ -16,7 +16,7 @@ * 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 #define IMAGE_UTIL_HH diff --git a/src/layer.hh b/include/layer.hh similarity index 97% rename from src/layer.hh rename to include/layer.hh index 9aa6e5528..3b9f016f6 100644 --- a/src/layer.hh +++ b/include/layer.hh @@ -16,7 +16,7 @@ * 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 #define LAYER_HH diff --git a/src/line_aa.hh b/include/line_aa.hh similarity index 96% rename from src/line_aa.hh rename to include/line_aa.hh index 9d02306d8..b16c34eee 100644 --- a/src/line_aa.hh +++ b/include/line_aa.hh @@ -16,7 +16,7 @@ * 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 #define LINE_AA_HH diff --git a/src/line_symbolizer.hh b/include/line_symbolizer.hh similarity index 100% rename from src/line_symbolizer.hh rename to include/line_symbolizer.hh diff --git a/src/logical.hh b/include/logical.hh similarity index 100% rename from src/logical.hh rename to include/logical.hh diff --git a/src/map.hh b/include/map.hh similarity index 97% rename from src/map.hh rename to include/map.hh index 5c90cda85..3c1a091f7 100644 --- a/src/map.hh +++ b/include/map.hh @@ -16,7 +16,7 @@ * 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 #define MAP_HH diff --git a/src/mapnik.hh b/include/mapnik.hh similarity index 100% rename from src/mapnik.hh rename to include/mapnik.hh diff --git a/src/memory.hh b/include/memory.hh similarity index 97% rename from src/memory.hh rename to include/memory.hh index c999c533f..6f7b9c58c 100644 --- a/src/memory.hh +++ b/include/memory.hh @@ -16,7 +16,7 @@ * 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 #define MEMORY_HH diff --git a/src/params.hh b/include/params.hh similarity index 96% rename from src/params.hh rename to include/params.hh index f506ad786..351dade31 100644 --- a/src/params.hh +++ b/include/params.hh @@ -16,7 +16,7 @@ * 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 #define PARAMS_HH diff --git a/src/plugin.hh b/include/plugin.hh similarity index 96% rename from src/plugin.hh rename to include/plugin.hh index 231f0c9de..0f1aa8e7e 100644 --- a/src/plugin.hh +++ b/include/plugin.hh @@ -16,7 +16,7 @@ * 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 #define PLUGIN_HH diff --git a/src/polygon_symbolizer.hh b/include/polygon_symbolizer.hh similarity index 100% rename from src/polygon_symbolizer.hh rename to include/polygon_symbolizer.hh diff --git a/src/pool.hh b/include/pool.hh similarity index 98% rename from src/pool.hh rename to include/pool.hh index 4c17840c1..62acc46b1 100644 --- a/src/pool.hh +++ b/include/pool.hh @@ -16,7 +16,7 @@ * 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 #define POOL_HH diff --git a/src/ptr.hh b/include/ptr.hh similarity index 100% rename from src/ptr.hh rename to include/ptr.hh diff --git a/src/query.hh b/include/query.hh similarity index 100% rename from src/query.hh rename to include/query.hh diff --git a/src/raster.hh b/include/raster.hh similarity index 100% rename from src/raster.hh rename to include/raster.hh diff --git a/src/render.hh b/include/render.hh similarity index 100% rename from src/render.hh rename to include/render.hh diff --git a/src/rule.hh b/include/rule.hh similarity index 100% rename from src/rule.hh rename to include/rule.hh diff --git a/src/scanline.hh b/include/scanline.hh similarity index 96% rename from src/scanline.hh rename to include/scanline.hh index 65062b6f4..31a616137 100644 --- a/src/scanline.hh +++ b/include/scanline.hh @@ -16,7 +16,7 @@ * 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 #define SCANLINE_HH diff --git a/src/scanline_aa.hh b/include/scanline_aa.hh similarity index 100% rename from src/scanline_aa.hh rename to include/scanline_aa.hh diff --git a/include/shp_index.hh b/include/shp_index.hh new file mode 100644 index 000000000..675284d06 --- /dev/null +++ b/include/shp_index.hh @@ -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 +#include + +using namespace mapnik; + +template +class shp_index +{ +public: + static void query(const filterT& filter,std::ifstream& file,std::set& 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 &envelope); + static void query_node(const filterT& filter,std::ifstream& file,std::set& pos); +}; + +#endif //SHP_INDEX_HH diff --git a/src/spatial.hh b/include/spatial.hh similarity index 100% rename from src/spatial.hh rename to include/spatial.hh diff --git a/src/stroke.hh b/include/stroke.hh similarity index 100% rename from src/stroke.hh rename to include/stroke.hh diff --git a/src/style.hh b/include/style.hh similarity index 100% rename from src/style.hh rename to include/style.hh diff --git a/src/style_cache.hh b/include/style_cache.hh similarity index 100% rename from src/style_cache.hh rename to include/style_cache.hh diff --git a/src/style_factory.hh b/include/style_factory.hh similarity index 100% rename from src/style_factory.hh rename to include/style_factory.hh diff --git a/src/symbolizer.hh b/include/symbolizer.hh similarity index 100% rename from src/symbolizer.hh rename to include/symbolizer.hh diff --git a/src/text.hh b/include/text.hh similarity index 97% rename from src/text.hh rename to include/text.hh index 2014814bf..14b3001de 100644 --- a/src/text.hh +++ b/include/text.hh @@ -16,7 +16,7 @@ * 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 #define TEXT_HH diff --git a/src/utils.hh b/include/utils.hh similarity index 100% rename from src/utils.hh rename to include/utils.hh diff --git a/src/vertex.hh b/include/vertex.hh similarity index 100% rename from src/vertex.hh rename to include/vertex.hh diff --git a/src/vertex_transform.hh b/include/vertex_transform.hh similarity index 100% rename from src/vertex_transform.hh rename to include/vertex_transform.hh diff --git a/src/vertex_vector.hh b/include/vertex_vector.hh similarity index 100% rename from src/vertex_vector.hh rename to include/vertex_vector.hh diff --git a/src/wkb.hh b/include/wkb.hh similarity index 100% rename from src/wkb.hh rename to include/wkb.hh diff --git a/m4/Makefile.in b/m4/Makefile.in index 6cf56037c..f431f42b1 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/src/config.hh +CONFIG_HEADER = $(top_builddir)/include/config.hh CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = diff --git a/src/Makefile.am b/src/Makefile.am index 71f4bbf3a..8e8afcf39 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,15 +1,14 @@ #Copyright (C) 2005 by Artem Pavlenko 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 libmapnik_la_SOURCES += tiff_reader.cc endif -libmapnik_la_CPPFLAGS = $(FREETYPE2_CFLAGS) +libmapnik_la_CPPFLAGS = -I$(top_srcdir)/include $(FREETYPE2_CFLAGS) libmapnik_la_CPPFLAGS += @INCLTDL@ libmapnik_la_LIBADD = @LIBLTDL@ -lpthread -lpng -ljpeg $(FREETYPE2_LIBS) -lz -lm libmapnik_la_LDFLAGS= -version-info 0:0:0 $(TIFF_LDFLAGS) diff --git a/src/Makefile.in b/src/Makefile.in index 771985493..49c15a092 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -16,7 +16,6 @@ #Copyright (C) 2005 by Artem Pavlenko - SOURCES = $(libmapnik_la_SOURCES) srcdir = @srcdir@ @@ -43,15 +42,14 @@ build_triplet = @build@ host_triplet = @host@ @BUILD_TIFF_READER_TRUE@am__append_1 = tiff_reader.cc subdir = src -DIST_COMMON = $(nobase_include_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.hh.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = config.hh +CONFIG_HEADER = $(top_builddir)/include/config.hh CONFIG_CLEAN_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -59,28 +57,15 @@ am__vpath_adj = case $$p in \ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" +am__installdirs = "$(DESTDIR)$(libdir)" libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) libmapnik_la_DEPENDENCIES = -am__libmapnik_la_SOURCES_DIST = 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 tiff_reader.cc +am__libmapnik_la_SOURCES_DIST = 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 tiff_reader.cc @BUILD_TIFF_READER_TRUE@am__objects_1 = libmapnik_la-tiff_reader.lo am_libmapnik_la_OBJECTS = libmapnik_la-color.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-wkb.lo $(am__objects_1) 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 am__depfiles_maybe = depfiles CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -105,14 +90,6 @@ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(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) DIST_SOURCES = $(am__libmapnik_la_SOURCES_DIST) 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 \ pdf-recursive ps-recursive uninstall-info-recursive \ uninstall-recursive -nobase_includeHEADERS_INSTALL = $(install_sh_DATA) -HEADERS = $(nobase_include_HEADERS) ETAGS = etags CTAGS = ctags DIST_SUBDIRS = shape raster postgis @@ -240,34 +215,20 @@ subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ 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 $(am__append_1) -libmapnik_la_CPPFLAGS = $(FREETYPE2_CFLAGS) @INCLTDL@ +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 $(am__append_1) +libmapnik_la_CPPFLAGS = -I$(top_srcdir)/include $(FREETYPE2_CFLAGS) \ + @INCLTDL@ $(am__empty) libmapnik_la_LIBADD = @LIBLTDL@ -lpthread -lpng -ljpeg $(FREETYPE2_LIBS) -lz -lm libmapnik_la_LDFLAGS = -version-info 0:0:0 $(TIFF_LDFLAGS) @SHAPE_DATASOURCE_TRUE@SHAPE_DATASOURCE_DIR = shape @RASTER_DATASOURCE_TRUE@RASTER_DATASOURCE_DIR = raster @POSTGIS_DATASOURCE_TRUE@POSTGIS_DATASOURCE_DIR = postgis SUBDIRS = $(SHAPE_DATASOURCE_DIR) $(RASTER_DATASOURCE_DIR) $(POSTGIS_DATASOURCE_DIR) -all: config.hh - $(MAKE) $(AM_MAKEFLAGS) all-recursive +all: all-recursive .SUFFIXES: .SUFFIXES: .cc .lo .o .obj @@ -300,23 +261,6 @@ $(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) 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) @$(NORMAL_INSTALL) test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" @@ -552,25 +496,6 @@ clean-libtool: distclean-libtool: -rm -f libtool 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 # into them and run `make' without going through this Makefile. @@ -641,7 +566,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) mkid -fID $$unique tags: TAGS -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.hh.in $(TAGS_DEPENDENCIES) \ +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ @@ -658,7 +583,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.hh.in $(TAGS_DEPENDENCIES) \ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) config.hh.in $(LISP) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -670,11 +595,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.hh.in $(TAGS_DEPENDENCIES) \ $$tags $$unique; \ fi ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.hh.in $(TAGS_DEPENDENCIES) \ +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) config.hh.in $(LISP) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -736,10 +661,10 @@ distdir: $(DISTFILES) done check-am: all-am check: check-recursive -all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.hh +all-am: Makefile $(LTLIBRARIES) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \ + for dir in "$(DESTDIR)$(libdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-recursive @@ -775,7 +700,7 @@ distclean: distclean-recursive -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ - distclean-hdr distclean-libtool distclean-tags + distclean-libtool distclean-tags dvi: dvi-recursive @@ -787,7 +712,7 @@ info: info-recursive info-am: -install-data-am: install-nobase_includeHEADERS +install-data-am: install-exec-am: install-libLTLIBRARIES @@ -815,27 +740,24 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \ - uninstall-nobase_includeHEADERS +uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES uninstall-info: uninstall-info-recursive .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ clean clean-generic clean-libLTLIBRARIES clean-libtool \ clean-recursive ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-hdr \ - distclean-libtool distclean-recursive distclean-tags distdir \ - dvi dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-libLTLIBRARIES \ - install-man install-nobase_includeHEADERS install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic \ + distclean-compile distclean-generic distclean-libtool \ + distclean-recursive distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-libLTLIBRARIES install-man \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ maintainer-clean-recursive mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-info-am uninstall-libLTLIBRARIES \ - uninstall-nobase_includeHEADERS + uninstall-info-am uninstall-libLTLIBRARIES # 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. diff --git a/src/postgis/Makefile.am b/src/postgis/Makefile.am index 58e0c1b22..07759fbb0 100644 --- a/src/postgis/Makefile.am +++ b/src/postgis/Makefile.am @@ -3,5 +3,5 @@ postgis_la_SOURCES = resultset.hh connection.hh connection_manager.hh postgis.cc postgis_la_LIBDADD = 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) diff --git a/src/postgis/Makefile.in b/src/postgis/Makefile.in index 2afe2313e..649112408 100644 --- a/src/postgis/Makefile.in +++ b/src/postgis/Makefile.in @@ -46,7 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/src/config.hh +CONFIG_HEADER = $(top_builddir)/include/config.hh CONFIG_CLEAN_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -60,7 +60,7 @@ LTLIBRARIES = $(plugins_LTLIBRARIES) postgis_la_LIBADD = am_postgis_la_OBJECTS = postgis_la-postgis.lo postgis_la-postgisfs.lo 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 am__depfiles_maybe = depfiles 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_LIBDADD = 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 .SUFFIXES: diff --git a/src/raster/Makefile.in b/src/raster/Makefile.in index e216f26e3..e8a305af8 100644 --- a/src/raster/Makefile.in +++ b/src/raster/Makefile.in @@ -46,7 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/src/config.hh +CONFIG_HEADER = $(top_builddir)/include/config.hh CONFIG_CLEAN_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -61,7 +61,7 @@ raster_la_LIBADD = am_raster_la_OBJECTS = raster_la-raster_datasource.lo \ raster_la-raster_featureset.lo raster_la-raster_info.lo 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 am__depfiles_maybe = depfiles CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ diff --git a/src/raster/raster_datasource.cc b/src/raster/raster_datasource.cc index eba06d2d5..0da27df01 100644 --- a/src/raster/raster_datasource.cc +++ b/src/raster/raster_datasource.cc @@ -16,7 +16,7 @@ * 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 "image_reader.hh" diff --git a/src/raster/raster_datasource.hh b/src/raster/raster_datasource.hh index 56ac63515..f9c69d528 100644 --- a/src/raster/raster_datasource.hh +++ b/src/raster/raster_datasource.hh @@ -16,7 +16,7 @@ * 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 #define RASTER_DATASOURCE_HH diff --git a/src/shape/Makefile.am b/src/shape/Makefile.am index 46caac9aa..992676c89 100644 --- a/src/shape/Makefile.am +++ b/src/shape/Makefile.am @@ -4,5 +4,5 @@ shape_la_SOURCES = dbffile.cc shape.cc shape_io.cc shape_featureset.cc shape_ind shape_la_LIBDADD = shape_la_LDFLAGS = -module -version-info 0:0:0 -lpthread -shape_la_CXXFLAGS = -I$(top_srcdir)/src +shape_la_CXXFLAGS = -I$(top_srcdir)/include diff --git a/src/shape/Makefile.in b/src/shape/Makefile.in index bfff450dd..432d35772 100644 --- a/src/shape/Makefile.in +++ b/src/shape/Makefile.in @@ -46,7 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/src/config.hh +CONFIG_HEADER = $(top_builddir)/include/config.hh CONFIG_CLEAN_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; 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-dbf_test.lo shape_la-shape_index_featureset.lo 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 am__depfiles_maybe = depfiles 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_LIBDADD = 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 .SUFFIXES: diff --git a/utils/shapeindex/Makefile.am b/utils/shapeindex/Makefile.am index d397aad78..b66b7dbcc 100644 --- a/utils/shapeindex/Makefile.am +++ b/utils/shapeindex/Makefile.am @@ -1,6 +1,6 @@ bin_PROGRAMS = shapeindex 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 MAPNIKLIB = ../../src/.libs/libmapnik.a shapeindex_LDADD = $(SHAPELIB) $(MAPNIKLIB) diff --git a/utils/shapeindex/Makefile.in b/utils/shapeindex/Makefile.in index 2ad06cf01..0bd2e7a55 100644 --- a/utils/shapeindex/Makefile.in +++ b/utils/shapeindex/Makefile.in @@ -158,7 +158,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ 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 MAPNIKLIB = ../../src/.libs/libmapnik.a shapeindex_LDADD = $(SHAPELIB) $(MAPNIKLIB) diff --git a/utils/shapeindex/autom4te.cache/requests b/utils/shapeindex/autom4te.cache/requests index d66ede1aa..49255e050 100644 --- a/utils/shapeindex/autom4te.cache/requests +++ b/utils/shapeindex/autom4te.cache/requests @@ -18,22 +18,22 @@ 'm4_pattern_forbid' => 1, 'AC_CANONICAL_TARGET' => 1, 'AC_CONFIG_LIBOBJ_DIR' => 1, - 'AC_TYPE_OFF_T' => 1, 'AC_C_VOLATILE' => 1, + 'AC_TYPE_OFF_T' => 1, 'AC_FUNC_CLOSEDIR_VOID' => 1, - 'AC_DEFUN' => 1, 'AC_REPLACE_FNMATCH' => 1, + 'AC_DEFUN' => 1, 'AC_PROG_LIBTOOL' => 1, 'AC_FUNC_STAT' => 1, - 'AC_HEADER_TIME' => 1, 'AC_FUNC_WAIT3' => 1, - 'AM_AUTOMAKE_VERSION' => 1, - 'AC_STRUCT_TM' => 1, + 'AC_HEADER_TIME' => 1, 'AC_FUNC_LSTAT' => 1, - 'AC_TYPE_MODE_T' => 1, + 'AC_STRUCT_TM' => 1, + 'AM_AUTOMAKE_VERSION' => 1, 'AC_FUNC_GETMNTENT' => 1, - 'AC_FUNC_STRTOD' => 1, + 'AC_TYPE_MODE_T' => 1, 'AC_CHECK_HEADERS' => 1, + 'AC_FUNC_STRTOD' => 1, 'AC_FUNC_STRNLEN' => 1, 'm4_sinclude' => 1, 'AC_PROG_CXX' => 1, @@ -42,28 +42,28 @@ 'AC_PROG_AWK' => 1, '_m4_warn' => 1, 'AC_HEADER_STDC' => 1, - 'AC_PREREQ' => 1, 'AC_HEADER_MAJOR' => 1, + 'AC_PREREQ' => 1, 'AC_FUNC_ERROR_AT_LINE' => 1, 'AC_PROG_GCC_TRADITIONAL' => 1, 'AC_LIBSOURCE' => 1, 'AC_FUNC_MBRTOWC' => 1, 'AC_STRUCT_ST_BLOCKS' => 1, - 'AC_TYPE_SIGNAL' => 1, 'AC_CANONICAL_BUILD' => 1, + 'AC_TYPE_SIGNAL' => 1, 'AC_TYPE_UID_T' => 1, - 'AC_CONFIG_AUX_DIR' => 1, 'AC_PROG_MAKE_SET' => 1, - 'sinclude' => 1, + 'AC_CONFIG_AUX_DIR' => 1, 'm4_pattern_allow' => 1, + 'sinclude' => 1, 'AC_DEFINE_TRACE_LITERAL' => 1, 'AC_FUNC_STRERROR_R' => 1, 'AC_PROG_CC' => 1, - 'AC_DECL_SYS_SIGLIST' => 1, 'AC_FUNC_FORK' => 1, - 'AC_FUNC_VPRINTF' => 1, - 'AC_FUNC_STRCOLL' => 1, + 'AC_DECL_SYS_SIGLIST' => 1, 'AU_DEFUN' => 1, + 'AC_FUNC_STRCOLL' => 1, + 'AC_FUNC_VPRINTF' => 1, 'AC_PROG_YACC' => 1, 'AC_INIT' => 1, 'AC_STRUCT_TIMEZONE' => 1, @@ -79,42 +79,42 @@ 'AC_FUNC_MMAP' => 1, 'AC_FUNC_REALLOC' => 1, 'AC_TYPE_SIZE_T' => 1, - 'AC_CHECK_TYPES' => 1, 'AC_CONFIG_LINKS' => 1, + 'AC_CHECK_TYPES' => 1, 'LT_SUPPORTED_TAG' => 1, 'AC_CHECK_MEMBERS' => 1, 'AM_MAINTAINER_MODE' => 1, 'AC_DEFUN_ONCE' => 1, 'AC_FUNC_UTIME_NULL' => 1, 'AC_FUNC_SELECT_ARGTYPES' => 1, - 'AC_FUNC_STRFTIME' => 1, 'AC_HEADER_STAT' => 1, - 'AC_C_INLINE' => 1, + 'AC_FUNC_STRFTIME' => 1, 'AC_PROG_CPP' => 1, - 'AC_TYPE_PID_T' => 1, - 'AC_C_CONST' => 1, - 'AC_PROG_LEX' => 1, + 'AC_C_INLINE' => 1, 'AM_ENABLE_MULTILIB' => 1, + 'AC_PROG_LEX' => 1, + 'AC_C_CONST' => 1, + 'AC_TYPE_PID_T' => 1, 'AC_CONFIG_FILES' => 1, 'include' => 1, 'AC_FUNC_SETVBUF_REVERSED' => 1, 'AC_PROG_INSTALL' => 1, 'AM_GNU_GETTEXT' => 1, - 'AC_CHECK_LIB' => 1, 'AC_FUNC_OBSTACK' => 1, + 'AC_CHECK_LIB' => 1, 'AC_FUNC_MALLOC' => 1, 'AC_FUNC_GETGROUPS' => 1, 'AC_FUNC_GETLOADAVG' => 1, 'AH_OUTPUT' => 1, 'AC_FUNC_FSEEKO' => 1, 'AM_PROG_CC_C_O' => 1, - 'AM_CONDITIONAL' => 1, - 'AC_CANONICAL_SYSTEM' => 1, 'AC_FUNC_MKTIME' => 1, + 'AC_CANONICAL_SYSTEM' => 1, + 'AM_CONDITIONAL' => 1, 'AC_CONFIG_HEADERS' => 1, 'AC_HEADER_SYS_WAIT' => 1, - 'AC_FUNC_MEMCMP' => 1, 'AC_PROG_LN_S' => 1, + 'AC_FUNC_MEMCMP' => 1, 'm4_include' => 1, 'AC_HEADER_DIRENT' => 1, 'AC_CHECK_FUNCS' => 1 @@ -149,24 +149,24 @@ { 'm4_pattern_forbid' => 1, 'AC_CONFIG_LIBOBJ_DIR' => 1, - 'AC_C_VOLATILE' => 1, 'AC_TYPE_OFF_T' => 1, + 'AC_C_VOLATILE' => 1, 'AC_FUNC_CLOSEDIR_VOID' => 1, 'AC_REPLACE_FNMATCH' => 1, 'AC_DEFUN' => 1, 'AC_PROG_LIBTOOL' => 1, - 'AM_PROG_MKDIR_P' => 1, 'AC_FUNC_STAT' => 1, - 'AC_FUNC_WAIT3' => 1, + 'AM_PROG_MKDIR_P' => 1, 'AC_HEADER_TIME' => 1, - 'AM_AUTOMAKE_VERSION' => 1, - 'AC_FUNC_LSTAT' => 1, + 'AC_FUNC_WAIT3' => 1, 'AC_STRUCT_TM' => 1, - 'AM_MISSING_HAS_RUN' => 1, - 'AC_FUNC_GETMNTENT' => 1, + 'AC_FUNC_LSTAT' => 1, + 'AM_AUTOMAKE_VERSION' => 1, 'AC_TYPE_MODE_T' => 1, - 'AC_CHECK_HEADERS' => 1, + 'AC_FUNC_GETMNTENT' => 1, + 'AM_MISSING_HAS_RUN' => 1, 'AC_FUNC_STRTOD' => 1, + 'AC_CHECK_HEADERS' => 1, 'AM_MISSING_PROG' => 1, 'AC_FUNC_STRNLEN' => 1, 'm4_sinclude' => 1, @@ -182,27 +182,27 @@ '_AM_PROG_TAR' => 1, 'AC_FUNC_ERROR_AT_LINE' => 1, 'AC_PROG_GCC_TRADITIONAL' => 1, - 'AM_DEP_TRACK' => 1, 'AC_LIBSOURCE' => 1, + 'AM_DEP_TRACK' => 1, 'AC_FUNC_MBRTOWC' => 1, 'AC_STRUCT_ST_BLOCKS' => 1, 'AC_TYPE_SIGNAL' => 1, - '_AM_IF_OPTION' => 1, 'AC_TYPE_UID_T' => 1, - 'AC_PROG_MAKE_SET' => 1, + '_AM_IF_OPTION' => 1, 'AC_CONFIG_AUX_DIR' => 1, - 'm4_pattern_allow' => 1, + 'AC_PROG_MAKE_SET' => 1, 'sinclude' => 1, + 'm4_pattern_allow' => 1, 'AM_SET_LEADING_DOT' => 1, 'AC_DEFINE_TRACE_LITERAL' => 1, '_AM_DEPENDENCIES' => 1, 'AC_FUNC_STRERROR_R' => 1, 'AC_PROG_CC' => 1, - 'AC_DECL_SYS_SIGLIST' => 1, 'AC_FUNC_FORK' => 1, - 'AU_DEFUN' => 1, - 'AC_FUNC_STRCOLL' => 1, + 'AC_DECL_SYS_SIGLIST' => 1, 'AC_FUNC_VPRINTF' => 1, + 'AC_FUNC_STRCOLL' => 1, + 'AU_DEFUN' => 1, 'AC_PROG_YACC' => 1, 'AC_INIT' => 1, 'AC_STRUCT_TIMEZONE' => 1, @@ -211,61 +211,61 @@ 'AC_SUBST' => 1, 'AC_FUNC_ALLOCA' => 1, '_AM_SET_OPTION' => 1, - 'AC_FUNC_GETPGRP' => 1, 'AC_CANONICAL_HOST' => 1, + 'AC_FUNC_GETPGRP' => 1, 'AC_PROG_RANLIB' => 1, - 'AC_FUNC_SETPGRP' => 1, 'AM_INIT_AUTOMAKE' => 1, + 'AC_FUNC_SETPGRP' => 1, 'AC_CONFIG_SUBDIRS' => 1, 'AC_FUNC_MMAP' => 1, 'AC_FUNC_REALLOC' => 1, 'AC_TYPE_SIZE_T' => 1, - 'AC_CHECK_TYPES' => 1, 'AC_CONFIG_LINKS' => 1, + 'AC_CHECK_TYPES' => 1, 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, 'AC_CHECK_MEMBERS' => 1, 'AM_MAINTAINER_MODE' => 1, 'AC_DEFUN_ONCE' => 1, 'AC_FUNC_UTIME_NULL' => 1, 'AC_FUNC_SELECT_ARGTYPES' => 1, - 'AC_FUNC_STRFTIME' => 1, 'AC_HEADER_STAT' => 1, - 'AC_C_INLINE' => 1, + 'AC_FUNC_STRFTIME' => 1, 'AC_PROG_CPP' => 1, - 'AC_C_CONST' => 1, - 'AC_PROG_LEX' => 1, + 'AC_C_INLINE' => 1, 'AC_TYPE_PID_T' => 1, + 'AC_PROG_LEX' => 1, + 'AC_C_CONST' => 1, 'AC_CONFIG_FILES' => 1, 'include' => 1, 'AC_FUNC_SETVBUF_REVERSED' => 1, - 'AM_AUX_DIR_EXPAND' => 1, 'AC_PROG_INSTALL' => 1, + 'AM_AUX_DIR_EXPAND' => 1, 'AM_GNU_GETTEXT' => 1, - 'AC_FUNC_OBSTACK' => 1, 'AC_CHECK_LIB' => 1, - 'AC_FUNC_MALLOC' => 1, + 'AC_FUNC_OBSTACK' => 1, '_AM_SET_OPTIONS' => 1, - 'AC_FUNC_GETGROUPS' => 1, - 'AM_RUN_LOG' => 1, + 'AC_FUNC_MALLOC' => 1, '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + 'AM_RUN_LOG' => 1, + 'AC_FUNC_GETGROUPS' => 1, 'AC_FUNC_GETLOADAVG' => 1, 'AH_OUTPUT' => 1, 'AC_FUNC_FSEEKO' => 1, 'AM_PROG_CC_C_O' => 1, '_AM_MANGLE_OPTION' => 1, - 'AC_FUNC_MKTIME' => 1, - 'AM_CONDITIONAL' => 1, 'AC_CANONICAL_SYSTEM' => 1, + 'AM_CONDITIONAL' => 1, + 'AC_FUNC_MKTIME' => 1, 'AC_CONFIG_HEADERS' => 1, 'AM_SET_DEPDIR' => 1, 'AC_HEADER_SYS_WAIT' => 1, - 'AC_FUNC_MEMCMP' => 1, 'AC_PROG_LN_S' => 1, - 'AM_PROG_INSTALL_SH' => 1, + 'AC_FUNC_MEMCMP' => 1, 'm4_include' => 1, + 'AM_PROG_INSTALL_SH' => 1, 'AC_HEADER_DIRENT' => 1, - '_AC_AM_CONFIG_HEADER_HOOK' => 1, 'AC_CHECK_FUNCS' => 1, + '_AC_AM_CONFIG_HEADER_HOOK' => 1, 'AM_MAKE_INCLUDE' => 1 } ], 'Autom4te::Request' ), @@ -285,21 +285,21 @@ 'm4_pattern_forbid' => 1, 'AC_CANONICAL_TARGET' => 1, 'AC_CONFIG_LIBOBJ_DIR' => 1, - 'AC_TYPE_OFF_T' => 1, 'AC_C_VOLATILE' => 1, + 'AC_TYPE_OFF_T' => 1, 'AC_FUNC_CLOSEDIR_VOID' => 1, 'AC_REPLACE_FNMATCH' => 1, 'AC_PROG_LIBTOOL' => 1, 'AC_FUNC_STAT' => 1, - 'AC_HEADER_TIME' => 1, 'AC_FUNC_WAIT3' => 1, - 'AC_STRUCT_TM' => 1, - 'AC_FUNC_LSTAT' => 1, + 'AC_HEADER_TIME' => 1, 'AM_AUTOMAKE_VERSION' => 1, - 'AC_TYPE_MODE_T' => 1, + 'AC_FUNC_LSTAT' => 1, + 'AC_STRUCT_TM' => 1, 'AC_FUNC_GETMNTENT' => 1, - 'AC_FUNC_STRTOD' => 1, + 'AC_TYPE_MODE_T' => 1, 'AC_CHECK_HEADERS' => 1, + 'AC_FUNC_STRTOD' => 1, 'AC_FUNC_STRNLEN' => 1, 'm4_sinclude' => 1, 'AC_PROG_CXX' => 1, @@ -314,20 +314,20 @@ 'AC_LIBSOURCE' => 1, 'AC_FUNC_MBRTOWC' => 1, 'AC_STRUCT_ST_BLOCKS' => 1, - 'AC_TYPE_SIGNAL' => 1, 'AC_CANONICAL_BUILD' => 1, + 'AC_TYPE_SIGNAL' => 1, 'AC_TYPE_UID_T' => 1, - 'AC_PROG_MAKE_SET' => 1, 'AC_CONFIG_AUX_DIR' => 1, - 'sinclude' => 1, + 'AC_PROG_MAKE_SET' => 1, 'm4_pattern_allow' => 1, + 'sinclude' => 1, 'AC_DEFINE_TRACE_LITERAL' => 1, 'AC_FUNC_STRERROR_R' => 1, 'AC_PROG_CC' => 1, - 'AC_FUNC_FORK' => 1, 'AC_DECL_SYS_SIGLIST' => 1, - 'AC_FUNC_VPRINTF' => 1, + 'AC_FUNC_FORK' => 1, 'AC_FUNC_STRCOLL' => 1, + 'AC_FUNC_VPRINTF' => 1, 'AC_PROG_YACC' => 1, 'AC_STRUCT_TIMEZONE' => 1, 'AC_INIT' => 1, @@ -350,34 +350,34 @@ 'AM_MAINTAINER_MODE' => 1, 'AC_FUNC_UTIME_NULL' => 1, 'AC_FUNC_SELECT_ARGTYPES' => 1, - 'AC_HEADER_STAT' => 1, 'AC_FUNC_STRFTIME' => 1, - 'AC_PROG_CPP' => 1, + 'AC_HEADER_STAT' => 1, 'AC_C_INLINE' => 1, - 'AC_TYPE_PID_T' => 1, - 'AC_PROG_LEX' => 1, - 'AC_C_CONST' => 1, + 'AC_PROG_CPP' => 1, 'AM_ENABLE_MULTILIB' => 1, + 'AC_C_CONST' => 1, + 'AC_PROG_LEX' => 1, + 'AC_TYPE_PID_T' => 1, 'AC_CONFIG_FILES' => 1, 'include' => 1, 'AC_FUNC_SETVBUF_REVERSED' => 1, 'AC_PROG_INSTALL' => 1, 'AM_GNU_GETTEXT' => 1, - 'AC_CHECK_LIB' => 1, 'AC_FUNC_OBSTACK' => 1, + 'AC_CHECK_LIB' => 1, 'AC_FUNC_MALLOC' => 1, 'AC_FUNC_GETGROUPS' => 1, 'AC_FUNC_GETLOADAVG' => 1, 'AH_OUTPUT' => 1, 'AC_FUNC_FSEEKO' => 1, 'AM_PROG_CC_C_O' => 1, - 'AC_CANONICAL_SYSTEM' => 1, - 'AM_CONDITIONAL' => 1, 'AC_FUNC_MKTIME' => 1, + 'AM_CONDITIONAL' => 1, + 'AC_CANONICAL_SYSTEM' => 1, 'AC_CONFIG_HEADERS' => 1, 'AC_HEADER_SYS_WAIT' => 1, - 'AC_PROG_LN_S' => 1, 'AC_FUNC_MEMCMP' => 1, + 'AC_PROG_LN_S' => 1, 'm4_include' => 1, 'AC_HEADER_DIRENT' => 1, 'AC_CHECK_FUNCS' => 1