[GRASS-SVN] r50547 - grass/branches/develbranch_6/lib/gis

[svn_grass at osgeo.org]

Author: hamish
Date: 2012-01-30 03:07:39 -0800 (Mon, 30 Jan 2012)
New Revision: 50547

Modified:
   grass/branches/develbranch_6/lib/gis/gdal.c
Log:
look for debian/ubuntu versions of the library name too (apparently not needed for 1.8.0+)

Modified: grass/branches/develbranch_6/lib/gis/gdal.c
===================================================================
--- grass/branches/develbranch_6/lib/gis/gdal.c	2012-01-30 10:57:03 UTC (rev 50546)
+++ grass/branches/develbranch_6/lib/gis/gdal.c	2012-01-30 11:07:39 UTC (rev 50547)
@@ -87,6 +87,8 @@
 	"gdal.so.1.0",
 	"libgdal.so.1",
 	"libgdal.so",
+	"libgdal1.6.0.so",
+	"libgdal1.7.0.so",
 # endif
 # ifdef _WIN32
 	"gdal19.dll",
@@ -105,8 +107,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"));