* configure.in (geos detection): use $geos_prefix/lib when --ldflags is not supported...

git-svn-id: http://svn.osgeo.org/postgis/trunk@2528 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/ChangeLog b/ChangeLog
index d04d4b02d38c3abad05614aeab8ffa2304d7430e..cfb3db0df986a97bdf715e4640cfdc23cb9b7ff5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-10 Sandro Santilli <strk@refractions.net>
+
+       * configure.in (geos detection): use $geos_prefix/lib when
+         --ldflags is not supported by geos-config available.
+
 2006-11-10 Havard Tveite <havard.tveite@nlh.no>
 
        * doc/postgix.xml (Hard Upgrade): add info about createdb params

diff --git a/configure.in b/configure.in
index 4e065ef3203892a800008d9de26b8b30ce8fbc70..85c06fc3750e5e8c88086f579dc9fc530c349c50 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -147,7 +147,16 @@ AC_ARG_WITH(geos,
 
 if test $USE_GEOS -gt 0; then
        GEOS_DIR=`$GEOSCONFIG --prefix`
-       GEOS_LDFLAGS=`$GEOSCONFIG --ldflags`
+
+       GEOS_LDFLAGS=`$GEOSCONFIG --ldflags 2> /dev/null`
+       if test x"$GEOS_LDFLAGS" = "x"; then
+               # older geos-config versions did not
+               # support the --ldflags switch, we'll
+               # default to GEOS_DIR/lib in this case.
+               #
+               GEOS_LDFLAGS="$GEOS_DIR/lib"
+       fi
+
        GEOS_MAJOR=`$GEOSCONFIG --version | cut -d. -f1`
        if test "$GEOS_MAJOR" = "@GEOS_VERSION@"; then
                GEOS_MAJOR=1