[postgis-tickets] [SCM] PostGIS branch master updated. 558af7a63d1b2057ad0cc05b9ed601659787508b

[git at osgeo.org]

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, master has been updated
       via  558af7a63d1b2057ad0cc05b9ed601659787508b (commit)
      from  413b47356205b181427ccb5a16e86271d00bbd96 (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 558af7a63d1b2057ad0cc05b9ed601659787508b
Author: Raúl Marín <git at rmr.ninja>
Date:   Wed Jan 8 13:16:55 2020 +0100

    Add option to disable phony revision
    
    Closes #4617
    Closes https://github.com/postgis/postgis/pull/532/

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 865ee2d..499bf6c 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -172,7 +172,12 @@ fmt:
 commit:
 	$(MAKE) fmt && $(MAKE) clean && $(MAKE) check && svn commit
 
+
+ifeq (@PHONY_REVISION@,yes)
+.PHONY: postgis_revision.h
+endif
+
 postgis_revision.h:
 	$(PERL) utils/repo_revision.pl
 
-.PHONY: utils liblwgeom ChangeLog raster postgis_revision.h
+.PHONY: utils liblwgeom ChangeLog raster
diff --git a/NEWS b/NEWS
index 822c1bd..108c3c1 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,7 @@ PostGIS 3.1.0
 * New features *
   - #4601, Add ST_TileEnvelope margin argument (Yuri Astrakhan)
   - #2972, Add quiet mode (-q) to pgsql2shp (Kristian Thy)
+  - #4617, Add configure switch `--without-phony-revision` (Raúl Marín)
 
 * Enhancements *
   - #4539, Unify libm includes (Raúl Marín)
diff --git a/configure.ac b/configure.ac
index 4298fed..3521b56 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1130,6 +1130,18 @@ else
     CPPFLAGS="-DNDEBUG $CPPFLAGS"
 fi
 
+dnl ===========================================================================
+dnl Allow the developer to disable the automatic updates of postgis_revision.h
+dnl with --without-phony-revision
+dnl
+AC_ARG_WITH([phony-revision], AC_HELP_STRING([--without-phony-revision], [Disable automatic updates of postgis_revision.h]), [], [])
+if test "x$with_phony_revision" != "xno"; then
+    PHONY_REVISION="yes"
+else
+    PHONY_REVISION="no"
+fi
+AC_MSG_RESULT([phony-revision: $with_phony_revision])
+AC_SUBST([PHONY_REVISION])
 
 dnl ===========================================================================
 dnl Define version macros
diff --git a/doc/installation.xml b/doc/installation.xml
index fe60ce9..86b9a1e 100644
--- a/doc/installation.xml
+++ b/doc/installation.xml
@@ -606,6 +606,14 @@ tar -xvzf postgis-&last_release_version;.tar.gz</programlisting>
 			</para>
 		  </listitem>
 		</varlistentry>
+		<varlistentry>
+		  <term><command>--without-phony-revision</command></term>
+		  <listitem>
+			<para>
+			  Disable updating postgis_revision.h to match current HEAD of the git repository.
+			</para>
+		  </listitem>
+		</varlistentry>
 	  </variablelist>
 	  <note>
 		<para>

-----------------------------------------------------------------------

Summary of changes:
 GNUmakefile.in       |  7 ++++++-
 NEWS                 |  1 +
 configure.ac         | 12 ++++++++++++
 doc/installation.xml |  8 ++++++++
 4 files changed, 27 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
PostGIS