From eaa86c1b6b0596fb72d580f8a82ff48b7e93df97 Mon Sep 17 00:00:00 2001
From: gsherman <gsherman@c8812cc2-4d05-0410-92ff-de0c093fc19c>
Date: Thu, 28 Aug 2003 03:07:32 +0000
Subject: [PATCH] modified postgres checking

git-svn-id: http://svn.osgeo.org/qgis/trunk@250 c8812cc2-4d05-0410-92ff-de0c093fc19c
---
 qgis/src/qgsprojectio.cpp | 4 ++--
 qgis/src/src.pro          | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/qgis/src/qgsprojectio.cpp b/qgis/src/qgsprojectio.cpp
index fd7f2bfd33d..b211472cd66 100644
--- a/qgis/src/qgsprojectio.cpp
+++ b/qgis/src/qgsprojectio.cpp
@@ -19,7 +19,7 @@
  #include <qmessagebox.h>
  #include <qcolor.h>
  #include "qgsmaplayer.h"
- #ifdef PGDB
+ #ifdef POSTGRESQL
  #include "qgsdatabaselayer.h"
  #endif
  #include "qgsshapefilelayer.h"
@@ -155,7 +155,7 @@ bool QgsProjectIo::read(){
 		// add the layer to the maplayer
 		
 		if(type == "database"){
-			#ifdef PGDB
+			#ifdef POSTGRESQL
 				QgsDatabaseLayer *dbl = new QgsDatabaseLayer(dataSource, layerName);
 				
 				map->addLayer(dbl);
diff --git a/qgis/src/src.pro b/qgis/src/src.pro
index ccef7808094..daa5771b39d 100644
--- a/qgis/src/src.pro
+++ b/qgis/src/src.pro
@@ -81,10 +81,10 @@ TARGET = qgis
 #.............................
 #PostgreSQL support
 #.............................
-contains (DEFINES, postgres){
+contains (DEFINES, POSTGRESQL){
  message ("Checking PostgreSQL environment")
 }
-contains ( DEFINES, postgres ){
+contains ( DEFINES, POSTGRESQL ){
 MYPGSQL=$$(PGSQL)
 count(MYPGSQL, 1){
 message ("PGSQL environment variable is defined")
@@ -93,7 +93,7 @@ message ("PGSQL environment variable is defined")
   message ( "Configuring to build with PostgreSQL support" )
   LIBS += -L$(PGSQL)/lib -lpq++
   INCLUDEPATH += $(PGSQL)/include
-  DEFINES += PGDB HAVE_NAMESPACE_STD HAVE_CXX_STRING_HEADER DLLIMPORT=""
+  DEFINES += HAVE_NAMESPACE_STD HAVE_CXX_STRING_HEADER DLLIMPORT=""
   SOURCES += qgsdatabaselayer.cpp \
              qgsdbsourceselect.cpp \
              qgsnewconnection.cpp