Skip to content

Commit

Permalink
Configured without raster still tries to make raster/rt_pg/rtpostgis.…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
pramsey committed Feb 13, 2012
1 parent 8d55a8d commit 75eea67
Showing 1 changed file with 22 additions and 16 deletions.
38 changes: 22 additions & 16 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 75eea67

Please sign in to comment.