[GRASS-SVN] r53964 - in grass/trunk: general/g.version gui/wxpython/lmgr

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-11-21 14:39:14 -0800 (Wed, 21 Nov 2012)
New Revision: 53964

Modified:
   grass/trunk/general/g.version/g.version.html
   grass/trunk/general/g.version/main.c
   grass/trunk/gui/wxpython/lmgr/frame.py
Log:
g.version -e: report also SQLite version
          update wxGUI to report also SQLite


Modified: grass/trunk/general/g.version/g.version.html
===================================================================
--- grass/trunk/general/g.version/g.version.html	2012-11-21 21:49:25 UTC (rev 53963)
+++ grass/trunk/general/g.version/g.version.html	2012-11-21 22:39:14 UTC (rev 53964)
@@ -63,6 +63,7 @@
 proj4=4.8.0
 gdal=1.9.2
 geos=3.3.5
+sqlite=3.7.14.1
 </pre></div>
 
 <h2>AUTHORS</h2>

Modified: grass/trunk/general/g.version/main.c
===================================================================
--- grass/trunk/general/g.version/main.c	2012-11-21 21:49:25 UTC (rev 53963)
+++ grass/trunk/general/g.version/main.c	2012-11-21 22:39:14 UTC (rev 53964)
@@ -31,6 +31,10 @@
 #include <geos_c.h>
 #endif
 
+#ifdef HAVE_SQLITE
+#include <sqlite3.h>
+#endif
+
 #ifndef GRASS_VERSION_UPDATE_PKG
 #define GRASS_VERSION_UPDATE_PKG "0.1"
 #endif
@@ -158,6 +162,17 @@
         else
             fprintf(stdout, "%s\n", _("GRASS not compiled with GEOS support"));
 #endif
+#ifdef HAVE_SQLITE
+        if (shell->answer)
+            fprintf(stdout, "sqlite=%s\n", SQLITE_VERSION);
+        else
+            fprintf(stdout, "SQLite: %s\n", SQLITE_VERSION);
+#else
+        if (shell->answer)
+            fprintf(stdout, "sqlite=\n");
+        else
+            fprintf(stdout, "%s\n", _("GRASS not compiled with SQLite support"));
+#endif
     }
     
     return (EXIT_SUCCESS);

Modified: grass/trunk/gui/wxpython/lmgr/frame.py
===================================================================
--- grass/trunk/gui/wxpython/lmgr/frame.py	2012-11-21 21:49:25 UTC (rev 53963)
+++ grass/trunk/gui/wxpython/lmgr/frame.py	2012-11-21 22:39:14 UTC (rev 53964)
@@ -899,12 +899,13 @@
                               "GDAL/OGR: %s\n"
                               "PROJ.4: %s\n"
                               "GEOS: %s\n"
+                              "SQLite: %s\n"
                               "Python: %s\n"
                               "wxPython: %s\n"
                               "%s: %s%s\n"% (_("GRASS version"), vInfo['version'],
                                            _("GRASS SVN Revision"), vInfo['revision'],
                                            _("GIS Library Revision"), vInfo['libgis_revision'], vInfo['libgis_date'].split(' ', 1)[0],
-                                           vInfo['gdal'], vInfo['proj4'], vInfo['geos'],
+                                           vInfo['gdal'], vInfo['proj4'], vInfo['geos'], vInfo['sqlite'],
                                            platform.python_version(),
                                            wx.__version__,
                                            _("Platform"), platform.platform(), osgeo4w),