show PostgreSQL and SpatiaLite version in about

git-svn-id: http://svn.osgeo.org/qgis/trunk@13271 c8812cc2-4d05-0410-92ff-de0c093fc19c

src/app/qgisapp.cpp

@@ -211,6 +211,11 @@
 //
 #ifdef HAVE_POSTGRESQL
 #include "postgres/qgspgsourceselect.h"
+#ifdef HAVE_PGCONFIG
+#include <pg_config.h>
+#else
+#define PG_VERSION "unknown"
+#endif
 #endif
 #ifdef HAVE_SPATIALITE
 extern "C"
@@ -2353,13 +2358,13 @@ void QgisApp::about()
                             .arg( QGis::QGIS_VERSION )
                             .arg( QGis::QGIS_SVN_VERSION );
 #ifdef HAVE_POSTGRESQL
-    versionString += tr( "\nThis copy of QGIS has been built with PostgreSQL support." );
+    versionString += tr( "\nThis copy of QGIS has been built with PostgreSQL support (%1)." ).arg( PG_VERSION );
 #else
     versionString += tr( "\nThis copy of QGIS has been built without PostgreSQL support." );
 #endif
 
 #ifdef HAVE_SPATIALITE
-    versionString += tr( "\nThis copy of QGIS has been built with SpatiaLite support." );
+    versionString += tr( "\nThis copy of QGIS has been built with SpatiaLite support (%1)." ).arg( spatialite_version() );
 #else
     versionString += tr( "\nThis copy of QGIS has been built without SpatiaLite support." );
 #endif

src/providers/spatialite/CMakeLists.txt

@@ -17,8 +17,8 @@ INCLUDE_DIRECTORIES(../../core)
 
 IF(WITH_INTERNAL_SPATIALITE)
   INCLUDE_DIRECTORIES(
-    ../core/spatialite/headers
-    ../core/spatialite/headers/spatialite
+    ../../core/spatialite/headers
+    ../../core/spatialite/headers/spatialite
   )
 ELSE(WITH_INTERNAL_SPATIALITE)
   INCLUDE_DIRECTORIES(${SPATIALITE_INCLUDE_DIR})