[GRASS-SVN] r71401 - grass/branches/releasebranch_7_0/mswindows/osgeo4w

[svn_grass at osgeo.org]

Author: martinl
Date: 2017-08-14 10:28:04 -0700 (Mon, 14 Aug 2017)
New Revision: 71401

Modified:
   grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh
Log:
wingrass: re-enable LAS support on 64bit
          (merge r71392 from trunk)


Modified: grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh
===================================================================
--- grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh	2017-08-14 17:25:29 UTC (rev 71400)
+++ grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh	2017-08-14 17:28:04 UTC (rev 71401)
@@ -160,8 +160,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
@@ -189,10 +193,9 @@
 		--with-odbc \
 	        --with-cairo \
                 --with-postgres \
-	        --with-opengl=windows
-        
-# see https://trac.osgeo.org/osgeo4w/ticket/539#ticket
-# --with-liblas=$PWD/mswindows/osgeo4w/liblas-config
+	        --with-opengl=windows \
+                $conf_opts
+
 	touch mswindows/osgeo4w/configure-stamp
 fi