[postgis-tickets] [SCM] PostGIS branch stable-2.5 updated. 2.5.5-17-g1814f8a
git at osgeo.org
git at osgeo.org
Sun Aug 15 13:49:15 PDT 2021
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".
The branch, stable-2.5 has been updated
via 1814f8a288b8f4965e4422f283dec926cfeeaccc (commit)
from 166721cc67def6b296bea3b68d57edfd57823214 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1814f8a288b8f4965e4422f283dec926cfeeaccc
Author: Regina Obe <lr at pcorp.us>
Date: Sun Aug 15 16:49:10 2021 -0400
Backport autogen.sh changes from 3.1 to address autoconf 2.71, references #4968 for PostGIS 2.5.6
diff --git a/NEWS b/NEWS
index 9357e3f..c98c44e 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ YYYY/MM/DD
* Bug fixes *
+ - #4968, Update autogen.sh to handle autoconf 2.71 issues
- #4871, TopoGeometry::geometry cast returns NULL for empty
TopoGeometry objects (Sandro Santilli)
- #4757, Handle line collapse due to snap-to-existing node (Sandro Santilli)
diff --git a/autogen.sh b/autogen.sh
index 6024906..1077208 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -36,7 +36,7 @@ done
AUTOCONF=`which autoconf 2>/dev/null`
if [ ! ${AUTOCONF} ]; then
echo "Missing autoconf!"
- exit
+ exit 1
fi
AUTOCONF_VER=`${AUTOCONF} --version | ${GREP} -E "^.*[0-9]$" | ${SED} 's/^.* //'`
@@ -48,7 +48,7 @@ for aclocal in aclocal aclocal-1.10 aclocal-1.9; do
done
if [ ! ${ACLOCAL} ]; then
echo "Missing aclocal!"
- exit
+ exit 1
fi
ACLOCAL_VER=`${ACLOCAL} --version | ${GREP} -E "^.*[0-9]$" | ${SED} 's/^.* //'`
@@ -60,7 +60,7 @@ for libtoolize in glibtoolize libtoolize; do
done
if [ ! ${LIBTOOLIZE} ]; then
echo "Missing libtoolize!"
- exit
+ exit 1
fi
LIBTOOLIZE_VER=`${LIBTOOLIZE} --version | ${GREP} -E "^.*[0-9]\.[0-9]" | ${SED} 's/^.* //'`
LIBTOOLIZE_MAJOR_VER=`echo ${LIBTOOLIZE_VER} | cut -f1 -d'.'`
@@ -81,6 +81,9 @@ ${ACLOCAL} -I macros || giveup
echo "* Running ${AUTOCONF} (${AUTOCONF_VER})"
${AUTOCONF} || giveup
+# Work around an autoconf bug insisting in having this file
+touch build-aux/config.rpath
+
if test -f "${PWD}/configure"; then
echo "======================================"
echo "Now you are ready to run './configure'"
-----------------------------------------------------------------------
Summary of changes:
NEWS | 1 +
autogen.sh | 9 ++++++---
2 files changed, 7 insertions(+), 3 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list