]> granicus.if.org Git - postgis/commitdiff
oops still had mistake -- hopefully this fixes it
authorRegina Obe <lr@pcorp.us>
Sun, 2 Jun 2019 17:29:09 +0000 (17:29 +0000)
committerRegina Obe <lr@pcorp.us>
Sun, 2 Jun 2019 17:29:09 +0000 (17:29 +0000)
git-svn-id: http://svn.osgeo.org/postgis/trunk@17463 b70326c6-7e19-0410-871a-916f4a2858ee

ci/winnie/build_postgis.sh

index e14ff2c08b0d903bba8fbe533e4df655a7d408c9..6227ff808add4744ec60f9d231cfbfe612f1fec4 100644 (file)
@@ -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 \