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

[svn_grass at osgeo.org]

Author: neteler
Date: 2014-05-11 13:46:46 -0700 (Sun, 11 May 2014)
New Revision: 60194

Modified:
   grass/branches/develbranch_6/lib/gis/gisinit.c
Log:
libgis: improve version mismatch compilation warning (modified patch from trac #1467)

Modified: grass/branches/develbranch_6/lib/gis/gisinit.c
===================================================================
--- grass/branches/develbranch_6/lib/gis/gisinit.c	2014-05-11 20:45:14 UTC (rev 60193)
+++ grass/branches/develbranch_6/lib/gis/gisinit.c	2014-05-11 20:46:46 UTC (rev 60194)
@@ -51,8 +51,10 @@
     G_set_program_name(pgm);
 
     if (strcmp(version, GIS_H_VERSION) != 0)
-	G_fatal_error(_("Incompatible library version for module. "
-			"You need to rebuild GRASS or untangle multiple installations."));
+	G_fatal_error(_("Module built against version %s but "
+			"trying to use version %s."
+			"You need to rebuild GRASS GIS or untangle multiple installations."),
+                        version, GIS_H_VERSION);
 
     /* Make sure location and mapset are set */
     G_location_path();
@@ -87,9 +89,10 @@
 	return 0;
 
     if (strcmp(version, GIS_H_VERSION) != 0)
-	G_fatal_error(_("Incompatible library version for module. "
-			"You need to rebuild GRASS or untangle multiple installations."));
-
+	G_fatal_error(_("Module built against version %s but "
+			"trying to use version %s."
+			"You need to rebuild GRASS GIS or untangle multiple installations."),
+                        version, GIS_H_VERSION);
     gisinit();
 
     return 0;