Commit 83ec1be7 authored by Markus Wanner's avatar Markus Wanner

Import upstream version 2.0.3

parent 330f3d8d
This diff is collapsed.
PostGIS 2.0.3
2013/03/01
* Bug Fixes *
- #2126, Better handling of empty rasters from ST_ConvexHull()
- #2134, Make sure to process SRS before passing it off to GDAL functions
- Fix various memory leaks in liblwgeom
- #2173, Fix robustness issue in splitting a line with own vertex
also affecting topology building (#2172)
- #2174, Fix usage of wrong function lwpoly_free()
- #2176, Fix robustness issue with ST_ChangeEdgeGeom
- #2184, Properly copy topologies with Z value
- postgis_restore.pl support for mixed case geometry column name in dumps
- #2188, Fix function parameter value overflow that caused problems
when copying data from a GDAL dataset
- #2216, More memory errors in MultiPolygon GeoJSON parsing (with holes)
- Fix Memory leak in GeoJSON parser
* Enhancements *
- #2141, More verbose output when constraints fail to be added
to a raster column
- Speedup ST_ChangeEdgeGeom
PostGIS 2.0.2
2012/12/03
* Bug Fixes *
- #1287, Drop of "gist_geometry_ops" broke a few clients
package of legacy_gist.sql for these cases
- #1391, Errors during upgrade from 1.5
- #1828, Poor selectivity estimate on ST_DWithin
- #1838, error importing tiger/line data
- #1869, ST_AsBinary is not unique -
added to legacy_minor/legacy.sql scripts
- #1885, Missing field from tabblock table in tiger2010 census_loader.sql
- #1891, Use LDFLAGS environment when building liblwgeom
- #1899, Enhance toTopoGeom error on unsupported input
- #1900, Fix pgsql2shp for big-endian systems
- #1932, Fix raster2pgsql for invalid syntax for setting index tablespace
- #1936, ST_GeomFromGML on CurvePolygon causes server crash
- #1955, ST_ModEdgeHeal and ST_NewEdgeHeal for doubly connected edges
- #1957, ST_Distance to a one-point LineString returns NULL
- #1976, Geography point-in-ring code overhauled for more reliability
- #1978, wrong answer calculating length of closed circular arc (circle)
- #1981, Remove unused but set variables as found with gcc 4.6+
- #1987, Restore 1.5.x behaviour of ST_Simplify
- #1989, Preprocess input geometry to just intersection with raster
to be clipped
- #1991, geocode really slow on PostgreSQL 9.2
- #1996, support POINT EMPTY in GeoJSON output
- #1998, Fix ST_{Mod,New}EdgeHeal joining edges sharing both endpoints
- #2001, ST_CurveToLine has no effect if the geometry doesn't actually
contain an arc
- #2015, ST_IsEmpty('POLYGON(EMPTY)') returns False
- #2019, ST_FlipCoordinates does not update bbox
- #2025, Fix side location conflict at TopoGeo_AddLineString
- #2062, improve performance of distance calculations
- #2033, Fix adding a splitting point into a 2.5d topology
- #2051, Fix excess of precision in ST_AsGeoJSON output
- #2052, Fix buffer overflow in lwgeom_to_geojson
- #2056, Fixed lack of SRID check of raster and geometry in ST_SetValue()
- #2057, Fixed linking issue for raster2psql to libpq
- #2060, Fix "dimension" check violation by GetTopoGeomElementArray
- #2072, Removed outdated checks preventing ST_Intersects(raster) from
working on out-db bands
- #2077, Fixed incorrect answers from ST_Hillshade(raster)
- #2092, Namespace issue with ST_GeomFromKML,ST_GeomFromGML for libxml 2.8+
- #2099, Fix double free on exception in ST_OffsetCurve
- #2100, ST_AsRaster() may not return raster with specified pixel type
- #2108, Ensure ST_Line_Interpolate_Point always returns POINT
- #2109, Ensure ST_Centroid always returns POINT
- #2117, Ensure ST_PointOnSurface always returns POINT
- #2129, Fix SRID in ST_Homogenize output with collection input
- #2130, Fix memory error in MultiPolygon GeoJson parsing
- Update URL of Maven jar
* Enhancements *
- #1581, ST_Clip(raster, ...) no longer imposes NODATA on a band if the
corresponding band from the source raster did not have NODATA
- #1928, Accept array properties in GML input multi-geom input
(Kashif Rasul and Shoaib Burq / SpacialDB)
- #2082, Add indices on start_node and end_node of topology edge tables
- #2087, Speedup topology.GetRingEdges using a recursive CTE
PostGIS 2.0.1
2012/06/22
......@@ -45,6 +131,12 @@ PostGIS 2.0.1
on-the-line case
- #1875, ST_SummaryStats returns NULL for all parameters except count
when count is zero
- #1881, shp2pgsql-gui -- editing a field sometimes triggers
removing row
- #1883, Geocoder install fails trying to run
create_census_base_tables() (Brian Panulla)
- #1870, ST_Intersects doc and behaviour are out of synch
- #1936, ST_GeomFromGML on CurveString GML crashes server
* Enhancements *
......
PostGIS - Geographic Information Systems Extensions to PostgreSQL
=================================================================
:Version: 2.0.1
:Date: 2012-06-22
:Website: http://postgis.org
:Version: 2.0.3
:Date: 2013-03-01
:Website: http://postgis.net
This distribution contains a module which implements GIS simple features, ties
the features to R-tree indexing, and provides many spatial functions for
......@@ -71,7 +71,7 @@ this to work.
JSON-C is used to import GeoJSON via the function ST_GeomFromGeoJson().
http://oss.metaparadigm.com/json-c/.
http://github.com/json-c/json-c/wiki
You can get it installed in apt-based systems using::
......
......@@ -5,5 +5,5 @@
POSTGIS_MAJOR_VERSION=2
POSTGIS_MINOR_VERSION=0
POSTGIS_MICRO_VERSION=1
POSTGIS_MICRO_VERSION=3
# generated automatically by aclocal 1.11.2 -*- Autoconf -*-
# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
......
......@@ -2,9 +2,9 @@
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011 Free Software Foundation, Inc.
# 2011, 2012 Free Software Foundation, Inc.
timestamp='2011-10-01'
timestamp='2012-02-10'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
......@@ -17,9 +17,7 @@ timestamp='2011-10-01'
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
# 02110-1301, USA.
# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
......@@ -57,8 +55,8 @@ GNU config.guess ($timestamp)
Originally written by Per Bothner.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
Software Foundation, Inc.
2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
......@@ -145,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:NetBSD:*:*)
# NetBSD (nbsd) targets should (where applicable) match one or
# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
# switched to ELF, *-*-netbsd* would select the old
# object file format. This provides both forward
......@@ -806,6 +804,9 @@ EOF
*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:MSYS*:*)
echo ${UNAME_MACHINE}-pc-msys
exit ;;
i*:windows32*:*)
# uname -m includes "-pc" on this system.
echo ${UNAME_MACHINE}-mingw32
......@@ -860,6 +861,13 @@ EOF
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
aarch64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
aarch64_be:Linux:*:*)
UNAME_MACHINE=aarch64_be
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
EV5) UNAME_MACHINE=alphaev5 ;;
......@@ -894,16 +902,16 @@ EOF
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
cris:Linux:*:*)
echo cris-axis-linux-gnu
echo ${UNAME_MACHINE}-axis-linux-gnu
exit ;;
crisv32:Linux:*:*)
echo crisv32-axis-linux-gnu
echo ${UNAME_MACHINE}-axis-linux-gnu
exit ;;
frv:Linux:*:*)
echo frv-unknown-linux-gnu
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
hexagon:Linux:*:*)
echo hexagon-unknown-linux-gnu
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
LIBC=gnu
......@@ -945,7 +953,7 @@ EOF
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
or32:Linux:*:*)
echo or32-unknown-linux-gnu
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
padre:Linux:*:*)
echo sparc-unknown-linux-gnu
......@@ -986,7 +994,7 @@ EOF
echo ${UNAME_MACHINE}-dec-linux-gnu
exit ;;
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
xtensa*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
......@@ -1317,6 +1325,9 @@ EOF
i*86:AROS:*:*)
echo ${UNAME_MACHINE}-pc-aros
exit ;;
x86_64:VMkernel:*:*)
echo ${UNAME_MACHINE}-unknown-esx
exit ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
......
......@@ -2,9 +2,9 @@
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011 Free Software Foundation, Inc.
# 2011, 2012 Free Software Foundation, Inc.
timestamp='2011-10-08'
timestamp='2012-02-10'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
......@@ -21,9 +21,7 @@ timestamp='2011-10-08'
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
# 02110-1301, USA.
# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
......@@ -76,8 +74,8 @@ version="\
GNU config.sub ($timestamp)
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
Software Foundation, Inc.
2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
......@@ -132,6 +130,10 @@ case $maybe_os in
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
android-linux)
os=-linux-android
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
;;
*)
basic_machine=`echo $1 | sed 's/-[^-]*$//'`
if [ $basic_machine != $1 ]
......@@ -247,6 +249,7 @@ case $basic_machine in
# Some are omitted here because they have special meanings below.
1750a | 580 \
| a29k \
| aarch64 | aarch64_be \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
......@@ -295,7 +298,7 @@ case $basic_machine in
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
| rx \
| rl78 | rx \
| score \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
......@@ -319,8 +322,7 @@ case $basic_machine in
c6x)
basic_machine=tic6x-unknown
;;
m6811 | m68hc11 | m6812 | m68hc12 | picochip)
# Motorola 68HC11/12.
m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
basic_machine=$basic_machine-unknown
os=-none
;;
......@@ -333,7 +335,10 @@ case $basic_machine in
strongarm | thumb | xscale)
basic_machine=arm-unknown
;;
xgate)
basic_machine=$basic_machine-unknown
os=-none
;;
xscaleeb)
basic_machine=armeb-unknown
;;
......@@ -356,6 +361,7 @@ case $basic_machine in
# Recognize the basic CPU types with company name.
580-* \
| a29k-* \
| aarch64-* | aarch64_be-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
......@@ -407,7 +413,7 @@ case $basic_machine in
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pyramid-* \
| romp-* | rs6000-* | rx-* \
| rl78-* | romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
......@@ -719,7 +725,6 @@ case $basic_machine in
i370-ibm* | ibm*)
basic_machine=i370-ibm
;;
# I'm not sure what "Sysv32" means. Should this be sysv3.2?
i*86v32)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv32
......@@ -816,6 +821,10 @@ case $basic_machine in
ms1-*)
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
;;
msys)
basic_machine=i386-pc
os=-msys
;;
mvs)
basic_machine=i370-ibm
os=-mvs
......@@ -1343,7 +1352,7 @@ case $os in
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
......@@ -1555,9 +1564,6 @@ case $basic_machine in
;;
m68000-sun)
os=-sunos3
# This also exists in the configure program, but was not the
# default.
# os=-sunos4
;;
m68*-cisco)
os=-aout
......
......@@ -4579,7 +4579,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
netbsd*)
netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
......@@ -8022,6 +8022,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
openbsd*)
with_gnu_ld=no
;;
linux* | k*bsd*-gnu | gnu*)
link_all_deplibs=no
;;
esac
ld_shlibs=yes
......@@ -8243,7 +8246,7 @@ _LT_EOF
fi
;;
netbsd*)
netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
......@@ -8420,6 +8423,7 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
link_all_deplibs=no
else
# not using gcc
if test "$host_cpu" = ia64; then
......@@ -8873,7 +8877,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
link_all_deplibs=yes
;;
netbsd*)
netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
......@@ -9901,6 +9905,18 @@ fi
dynamic_linker='GNU/Linux ld.so'
;;
netbsdelf*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
dynamic_linker='NetBSD ld.elf_so'
;;
netbsd*)
version_type=sunos
need_lib_prefix=no
......@@ -13703,7 +13719,7 @@ lt_prog_compiler_static_CXX=
;;
esac
;;
netbsd*)
netbsd* | netbsdelf*-gnu)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
......@@ -14074,6 +14090,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
;;
esac
;;
linux* | k*bsd*-gnu | gnu*)
link_all_deplibs_CXX=no
;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
......@@ -14699,6 +14718,18 @@ fi
dynamic_linker='GNU/Linux ld.so'
;;
netbsdelf*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
dynamic_linker='NetBSD ld.elf_so'
;;
netbsd*)
version_type=sunos
need_lib_prefix=no
......@@ -15970,15 +16001,15 @@ $as_echo "$ac_cv_lib_cunit_CU_initialize_registry" >&6; }
if test "x$ac_cv_lib_cunit_CU_initialize_registry" = xyes; then :
CUNIT_LDFLAGS="$LDFLAGS -lcunit"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not locate CUnit required for liblwgeom unit tests" >&5
$as_echo "$as_me: WARNING: could not locate CUnit required for liblwgeom unit tests" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not locate CUnit required for unit tests" >&5
$as_echo "$as_me: WARNING: could not locate CUnit required for unit tests" >&2;}
fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not locate CUnit required for liblwgeom unit tests" >&5
$as_echo "$as_me: WARNING: could not locate CUnit required for liblwgeom unit tests" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not locate CUnit required for unit tests" >&5
$as_echo "$as_me: WARNING: could not locate CUnit required for unit tests" >&2;}
fi
......
......@@ -251,10 +251,10 @@ dnl ===========================================================================
CUNIT_LDFLAGS=""
AC_CHECK_HEADER([CUnit/CUnit.h], [
CUNIT_CPPFLAGS="$CPPFLAGS"
AC_CHECK_LIB([cunit], [CU_initialize_registry], [CUNIT_LDFLAGS="$LDFLAGS -lcunit"], [AC_MSG_WARN([could not locate CUnit required for liblwgeom unit tests])])
AC_CHECK_LIB([cunit], [CU_initialize_registry], [CUNIT_LDFLAGS="$LDFLAGS -lcunit"], [AC_MSG_WARN([could not locate CUnit required for unit tests])])
],
[
AC_MSG_WARN([could not locate CUnit required for liblwgeom unit tests])
AC_MSG_WARN([could not locate CUnit required for unit tests])
])
AC_SUBST([CUNIT_CPPFLAGS])
......
......@@ -11,15 +11,14 @@
POSTGIS_MAJOR_VERSION=2
POSTGIS_MINOR_VERSION=0
POSTGIS_MICRO_VERSION=1
MATHML2_DTD=http://www.w3.org/Math/DTD/mathml2/mathml2.dtd
POSTGIS_MICRO_VERSION=3
INSTALL=/opt/local/bin/ginstall -c
INSTALL=/usr/bin/install -c
INSTALL_DATA=${INSTALL} -m 644
XSLTPROC=/opt/local/bin/xsltproc
XSLBASE=/opt/local/share/xsl/docbook-xsl
XMLLINT=/opt/local/bin/xmllint
XSLTPROC=/usr/bin/xsltproc
XSLBASE=/usr/share/xml/docbook/stylesheet/nwalsh
XMLLINT=/usr/bin/xmllint
# To allow network access use:
#
......@@ -49,15 +48,15 @@ HTML_DOCBOOK_XSL=$(XSLBASE)/html/docbook.xsl
CHUNK_HTML_DOCBOOK_XSL=$(XSLBASE)/html/chunk.xsl
# DBLatex's dblatex script for PDF generation from DocBook
DBLATEX=/opt/local/bin/dblatex
DBLATEX=/usr/bin/dblatex
# Imagemagick's convert utility program for generated images used in the documentation
IMAGEMAGICK=/opt/local/bin/convert
IMAGEMAGICK=/usr/bin/convert
# Directories for postgresql subdirectories
PGSQL_DOCDIR=/usr/local/pgsql/9.1/share/doc
PGSQL_MANDIR=/usr/local/pgsql/9.1/share/man
PGSQL_SHAREDIR=/usr/local/pgsql/9.1/share
PGSQL_DOCDIR=/usr/share/doc/postgresql-doc-9.1
PGSQL_MANDIR=/usr/share/postgresql/9.1/man
PGSQL_SHAREDIR=/usr/share/postgresql/9.1
# If XSLTPROC or XSLBASE were not found during configure, we cannot
# build the documentation
......@@ -116,31 +115,31 @@ postgis_aggs_mm.xml: ./xsl/postgis_aggs_mm.xml.xsl postgis-out.xml Makefile
endif
postgis_comments.sql: ./xsl/postgis_comments.sql.xsl $(XML_INPUTS)
$(XSLTPROC) ./xsl/postgis_comments.sql.xsl postgis-out.xml > $@
$(XSLTPROC) --novalid ./xsl/postgis_comments.sql.xsl postgis-out.xml > $@
postgis_cheatsheet.html: ./xsl/postgis_cheatsheet.html.xsl $(XML_INPUTS)
$(XSLTPROC) ./xsl/postgis_cheatsheet.html.xsl postgis-out.xml > $@
$(XSLTPROC) --novalid ./xsl/postgis_cheatsheet.html.xsl postgis-out.xml > $@
raster_comments.sql: ./xsl/raster_comments.sql.xsl $(XML_INPUTS)
$(XSLTPROC) ./xsl/raster_comments.sql.xsl postgis-out.xml > $@
raster_cheatsheet.html: ./xsl/raster_cheatsheet.html.xsl $(XML_INPUTS)
$(XSLTPROC) ./xsl/raster_cheatsheet.html.xsl postgis-out.xml > $@
$(XSLTPROC) --novalid ./xsl/raster_cheatsheet.html.xsl postgis-out.xml > $@
topology_comments.sql: ./xsl/topology_comments.sql.xsl $(XML_INPUTS)
$(XSLTPROC) ./xsl/topology_comments.sql.xsl postgis-out.xml > $@
$(XSLTPROC) --novalid ./xsl/topology_comments.sql.xsl postgis-out.xml > $@
topology_cheatsheet.html: ./xsl/topology_cheatsheet.html.xsl $(XML_INPUTS)
$(XSLTPROC) ./xsl/topology_cheatsheet.html.xsl postgis-out.xml > $@
$(XSLTPROC) --novalid ./xsl/topology_cheatsheet.html.xsl postgis-out.xml > $@
tiger_geocoder_comments.sql: ./xsl/tiger_geocoder_comments.sql.xsl $(XML_INPUTS)
$(XSLTPROC) ./xsl/tiger_geocoder_comments.sql.xsl postgis-out.xml > $@
$(XSLTPROC) --novalid ./xsl/tiger_geocoder_comments.sql.xsl postgis-out.xml > $@
tiger_geocoder_cheatsheet.html: ./xsl/tiger_geocoder_cheatsheet.html.xsl $(XML_INPUTS)
$(XSLTPROC) ./xsl/tiger_geocoder_cheatsheet.html.xsl postgis-out.xml > $@
$(XSLTPROC) --novalid ./xsl/tiger_geocoder_cheatsheet.html.xsl postgis-out.xml > $@
postgis-out.xml: postgis.xml Makefile
cat $< | sed -e "s/@@LAST_RELEASE_VERSION@@/${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}/g" -e "s;@@MATHML_PATH@@;${MATHML2_DTD};g" > $@
cat $< | sed -e "s/@@LAST_RELEASE_VERSION@@/${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}/g" -e "s/@@LAST_MINOR_VERSION@@/${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}/g" > $@
chunked-html: postgis-out.xml Makefile images $(XML_INPUTS)
$(XSLTPROC) $(XSLTPROC_COMMONOPTS) $(XSLTPROC_HTMLOPTS) \
......@@ -274,7 +273,7 @@ requirements_not_met_xsltproc:
@echo "Install xsltproc and then re-run configure. Alternatively "
@echo "refer to online manual:"
@echo
@echo " http://www.postgis.org/docs"
@echo " http://postgis.net/documentation"
@echo
requirements_not_met_xmllint:
......@@ -284,7 +283,7 @@ requirements_not_met_xmllint:
@echo "Install xmllint and then re-run configure. Alternatively "
@echo "refer to online manual:"
@echo
@echo " http://www.postgis.org/docs"
@echo " http://postgis.net/documentation"
@echo
requirements_not_met_xslbase:
......@@ -295,7 +294,7 @@ requirements_not_met_xslbase:
@echo "with the --with-xsldir option."
@echo "Alternatively refer to online manual:"
@echo
@echo " http://www.postgis.org/docs"
@echo " http://postgis.net/documentation"
@echo
requirements_not_met_imagemagick:
......@@ -304,6 +303,6 @@ requirements_not_met_imagemagick:
@echo "To build the documentation, install ImageMagick and then re-run configure. Alternatively "
@echo "refer to online manual:"
@echo
@echo " http://www.postgis.org/docs"
@echo " http://postgis.net/documentation"
@echo
......@@ -21,8 +21,8 @@ MODULEDIR=contrib/$(MODULE_doc)
DATA_built=postgis_comments.sql raster_comments.sql topology_comments.sql
# PGXS information
PG_CONFIG = /usr/local/pgsql/9.1/bin/pg_config
PGXS := /usr/local/pgsql/9.1/lib/pgxs/src/makefiles/pgxs.mk
PG_CONFIG = /usr/bin/pg_config
PGXS := /usr/lib/postgresql/9.1/lib/pgxs/src/makefiles/pgxs.mk
include $(PGXS)
# PGXS override feature. The ability to allow PostGIS to install itself
......
......@@ -12,7 +12,6 @@
POSTGIS_MAJOR_VERSION=@POSTGIS_MAJOR_VERSION@
POSTGIS_MINOR_VERSION=@POSTGIS_MINOR_VERSION@
POSTGIS_MICRO_VERSION=@POSTGIS_MICRO_VERSION@
MATHML2_DTD=@MATHML2_DTD@
INSTALL=@INSTALL@
INSTALL_DATA=@INSTALL_DATA@
......@@ -116,31 +115,31 @@ postgis_aggs_mm.xml: ./xsl/postgis_aggs_mm.xml.xsl postgis-out.xml Makefile
endif
postgis_comments.sql: ./xsl/postgis_comments.sql.xsl $(XML_INPUTS)
$(XSLTPROC) ./xsl/postgis_comments.sql.xsl postgis-out.xml > $@
$(XSLTPROC) --novalid ./xsl/postgis_comments.sql.xsl postgis-out.xml > $@
postgis_cheatsheet.html: ./xsl/postgis_cheatsheet.html.xsl $(XML_INPUTS)
$(XSLTPROC) ./xsl/postgis_cheatsheet.html.xsl postgis-out.xml > $@
$(XSLTPROC) --novalid ./xsl/postgis_cheatsheet.html.xsl postgis-out.xml > $@
raster_comments.sql: ./xsl/raster_comments.sql.xsl $(XML_INPUTS)
$(XSLTPROC) ./xsl/raster_comments.sql.xsl postgis-out.xml > $@
raster_cheatsheet.html: ./xsl/raster_cheatsheet.html.xsl $(XML_INPUTS)
$(XSLTPROC) ./xsl/raster_cheatsheet.html.xsl postgis-out.xml > $@
$(XSLTPROC) --novalid ./xsl/raster_cheatsheet.html.xsl postgis-out.xml > $@
topology_comments.sql: ./xsl/topology_comments.sql.xsl $(XML_INPUTS)
$(XSLTPROC) ./xsl/topology_comments.sql.xsl postgis-out.xml > $@
$(XSLTPROC) --novalid ./xsl/topology_comments.sql.xsl postgis-out.xml > $@
topology_cheatsheet.html: ./xsl/topology_cheatsheet.html.xsl $(XML_INPUTS)
$(XSLTPROC) ./xsl/topology_cheatsheet.html.xsl postgis-out.xml > $@
$(XSLTPROC) --novalid ./xsl/topology_cheatsheet.html.xsl postgis-out.xml > $@
tiger_geocoder_comments.sql: ./xsl/tiger_geocoder_comments.sql.xsl $(XML_INPUTS)
$(XSLTPROC) ./xsl/tiger_geocoder_comments.sql.xsl postgis-out.xml > $@
$(XSLTPROC) --novalid ./xsl/tiger_geocoder_comments.sql.xsl postgis-out.xml > $@
tiger_geocoder_cheatsheet.html: ./xsl/tiger_geocoder_cheatsheet.html.xsl $(XML_INPUTS)
$(XSLTPROC) ./xsl/tiger_geocoder_cheatsheet.html.xsl postgis-out.xml > $@
$(XSLTPROC) --novalid ./xsl/tiger_geocoder_cheatsheet.html.xsl postgis-out.xml > $@
postgis-out.xml: postgis.xml Makefile
cat $< | sed -e "s/@@LAST_RELEASE_VERSION@@/${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}/g" -e "s;@@MATHML_PATH@@;${MATHML2_DTD};g" > $@
cat $< | sed -e "s/@@LAST_RELEASE_VERSION@@/${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}/g" -e "s/@@LAST_MINOR_VERSION@@/${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}/g" > $@
chunked-html: postgis-out.xml Makefile images $(XML_INPUTS)
$(XSLTPROC) $(XSLTPROC_COMMONOPTS) $(XSLTPROC_HTMLOPTS) \
......@@ -274,7 +273,7 @@ requirements_not_met_xsltproc:
@echo "Install xsltproc and then re-run configure. Alternatively "
@echo "refer to online manual:"
@echo
@echo " h