[GRASS-SVN] r50550 - grass/trunk/lib/raster

[svn_grass at osgeo.org]

Author: hamish
Date: 2012-01-30 03:11:45 -0800 (Mon, 30 Jan 2012)
New Revision: 50550

Modified:
   grass/trunk/lib/raster/gdal.c
Log:
look for debian/ubuntu versions of the library name too (apparently not needed for 1.8.0+; merge from devbr6)

Modified: grass/trunk/lib/raster/gdal.c
===================================================================
--- grass/trunk/lib/raster/gdal.c	2012-01-30 11:11:10 UTC (rev 50549)
+++ grass/trunk/lib/raster/gdal.c	2012-01-30 11:11:45 UTC (rev 50550)
@@ -110,6 +110,8 @@
 	"gdal.so.1.0",
 	"libgdal.so.1",
 	"libgdal.so",
+	"libgdal1.6.0.so",
+	"libgdal1.7.0.so",
 # endif
 # ifdef _WIN32
 	"gdal19.dll",
@@ -128,8 +130,10 @@
 
     for (i = 0; candidates[i]; i++) {
 	try_load_library(candidates[i]);
-	if (library_h)
+	if (library_h) {
+	    G_debug(3, "found %s", candidates[i]);
 	    return;
+	}
     }
 
     G_fatal_error(_("Unable to load GDAL library"));