[GRASS-SVN] r68019 - in grass/branches/releasebranch_7_0: . lib/raster

[svn_grass at osgeo.org]

Author: martinl
Date: 2016-03-08 04:07:44 -0800 (Tue, 08 Mar 2016)
New Revision: 68019

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/lib/raster/gdal.c
Log:
libraster: support linking GDAL2 (merge r68017 from trunk)


Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Deleted: svn:mergeinfo
   - /grass/trunk:68000

Modified: grass/branches/releasebranch_7_0/lib/raster/gdal.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/raster/gdal.c	2016-03-08 10:16:26 UTC (rev 68018)
+++ grass/branches/releasebranch_7_0/lib/raster/gdal.c	2016-03-08 12:07:44 UTC (rev 68019)
@@ -104,16 +104,17 @@
 {
     static const char *const candidates[] = {
 # ifdef __unix__
+	"libgdal.so.20",
+	"libgdal.so.1",
 	"libgdal.1.1.so",
-	"libgdal1.6.0.so",
 	"gdal.1.0.so",
 	"gdal.so.1.0",
-	"libgdal.so.1",
 	"libgdal.so",
 	"libgdal1.6.0.so",
 	"libgdal1.7.0.so",
 # endif
 # ifdef _WIN32
+	"gdal200.dll",
 	"gdal111.dll",
 	"gdal110.dll",
 	"gdal19.dll",