[postgis-tickets] [SCM] PostGIS branch master updated. 3.4.0rc1-556-g65dbb2b9c

git at osgeo.org git at osgeo.org
Thu Sep 14 16:39:30 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, master has been updated
       via  65dbb2b9c24c477a28015a1903ed62ef4e19b621 (commit)
      from  936ce3efcec8c2e6351c0acd1ec4e9c5622f74c3 (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 65dbb2b9c24c477a28015a1903ed62ef4e19b621
Author: Sandro Santilli <strk at kbt.io>
Date:   Fri Sep 15 01:38:53 2023 +0200

    Replace expr with posix case
    
    Hopefully fixes macos build,
    ref https://cirrus-ci.com/task/6421549176061952

diff --git a/configure.ac b/configure.ac
index fab4f2b20..99ce20667 100644
--- a/configure.ac
+++ b/configure.ac
@@ -295,23 +295,28 @@ if test "x$XSLBASE" = "x"; then
 		/usr/share/xsl/docbook-xsl
 		"
 	for p in ${SEARCHPATH}; do
-    if expr "${p}" : / >/dev/null; then
-      AC_MSG_CHECKING([for html/docbook.xsl in directory $p...])
-      if test -r "${p}"/html/docbook.xsl; then
-        XSLBASE_AUTO="${p}"
-        AC_MSG_RESULT([found])
-        break
-      fi
-      AC_MSG_RESULT([not found])
-    elif test "x$XMLCATALOG" != "x"; then
-      AC_MSG_CHECKING([for html/docbook.xsl in URI $p...])
-      if $XMLCATALOG '' "${p}/html/docbook.xsl" >/dev/null; then
-        XSLBASE_AUTO="${p}"
-        AC_MSG_RESULT([found])
-        break
-      fi
-      AC_MSG_RESULT([not found])
-    fi
+    case "${p}" in
+      "/*")
+        AC_MSG_CHECKING([for html/docbook.xsl in directory $p...])
+        if test -r "${p}"/html/docbook.xsl; then
+          XSLBASE_AUTO="${p}"
+          AC_MSG_RESULT([found])
+          break
+        fi
+        AC_MSG_RESULT([not found])
+        ;;
+      *)
+        if test "x$XMLCATALOG" != "x"; then
+          AC_MSG_CHECKING([for html/docbook.xsl in URI $p...])
+          if $XMLCATALOG '' "${p}/html/docbook.xsl" >/dev/null; then
+            XSLBASE_AUTO="${p}"
+            AC_MSG_RESULT([found])
+            break
+          fi
+          AC_MSG_RESULT([not found])
+        fi
+        ;;
+    esac
 	done
 
 	dnl Check to see if the automatically searched paths above located a

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

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


hooks/post-receive
-- 
PostGIS


More information about the postgis-tickets mailing list