compile utils with autotools

Makefile.am

@@ -5,7 +5,8 @@ SUBDIRS = src \
 	agg\
 	plugins\
 	include \
-	bindings 
+	bindings \
+	utils
 
 
 mapnikdocdir = ${prefix}/doc/mapnik

configure.ac

@@ -183,7 +183,7 @@ PKG_CHECK_MODULES(FREETYPE2, freetype2)
 AC_SUBST(FREETYPE2_CFLAGS)
 AC_SUBST(FREETYPE2_LIBS)
 
-dnl Check for option to enable included-agg
+dnl Check for option to enable included-agg (second part see more below...)
 AC_MSG_CHECKING(whether to enable included libagg building)
 AC_ARG_ENABLE(included_agg,
         [  --enable-included-agg=[no/yes]        enables included libagg build (default=yes)],,
@@ -191,19 +191,6 @@ AC_ARG_ENABLE(included_agg,
 
 AM_CONDITIONAL(BUILD_AGG, test "x$enable_included_agg" = "xyes")
 
-if [ test "x$enable_included_agg" = "xyes"]; then
-  AGG_LIBS=-L../agg/src
-  AGG_CFLAGS=-I../agg/include
-  AC_SUBST(AGG_LIBS)
-  AC_SUBST(AGG_CFLAGS)
-  
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-  PKG_CHECK_MODULES(AGG, libagg)
-fi
-
-
 dnl Check for option to enable libxml2
 AC_MSG_CHECKING(whether to enable libxml2 support)
 AC_ARG_ENABLE(libxml2,
@@ -239,6 +226,19 @@ fi
 #dnl Set PACKAGE SOURCE DIR in config.h.
 packagesrcdir=`cd $srcdir && pwd`
 
+## second part of agg needs to be here because of packagesrcdir
+if [ test "x$enable_included_agg" = "xyes"]; then
+  AGG_LIBS="-L${packagesrcdir}/agg/src -lagg"
+  AGG_CFLAGS="-I${packagesrcdir}/agg/include"
+  AC_SUBST(AGG_LIBS)
+  AC_SUBST(AGG_CFLAGS)
+
+  AC_MSG_RESULT(yes)
+else
+  AC_MSG_RESULT(no)
+  PKG_CHECK_MODULES(AGG, libagg)
+fi
+
 #dnl Set PACKAGE PREFIX
 if test "x${prefix}" = "xNONE"; then
   packageprefix=${ac_default_prefix}
@@ -314,6 +314,9 @@ plugins/input/osm/Makefile
 plugins/input/ogr/Makefile
 plugins/input/sqlite/Makefile
 plugins/input/kismet/Makefile
+utils/Makefile
+utils/pgsql2sqlite/Makefile
+utils/shapeindex/Makefile
 src/Makefile
 mapnik.pc
 mapnik-uninstalled.pc

plugins/input/postgis/Makefile.am

@@ -19,9 +19,9 @@ postgis_la_LIBADD = \
 	${POSTGRESQL_LDFLAGS}
 
 postgis_la_CXXFLAGS = \
-  -Wall \
-  ${PROFILING_CFLAGS} \
-  ${TRACING_CFLAGS} \
+	-Wall \
+	${PROFILING_CFLAGS} \
+	${TRACING_CFLAGS} \
 	${POSTGRESQL_CFLAGS} \
 	-I../../../include
 

plugins/input/raster/Makefile.am

@@ -12,9 +12,9 @@ raster_la_SOURCES = \
 	raster_info.hpp
 
 raster_la_CXXFLAGS = \
-  -Wall \
-  ${PROFILING_CFLAGS} \
-  ${TRACING_CFLAGS} \
+	-Wall \
+	${PROFILING_CFLAGS} \
+	${TRACING_CFLAGS} \
 	-I../../../include
 
 raster_la_LDFLAGS = \

src/Makefile.am

@@ -79,9 +79,9 @@ libmapnik_la_LIBADD = \
 
 libmapnik_la_CXXFLAGS = \
   	-I../include        \
-		${PROFILING_CFLAGS} \
-    ${TRACING_CFLAGS} \
-		${PNG_CFLAGS} \
+	${PROFILING_CFLAGS} \
+	${TRACING_CFLAGS} \
+	${PNG_CFLAGS} \
   	${FREETYPE2_CFLAGS} \
   	${AGG_CFLAGS} \
   	${JPEG_CFLAGS} \

utils/Makefile.am

@@ -0,0 +1,7 @@
+
+SUBDIRS = \
+	shapeindex\
+	pgsql2sqlite
+
+## File created by the gnome-build tools
+

utils/pgsql2sqlite/Makefile.am

@@ -0,0 +1,37 @@
+if HAVE_BOOST_PROGRAM_OPTIONS
+if HAVE_SQLITE3
+if HAVE_POSTGRESQL
+
+bin_PROGRAMS = \
+	pgsql2sqlite
+
+pgsql2sqlite_SOURCES = \
+	main.cpp      \
+	pgsql2sqlite.hpp      \
+	sqlite.cpp      \
+	sqlite.hpp
+
+pgsql2sqlite_LDFLAGS = \
+	$(BOOST_PROGRAM_OPTIONS_LIB) \
+	${POSTGRESQL_LDFLAGS} \
+	${SQLITE3_LDFLAGS} \
+        ../../src/libmapnik.la 
+
+pgsql2sqlite_DEPENDENCIES = \
+        ../../src/libmapnik.la
+
+pgsql2sqlite_CXXFLAGS = \
+	-Wall \
+	${PROFILING_CFLAGS} \
+	${TRACING_CFLAGS} \
+	${SQLITE3_CFLAGS} \
+	${POSTGRESQL_CFLAGS} \
+	-I../../include \
+	-I../../plugins/input/postgis
+
+endif
+endif
+endif
+
+## File created by the gnome-build tools
+

utils/shapeindex/Makefile.am

@@ -0,0 +1,29 @@
+if HAVE_BOOST_PROGRAM_OPTIONS
+
+bin_PROGRAMS = \
+	shapeindex
+
+shapeindex_SOURCES = \
+	quadtree.hpp\
+	shapeindex.cpp \
+	../../plugins/input/shape/shapefile.cpp
+
+shapeindex_LDFLAGS = \
+	$(BOOST_PROGRAM_OPTIONS_LIB) \
+	../../src/libmapnik.la \
+	${AGG_LIBS}
+
+shapeindex_DEPENDENCIES = \
+	../../src/libmapnik.la
+
+shapeindex_CXXFLAGS = \
+        ${PROFILING_CFLAGS} \
+        ${TRACING_CFLAGS} \
+	-I../../include \
+	-I../../plugins/input/shape \
+	${AGG_CFLAGS}
+
+endif
+
+## File created by the gnome-build tools
+