fix postgres <8.3 support

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9943 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jan 8, 2009 · 9dbbec4 · 9dbbec4
1 parent 816478d
commit 9dbbec4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/cmake/FindPostgres.cmake b/cmake/FindPostgres.cmake
@@ -61,6 +61,13 @@ ENDIF(WIN32)
 
 IF (POSTGRES_INCLUDE_DIR AND POSTGRES_LIBRARY)
    SET(POSTGRES_FOUND TRUE)
+
+   IF(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h")
+     SET(HAVE_PGCONFIG TRUE)
+   ELSE(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h")
+     SET(HAVE_PGCONFIG FALSE)
+   ENDIF(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h")
+
 ENDIF (POSTGRES_INCLUDE_DIR AND POSTGRES_LIBRARY)
 
 

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -140,6 +140,10 @@ SET (QGIS_APP_MOC_HDRS
   )
 
 IF (POSTGRES_FOUND)
+  IF(HAVE_PGCONFIG)
+    ADD_DEFINITIONS(-DHAVE_PGCONFIG=1)
+  ENDIF(HAVE_PGCONFIG)
+
   SET (QGIS_APP_SRCS ${QGIS_APP_SRCS}
     qgsdbsourceselect.cpp
     qgsnewconnection.cpp

diff --git a/src/app/qgsdbsourceselect.cpp b/src/app/qgsdbsourceselect.cpp
@@ -38,7 +38,9 @@ email                : sherman at mrcc.com
 #include <cassert>
 #include <iostream>
 
+#ifdef HAVE_PGCONFIG
 #include <pg_config.h>
+#endif
 
 QgsDbSourceSelect::QgsDbSourceSelect( QWidget *parent, Qt::WFlags fl )
     : QDialog( parent, fl ), mColumnTypeThread( NULL ), pd( 0 )