[GRASS-SVN] r72108 - grass/branches/releasebranch_7_4/mswindows/osgeo4w

[svn_grass at osgeo.org]

Author: martinl
Date: 2018-01-21 06:58:43 -0800 (Sun, 21 Jan 2018)
New Revision: 72108

Modified:
   grass/branches/releasebranch_7_4/mswindows/osgeo4w/package.sh
Log:
wingrass: re-enable liblas for 64bit, see  https://trac.osgeo.org/osgeo4w/ticket/550
          (merge r72103 from trunk)


Modified: grass/branches/releasebranch_7_4/mswindows/osgeo4w/package.sh
===================================================================
--- grass/branches/releasebranch_7_4/mswindows/osgeo4w/package.sh	2018-01-21 14:25:52 UTC (rev 72107)
+++ grass/branches/releasebranch_7_4/mswindows/osgeo4w/package.sh	2018-01-21 14:58:43 UTC (rev 72108)
@@ -156,8 +156,7 @@
 	if [ "$MINGW_POSTFIX" = "64" ]; then
 	    conf_host=x86_64-w64-mingw32
             # https://trac.osgeo.org/osgeo4w/ticket/550
-            # LAS support hopefully only temporarily disabled on 64bit
-            conf_opts=
+            conf_opts="--with-liblas=$PWD/mswindows/osgeo4w/liblas-config"
 	else
 	    conf_host=i386-w64-mingw32
             # https://trac.osgeo.org/osgeo4w/ticket/539