Make exensions depend on comments, so also depend on xsltproc

git-svn-id: http://svn.osgeo.org/postgis/trunk@9046 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/configure.ac b/configure.ac
index 40997f35d448b480ea178156571a35cfb6639285..e96aace633d55d2683a42b9c1176f61e881284a6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -196,7 +196,6 @@ fi
 
 AC_SUBST([XSLBASE])
 
-
 dnl ===========================================================================
 dnl Detect CUnit if it is installed (used for unit testing)
 dnl
@@ -345,13 +344,6 @@ else
        fi
 fi     
 
-EXTENSIONS=""
-if test $POSTGIS_PGSQL_VERSION -ge 91; then
-       AC_MSG_RESULT([enabling extensions for PostgreSQL 9.1...])
-       EXTENSIONS=extensions
-       AC_SUBST([EXTENSIONS])
-fi
-
 dnl Temporary hack until minimum PostgreSQL version is 9.0:
 dnl If PostgreSQL < 9.0 is detected, trigger the inclusion of the new versioned PGXS targets
 PGXSOVERRIDE=0
@@ -721,6 +713,21 @@ AC_SUBST([IGE_MAC_CFLAGS])
 AC_SUBST([IGE_MAC_LIBS])
 
 
+dnl ===========================================================================
+dnl See if we have the requirements for building the extensions, namely
+dnl PostgreSQL 9.1 or better and the xlstproc tool for generating the commends
+dnl SQL file.
+dnl ===========================================================================
+
+EXTENSIONS=""
+if test $POSTGIS_PGSQL_VERSION -ge 91; then
+       if test ! "x$XSLTPROC" = "x"; then
+               AC_MSG_RESULT([enabling extensions for PostgreSQL 9.1...])
+               EXTENSIONS=extensions
+               AC_SUBST([EXTENSIONS])
+       fi
+fi
+
 
 dnl ===========================================================================
 dnl Allow the user to enable debugging with --enable-debug

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 8271151c7ca55d5dbdd01427e5ad52a2bc4e1eac..87489910420d116917a8e6728b277055fa96a248 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -140,6 +140,7 @@ images-clean:
        $(MAKE) -C html/image_src images-clean
        
 clean: 
+       rm -f *.sql
        rm -f html/*.html
        rm -f postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}.pdf
        $(MAKE) -C html/image_src clean

diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in
index e445ffabc6c17bc13e224fa41aaa5d92f61f3b24..6cf1dd4589ac59e01790cc26261a072f686fed2a 100644 (file)
--- a/extensions/postgis/Makefile.in
+++ b/extensions/postgis/Makefile.in
@@ -47,6 +47,9 @@ sql_bits/spatial_ref_sys.sql: ../../spatial_ref_sys.sql
 sql_bits/postgis.sql: ../../postgis/postgis.sql
        sed -e 's/BEGIN;//g' -e 's/COMMIT;//g'  $< > $@
 
+../../doc/postgis_comments.sql:
+       $(MAKE) -C ../../doc comments
+
 sql_bits/postgis_comments.sql: ../../doc/postgis_comments.sql
        cp $< $@
 
@@ -82,6 +85,9 @@ sql_bits/postgis_upgrade_minor.sql: ../../postgis/postgis_upgrade_20_minor.sql
                 $< > $@
 
 
+../../doc/raster_comments.sql:
+       $(MAKE) -C ../../doc comments
+
 sql_bits/raster_comments.sql: ../../doc/raster_comments.sql
        cp $< $@
 

diff --git a/extensions/postgis_topology/Makefile.in b/extensions/postgis_topology/Makefile.in
index ee6edb4492c2a97b2b3022c3fdf60e9bd7c1661a..a0a1c1a6c60351ea94488c0c43c62453ae427866 100644 (file)
--- a/extensions/postgis_topology/Makefile.in
+++ b/extensions/postgis_topology/Makefile.in
@@ -41,6 +41,9 @@ sql/$(EXTENSION).sql: sql_bits/topology.sql sql_bits/topology_comments.sql
 sql_bits/topology.sql: ../../topology/topology.sql
        sed -e 's/BEGIN;//g' -e 's/COMMIT;//g' -e '/^CREATE SCHEMA/d;'  $< > $@
        
+../../doc/topology_comments.sql:
+       $(MAKE) -C ../../doc comments
+       
 sql_bits/topology_comments.sql: ../../doc/topology_comments.sql
        cp $< $@