[SCM] PostGIS branch stable-3.3 updated. 3.3.6-24-g825755c43

[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, stable-3.3 has been updated
       via  825755c43b0b53d69bce4bf2ecc57ebcc238bcaf (commit)
      from  990da2b6c0f8339e20e4e7d2d71d4036261df763 (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 825755c43b0b53d69bce4bf2ecc57ebcc238bcaf
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Mon Jun 3 15:24:49 2024 -0700

    Allow rpath setting in MacOS to support geos/proj linking in usr/local/lib

diff --git a/configure.ac b/configure.ac
index 93e80a715..855ea1d54 100644
--- a/configure.ac
+++ b/configure.ac
@@ -761,6 +761,22 @@ CPPFLAGS="$GEOS_CPPFLAGS"
 AC_CHECK_HEADER([geos_c.h], [], [AC_MSG_ERROR([could not find geos_c.h - you may need to specify the directory of a geos-config file using --with-geosconfig])])
 CPPFLAGS="$CPPFLAGS_SAVE"
 
+#
+# MacOS with XCode > 15 now requires rpath entries for
+# libraries like GEOS/Proj that might be flexibly installed
+# with movability expected
+#
+case $host_os in
+    darwin*)
+                GEOS_RPATH=`echo $GEOS_LDFLAGS | $PERL -nle 'print "$1" if /\-L ?(\S+) /'`
+                AC_MSG_RESULT([checking for GEOS_RPATH under MacOS... $GEOS_RPATH])
+                if test "x$GEOS_RPATH" != "x"; then
+                  # Add the rpath setting to the LDFLAGS
+                    GEOS_LDFLAGS="$GEOS_LDFLAGS -Wl,-rpath,$GEOS_RPATH"
+                fi
+                ;;
+esac
+
 dnl Ensure we can link against libgeos_c
 LIBS_SAVE="$LIBS"
 LIBS="$GEOS_LDFLAGS"
@@ -906,6 +922,21 @@ else
 	PROJ_LDFLAGS="-lproj"
 fi
 
+#
+# MacOS with XCode > 15 now requires rpath entries for
+# libraries like GEOS/Proj that might be flexibly installed
+# with movability expected
+#
+case $host_os in
+    darwin*)
+                PROJ_RPATH=`echo $PROJ_LDFLAGS | $PERL -nle 'print "$1" if /\-L ?(\S+) /'`
+                AC_MSG_RESULT([checking for PROJ_RPATH under MacOS... $PROJ_RPATH])
+                    if test "x$PROJ_RPATH" != "x"; then
+                  # Add the rpath setting to the LDFLAGS
+                    PROJ_LDFLAGS="$PROJ_LDFLAGS -Wl,-rpath,$PROJ_RPATH"
+                fi
+                ;;
+esac
 
 dnl Check that we can find the proj_api.h header file
 CPPFLAGS_SAVE="$CPPFLAGS"
diff --git a/loader/Makefile.in b/loader/Makefile.in
index da7aab7a1..85aba3f03 100644
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
@@ -35,7 +35,7 @@ SHELL = @SHELL@
 INSTALL = @INSTALL@
 LIBTOOL = @LIBTOOL@
 
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ @PROJ_LDFLAGS@ @GEOS_LDFLAGS@
 
 # Filenames with extension as determined by the OS
 POSTGIS-CLI=postgis at EXESUFFIX@

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

Summary of changes:
 configure.ac       | 31 +++++++++++++++++++++++++++++++
 loader/Makefile.in |  2 +-
 2 files changed, 32 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
PostGIS