Browse Source

wingrass: re-enable LAS support on 64bit

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@71392 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 7 years ago
parent
commit
25d11171ee
1 changed files with 5 additions and 3 deletions
  1. 5 3
      mswindows/osgeo4w/package.sh

+ 5 - 3
mswindows/osgeo4w/package.sh

@@ -155,8 +155,12 @@ if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
 
 	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 @@ if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
 	        --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