From: Paul Ramsey <pramsey@cleverelephant.ca>
Date: Mon, 13 Feb 2012 22:02:55 +0000 (+0000)
Subject: Configured without raster still tries to make raster/rt_pg/rtpostgis.sql (#1575)... 
X-Git-Tag: 2.0.0alpha5~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=75eea67e6ec68fdd2de1819e7064d998183cf4a8;p=postgis

Configured without raster still tries to make raster/rt_pg/rtpostgis.sql (#1575) only try to build extensions if we have both raster and topology as well as pgsql 9.1


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

diff --git a/configure.ac b/configure.ac
index b02964221..9d5c9a550 100644
--- a/configure.ac
+++ b/configure.ac
@@ -724,22 +724,6 @@ 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
 dnl
@@ -1012,8 +996,30 @@ else dnl # }{
     RT_MAKEFILE_LIST="raster/Makefile"
 fi dnl # }
 
+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
+		if test "x$RASTER" = "xraster"; then
+			if test "x$TOPOLOGY" = "xtopology"; then
+				AC_MSG_RESULT([enabling extensions for PostgreSQL 9.1...])
+				EXTENSIONS=extensions
+				AC_SUBST([EXTENSIONS])
+			fi
+		fi
+	fi
+fi
+
 
+dnl ===========================================================================
 dnl Output the relevant files
+dnl ===========================================================================
+
 AC_OUTPUT([GNUmakefile 
    extensions/Makefile
    extensions/postgis/Makefile