PostGIS extensions should build/install automatically if PostGIS is compiled against...

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

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 894f2b7cdb229047160db113f6fad017d644008a..8f178a8f2f9c033bd975bd6b17286dec29db6469 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -5,7 +5,7 @@
 #-----------------------------------------------------
 
 # todo: add all subdirs
-SUBDIRS = liblwgeom libpgcommon regress postgis loader utils @RASTER@ @TOPOLOGY@
+SUBDIRS = liblwgeom libpgcommon postgis @RASTER@ @TOPOLOGY@ loader utils @EXTENSIONS@ regress 
 
 # todo: add more rules here, like uninstall, clean...
 all install uninstall noop clean distclean check:

diff --git a/configure.ac b/configure.ac
index 2b1644896eae78200b21d25162460ffc039bd7bc..40997f35d448b480ea178156571a35cfb6639285 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -345,6 +345,13 @@ 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

diff --git a/extensions/Makefile b/extensions/Makefile
new file mode 100644 (file)
index 0000000..0a14bad
--- /dev/null
+++ b/extensions/Makefile
@@ -0,0 +1,11 @@
+all: 
+       $(MAKE) -C postgis all
+       $(MAKE) -C postgis_topology all
+
+clean:
+       $(MAKE) -C postgis clean
+       $(MAKE) -C postgis_topology clean
+
+install:
+       $(MAKE) -C postgis install
+       $(MAKE) -C postgis_topology install

diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in
index 0a4280b20233b096fdf4a1568510997f3e0b4767..e445ffabc6c17bc13e224fa41aaa5d92f61f3b24 100644 (file)
--- a/extensions/postgis/Makefile.in
+++ b/extensions/postgis/Makefile.in
@@ -20,7 +20,7 @@ PREREL_PREFIX = $(shell echo $(EXTVERSION) | \
 DATA         = $(filter-out $(wildcard sql/*--*.sql),$(wildcard sql/*.sql))
 
 #DOCS         = $(wildcard ../../doc/html/*.html)
-PG_CONFIG    = pg_config
+PG_CONFIG    = @PGCONFIG@
 
 PG91         = $(shell $(PG_CONFIG) --version | grep -qE " 8\.| 9\.0" && echo no || echo yes)
 SQL_BITS     = $(wildcard sql_bits/*.sql)

diff --git a/extensions/postgis_topology/Makefile.in b/extensions/postgis_topology/Makefile.in
index fc9468903ae14a8c14110a8fc5cea2768d277fc3..ee6edb4492c2a97b2b3022c3fdf60e9bd7c1661a 100644 (file)
--- a/extensions/postgis_topology/Makefile.in
+++ b/extensions/postgis_topology/Makefile.in
@@ -19,7 +19,7 @@ PREREL_PREFIX = $(shell echo $(EXTVERSION) | \
 
 DATA         = $(filter-out $(wildcard sql/*--*.sql),$(wildcard sql/*.sql))
 
-PG_CONFIG    = pg_config
+PG_CONFIG    = @PGCONFIG@
 
 PG91         = $(shell $(PG_CONFIG) --version | grep -qE " 8\.| 9\.0" && echo no || echo yes)
 SQL_BITS     = $(wildcard sql_bits/*.sql)