mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-28 10:42:19 +08:00
94b2a07762
* Enable CI for libspatialite:x64-windows-static-md * Use pkgconfig for nmake * Use pkgconfig for autotools; fix mingw * Install pc file for windows * Add feature interface, make GPLv2+ features optional * spatialite-tools need libspatialite[rttopo] * Update versions
35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
diff --git a/configure.ac b/configure.ac
|
|
index ead87caff..47abb90f0 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -302,6 +302,7 @@ if test x"$enable_geos" != "xno"; then
|
|
#-----------------------------------------------------------------------
|
|
# --with-geosconfig
|
|
#
|
|
+ if 0; then
|
|
AC_ARG_WITH([geosconfig],
|
|
[AS_HELP_STRING([--with-geosconfig=FILE], [specify an alternative geos-config file])],
|
|
[GEOSCONFIG="$withval"], [GEOSCONFIG=""])
|
|
@@ -327,6 +328,7 @@ if test x"$enable_geos" != "xno"; then
|
|
# Extract the linker and include flags
|
|
GEOS_LDFLAGS=`$GEOSCONFIG --ldflags`
|
|
GEOS_CFLAGS=-I`$GEOSCONFIG --includes`
|
|
+ fi
|
|
AC_SUBST([GEOS_LDFLAGS])
|
|
AC_SUBST([GEOS_CFLAGS])
|
|
# Ensure that we can parse geos_c.h
|
|
@@ -335,11 +337,13 @@ if test x"$enable_geos" != "xno"; then
|
|
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(GEOSCoveredBy,geos_c,,AC_MSG_ERROR([could not find libgeos_c (or obsolete 'libgeos_c' < v.3.3.0 found) - 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
|
|
|
|
#-----------------------------------------------------------------------
|
|
# --enable-controlpoints
|