[postgis-tickets] [SCM] PostGIS branch master updated. 3.2.0beta1-34-gb58339cce

[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  b58339cce2df86cca7d6b5ad97e415836edc9caf (commit)
       via  e10058ad184131e4284d047a629b3c2fbff7fe55 (commit)
      from  aa7add4bad2bf439106025509c4260adad0acbd8 (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 b58339cce2df86cca7d6b5ad97e415836edc9caf
Merge: aa7add4ba e10058ad1
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Fri Nov 26 09:59:53 2021 -0800

    Merge branch 'master-pcre-missing'


commit e10058ad184131e4284d047a629b3c2fbff7fe55
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Thu Nov 25 15:58:07 2021 -0800

    add action in case of pkgconfig failure on pcre1

diff --git a/configure.ac b/configure.ac
index aa330ebf3..f41bbfb2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1222,18 +1222,18 @@ if test "x$with_address_standardizer" != "xno"; then
                         AC_MSG_RESULT([found pcre2.h])
                     ],
                     [
-                		AC_CHECK_FILE("$PCREDIR/include/pcre.h",
-                		[
-	                        PCRE_CPPFLAGS="-I$PCREDIR/include"
-	                        PCRE_LDFLAGS="-L$PCREDIR/lib -lpcre"
-	                        HAVE_PCRE1=yes
-	                        ADDRESS_STANDARDIZER="address_standardizer"
+                        AC_CHECK_FILE("$PCREDIR/include/pcre.h",
+                        [
+	                          PCRE_CPPFLAGS="-I$PCREDIR/include"
+	                          PCRE_LDFLAGS="-L$PCREDIR/lib -lpcre"
+	                          HAVE_PCRE1=yes
+	                          ADDRESS_STANDARDIZER="address_standardizer"
                             AC_MSG_RESULT([found pcre.h])
-                		],
-                		[
+                        ],
+                        [
                             AC_MSG_RESULT([no])
-                			AC_MSG_ERROR(["Could not find PCRE header in $PCREDIR/include"])
-                		])
+                            AC_MSG_ERROR(["Could not find PCRE header in $PCREDIR/include"])
+                        ])
                     ])
             else
                 AC_MSG_ERROR([the --with-pcredir directory "$PCREDIR" cannot be found])
@@ -1241,19 +1241,20 @@ if test "x$with_address_standardizer" != "xno"; then
         fi
     elif test ! -z "$PKG_CONFIG"; then
         PKG_CHECK_MODULES([PCRE2], [libpcre2-8], [
-                PCRE_CPPFLAGS="$PCRE2_CFLAGS"
-                PCRE_LDFLAGS="$PCRE2_LIBS"
+            PCRE_CPPFLAGS="$PCRE2_CFLAGS"
+            PCRE_LDFLAGS="$PCRE2_LIBS"
+            ADDRESS_STANDARDIZER="address_standardizer"
+            HAVE_PCRE2=yes
+        ],[
+            PKG_CHECK_MODULES([PCRE], [libpcre], [
+                PCRE_CPPFLAGS="$PCRE_CFLAGS"
+                PCRE_LDFLAGS="$PCRE_LIBS"
                 ADDRESS_STANDARDIZER="address_standardizer"
-                HAVE_PCRE2=yes
-            ],
-            [
-                PKG_CHECK_MODULES([PCRE], [libpcre], [
-                    PCRE_CPPFLAGS="$PCRE_CFLAGS"
-                    PCRE_LDFLAGS="$PCRE_LIBS"
-                    ADDRESS_STANDARDIZER="address_standardizer"
-                    HAVE_PCRE1=yes
-                    ],[])
+                HAVE_PCRE1=yes
+            ],[
+                ADDRESS_STANDARDIZER=""
             ])
+        ])
     fi
 
     if test "x$HAVE_PCRE2" = "xyes"; then

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

Summary of changes:
 configure.ac | 43 ++++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
PostGIS