From: Regina Obe Date: Sun, 2 Jun 2019 17:29:09 +0000 (+0000) Subject: oops still had mistake -- hopefully this fixes it X-Git-Tag: 3.0.0alpha3~87 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=60e33b3c997b2fde5f25a3a20b45a92d2ccf05d3;p=postgis oops still had mistake -- hopefully this fixes it git-svn-id: http://svn.osgeo.org/postgis/trunk@17463 b70326c6-7e19-0410-871a-916f4a2858ee --- diff --git a/ci/winnie/build_postgis.sh b/ci/winnie/build_postgis.sh index e14ff2c08..6227ff808 100644 --- a/ci/winnie/build_postgis.sh +++ b/ci/winnie/build_postgis.sh @@ -115,10 +115,11 @@ if [ -n "$SFCGAL_VER" ]; then #CFLAGS="-Wall -fno-omit-frame-pointer" \ LDFLAGS="-Wl,--enable-auto-import -L${PGPATH}/lib -L${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/lib" \ +./configure \ --host=${MINGHOST} --with-xml2config=${PROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}${GCC_TYPE}/bin/xml2-config \ --with-pgconfig=${PGPATH}/bin/pg_config \ --with-geosconfig=${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin/geos-config \ - --with-libiconv=${PROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE} \ + --with-libiconv=${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE} \ --with-xsldir=${PROJECTS}/docbook/docbook-xsl-1.76.1 \ --with-gui --with-gettext=no \ --with-sfcgal=${PROJECTS}/CGAL/rel-sfcgal-${SFCGAL_VER}w${OS_BUILD}${GCC_TYPE}/bin/sfcgal-config \ @@ -129,6 +130,7 @@ else #CFLAGS="-Wall -fno-omit-frame-pointer" \ LDFLAGS="-Wl,--enable-auto-import -L${PGPATH}/lib -L${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/lib" \ +./configure \ --host=${MINGHOST} --with-xml2config=${PROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}${GCC_TYPE}/bin/xml2-config \ --with-pgconfig=${PGPATH}/bin/pg_config \ --with-geosconfig=${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin/geos-config \