diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2010-06-10 12:58:16 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-06-10 12:59:12 (GMT) |
| commit | ec3bc9bbba71438374148118e539e75ee119a65f (patch) | |
| tree | bab329afa712e5a49dc4f96a0811de0cddfd19f6 /configure | |
| parent | b65a1e0be447abca16f20001efe1be43a0469808 (diff) | |
| download | Qt-ec3bc9bbba71438374148118e539e75ee119a65f.zip Qt-ec3bc9bbba71438374148118e539e75ee119a65f.tar.gz Qt-ec3bc9bbba71438374148118e539e75ee119a65f.tar.bz2 | |
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>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -4921,6 +4921,8 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do fi [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL" [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL" + # But, respect PSQL_LIBS if set + [ -z "$PSQL_LIBS" ] || QT_LFLAGS_PSQL="$PSQL_LIBS" if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/psql "PostgreSQL" $QT_LFLAGS_PSQL $L_FLAGS $QT_CFLAGS_PSQL $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then if [ "$CFG_SQL_psql" = "auto" ]; then CFG_SQL_psql=plugin |