aboutsummaryrefslogtreecommitdiff
path: root/ports/spatialite-tools/fix-linux-configure.patch
diff options
context:
space:
mode:
authorLong Huan <8551701+longhuan2018@users.noreply.github.com>2020-12-23 15:21:14 +0800
committerGitHub <noreply@github.com>2020-12-22 23:21:14 -0800
commit8fda0d2956ba55e58fa81ab310bebfa1e09bee63 (patch)
tree48dea290cc3c458f9795e51891a1757c792ad7a6 /ports/spatialite-tools/fix-linux-configure.patch
parent3efce9a5c9d53ac486693bc52fd97a98ae4be81c (diff)
downloadvcpkg-8fda0d2956ba55e58fa81ab310bebfa1e09bee63.tar.gz
vcpkg-8fda0d2956ba55e58fa81ab310bebfa1e09bee63.zip
[spatialite-tools]update to 5.0.0 (#15039)
Diffstat (limited to 'ports/spatialite-tools/fix-linux-configure.patch')
-rw-r--r--ports/spatialite-tools/fix-linux-configure.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/ports/spatialite-tools/fix-linux-configure.patch b/ports/spatialite-tools/fix-linux-configure.patch
new file mode 100644
index 000000000..b31544b77
--- /dev/null
+++ b/ports/spatialite-tools/fix-linux-configure.patch
@@ -0,0 +1,35 @@
+diff --git a/configure.ac b/configure.ac
+index ff15f2922..c254b3619 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -142,6 +142,7 @@ fi
+ AC_ARG_WITH([geosconfig],
+ [AS_HELP_STRING([--with-geosconfig=FILE], [specify an alternative geos-config file])],
+ [GEOSCONFIG="$withval"], [GEOSCONFIG=""])
++if 0; then
+ if test "x$GEOSCONFIG" = "x"; then
+ # GEOSCONFIG was not specified, so search within the current path
+ AC_PATH_PROG([GEOSCONFIG], [geos-config])
+@@ -164,6 +165,7 @@ fi
+ # Extract the linker and include flags
+ GEOS_LDFLAGS=`$GEOSCONFIG --ldflags`
+ GEOS_CPPFLAGS=-I`$GEOSCONFIG --includes`
++fi
+ AC_SUBST([GEOS_LDFLAGS])
+ AC_SUBST([GEOS_CPPFLAGS])
+ # Ensure that we can parse geos_c.h
+@@ -172,11 +174,14 @@ CPPFLAGS="$GEOS_CPPFLAGS"
+ AC_CHECK_HEADERS([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"
+ # Ensure we can link against libgeos_c
++if 0; then
+ LIBS_SAVE="$LIBS"
+ LIBS="$GEOS_LDFLAGS"
+ AC_SEARCH_LIBS(GEOSTopologyPreserveSimplify,geos_c,,AC_MSG_ERROR([could not find libgeos_c - you may need to specify the directory of a geos-config file using --with-geosconfig]))
+ LIBS="$LIBS_SAVE"
+ LIBS=$LIBS$GEOS_LDFLAGS' -lgeos_c'
++fi
++LIBS="$LIBS $GEOS_LDFLAGS"
+
+ PKG_CHECK_MODULES([LIBSPATIALITE], [spatialite], , AC_MSG_ERROR(['libspatialite' is required but it doesn't seem to be installed on this system.]))
+ AC_SUBST(LIBSPATIALITE_CFLAGS)