[postgis-tickets] [SCM] PostGIS branch stable-3.3 updated. 3.3.4-3-g40e326b86
git at osgeo.org
git at osgeo.org
Fri Jul 28 07:53:23 PDT 2023
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-3.3 has been updated
via 40e326b867da06a479179693e61a412205deae80 (commit)
via cf199373a07f2a89eaecccb785f2e8de9b48cfe3 (commit)
from ba1368c291e2b0796ba2ca13efaf06aeefe60648 (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 40e326b867da06a479179693e61a412205deae80
Author: Sandro Santilli <strk at kbt.io>
Date: Fri Jul 28 16:39:42 2023 +0200
Do not leave raster and sfcgal Makefiles behind when disabled
Closes #5459 in 3.3 branch (3.3.5dev)
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 1e93ecae8..5a7bc710a 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -94,6 +94,14 @@ distclean-local: clean-local
rm -f config.log config.cache config.status
rm -f postgis_config.h
rm -f libtool
+ if test -z "@RASTER@"; then \
+ $(MAKE) -C raster/rt_pg distclean; \
+ rm -f raster/Makefile; \
+ fi
+ if test -z "@SFCGAL@"; then \
+ $(MAKE) -C sfcgal distclean; \
+ rm -f sfcgal/Makefile; \
+ fi
maintainer-clean-local: distclean-local
rm -f configure
diff --git a/configure.ac b/configure.ac
index c203823cc..d919bc72e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1534,6 +1534,7 @@ if test "x$with_raster" != "xno"; then
AC_SUBST([RT_POSTGIS_SQL])
RT_MAKEFILE_LIST="
+ extensions/postgis_raster/Makefile \
raster/Makefile \
raster/rt_core/Makefile \
raster/rt_pg/Makefile \
@@ -1737,7 +1738,6 @@ dnl echo "TRANSLATIONS_MAKEFILE_LIST: ${TRANSLATIONS_MAKEFILE_LIST}"
AC_CONFIG_FILES([GNUmakefile
extensions/Makefile
extensions/postgis/Makefile
- extensions/postgis_raster/Makefile
extensions/postgis_topology/Makefile
extensions/postgis_tiger_geocoder/Makefile
$ADDRESS_STANDARDIZER_MAKEFILE_LIST
commit cf199373a07f2a89eaecccb785f2e8de9b48cfe3
Author: Sandro Santilli <strk at kbt.io>
Date: Fri Jul 28 16:32:14 2023 +0200
Do not create address_standardizer Makefile when not needed
References #5459
diff --git a/configure.ac b/configure.ac
index c4186fb87..c203823cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1325,10 +1325,13 @@ if test "x$with_address_standardizer" != "xno"; then
AC_SUBST([PCRE_LDFLAGS])
AC_SUBST([PCRE_LDFLAGS])
AC_SUBST([PCRE_VERSION])
+ ADDRESS_STANDARDIZER_MAKEFILE_LIST=extensions/address_standardizer/Makefile
+
else
ADDRESS_STANDARDIZER=""
AC_MSG_RESULT([ADDRESS_STANDARDIZER support: disabled])
+ ADDRESS_STANDARDIZER_MAKEFILE_LIST=""
fi
AC_SUBST([ADDRESS_STANDARDIZER])
@@ -1737,7 +1740,7 @@ AC_CONFIG_FILES([GNUmakefile
extensions/postgis_raster/Makefile
extensions/postgis_topology/Makefile
extensions/postgis_tiger_geocoder/Makefile
- extensions/address_standardizer/Makefile
+ $ADDRESS_STANDARDIZER_MAKEFILE_LIST
liblwgeom/Makefile
liblwgeom/cunit/Makefile
liblwgeom/liblwgeom.h
-----------------------------------------------------------------------
Summary of changes:
GNUmakefile.in | 8 ++++++++
configure.ac | 7 +++++--
2 files changed, 13 insertions(+), 2 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list