make postgresql support sensitive to PSQL_LIBS

The PSQL_LIBS environment variable is a standard way to pass the
required library list. The changes here add support for this to the
configures.

Merge-request: 673
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

2 files changed, 5 insertions, 0 deletions

diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index a5f9f2c584..2e2d8baf6b 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -1035,6 +1035,8 @@ void Configure::parseCmdLine()
             qmakeLibs += QString("-l" + configCmdLine.at(i));
         } else if (configCmdLine.at(i).startsWith("OPENSSL_LIBS=")) {
             opensslLibs = configCmdLine.at(i);
+        } else if (configCmdLine.at(i).startsWith("PSQL_LIBS=")) {
+            psqlLibs = configCmdLine.at(i);
         }
 
         else if( ( configCmdLine.at(i) == "-override-version" ) || ( configCmdLine.at(i) == "-version-override" ) ){
@@ -2747,6 +2749,8 @@ void Configure::generateOutputVars()
         else
             qmakeVars += QString("OPENSSL_LIBS    = -lssleay32 -llibeay32");
         }
+    if (!psqlLibs.isEmpty())
+        qmakeVars += QString("QT_LFLAGS_PSQL=") + psqlLibs.section("=", 1);
     if (!qmakeSql.isEmpty())
         qmakeVars += QString("sql-drivers    += ") + qmakeSql.join( " " );
     if (!qmakeSqlPlugins.isEmpty())
diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h
index 6c10dd8968..ff2ee8b571 100644
--- a/tools/configure/configureapp.h
+++ b/tools/configure/configureapp.h
@@ -133,6 +133,7 @@ private:
     QStringList qmakeIncludes;
     QStringList qmakeLibs;
     QString opensslLibs;
+    QString psqlLibs;
 
     QMap<QString,QString> licenseInfo;
     QString outputLine;