[GRASS-SVN] r71392 - grass/trunk/mswindows/osgeo4w

[svn_grass at osgeo.org]

Author: martinl
Date: 2017-08-11 08:03:53 -0700 (Fri, 11 Aug 2017)
New Revision: 71392

Modified:
   grass/trunk/mswindows/osgeo4w/package.sh
Log:
wingrass: re-enable LAS support on 64bit

Modified: grass/trunk/mswindows/osgeo4w/package.sh
===================================================================
--- grass/trunk/mswindows/osgeo4w/package.sh	2017-08-11 13:03:50 UTC (rev 71391)
+++ grass/trunk/mswindows/osgeo4w/package.sh	2017-08-11 15:03:53 UTC (rev 71392)
@@ -155,8 +155,12 @@
 
 	if [ "$MINGW_POSTFIX" = "64" ]; then
 	    conf_host=x86_64-w64-mingw32
+            # see https://trac.osgeo.org/osgeo4w/ticket/539#ticket
+            # LAS support only enabled on 64bit
+            conf_opts="--with-liblas=$PWD/mswindows/osgeo4w/liblas-config"
 	else
 	    conf_host=i386-w64-mingw32
+            conf_opts=
 	fi
 	
 	log configure
@@ -185,11 +189,9 @@
 	        --with-cairo \
                 --with-postgres \
 	        --with-opengl=windows \
-                --with-bzlib
+                --with-bzlib $conf_opts
 # see #3047
 #	        --with-mysql 
-# see https://trac.osgeo.org/osgeo4w/ticket/539#ticket
-# --with-liblas=$PWD/mswindows/osgeo4w/liblas-config
 	touch mswindows/osgeo4w/configure-stamp
 fi