diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2015-03-02 09:23:07 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2015-03-02 09:23:07 +0100 |
| commit | 2b5982aac8ad103443e33379fe5654f5bd419c87 (patch) | |
| tree | 8cc1d4e00029a6c0f5a23d87e9c97cdfc4619538 /configure | |
| parent | efe3f631f232e6cc3966de59b9237653bf7fa96e (diff) | |
| parent | fc3733cba4652f2b8930c66665103fcb20874735 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Change-Id: I95b3a87c5068c6b8068b30a35655b4c2419e7f9e
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 14 |
1 files changed, 10 insertions, 4 deletions
@@ -594,6 +594,7 @@ CFG_WIDGETS=yes CFG_QCONFIG=full CFG_DEBUG=auto CFG_MYSQL_CONFIG= +CFG_PSQL_CONFIG= CFG_DEBUG_RELEASE=no CFG_FORCEDEBUGINFO=no CFG_SHARED=yes @@ -913,6 +914,7 @@ while [ "$#" -gt 0 ]; do -arch| \ -host-arch| \ -mysql_config| \ + -psql_config| \ -qpa| \ -qconfig| \ -qreal| \ @@ -1105,6 +1107,9 @@ while [ "$#" -gt 0 ]; do mysql_config) CFG_MYSQL_CONFIG="$VAL" ;; + psql_config) + CFG_PSQL_CONFIG="$VAL" + ;; prefix) QT_INSTALL_PREFIX="$VAL" ;; @@ -3404,7 +3409,7 @@ fi # auto-detect -fuse-ld=gold support if [ "$CFG_USE_GOLD_LINKER" != "no" ]; then - if linkerSupportsFlag $TEST_COMPILER -fuse-ld=gold; then + if compilerSupportsFlag $TEST_COMPILER -fuse-ld=gold; then CFG_USE_GOLD_LINKER=yes else if [ "$CFG_USE_GOLD_LINKER" = "yes" ]; then @@ -4615,10 +4620,11 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do ;; psql) if [ "$CFG_SQL_psql" != "no" ]; then + [ -z "$CFG_PSQL_CONFIG" ] && CFG_PSQL_CONFIG=`"$WHICH" pg_config` # Be careful not to use native pg_config when cross building. - if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then - QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null | filterIncludePath` - QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null | filterLibraryPath` + if [ "$XPLATFORM_MINGW" != "yes" ] && [ -x "$CFG_PSQL_CONFIG" ]; then + QT_CFLAGS_PSQL=`$CFG_PSQL_CONFIG --includedir 2>/dev/null | filterIncludePath` + QT_LFLAGS_PSQL=`$CFG_PSQL_CONFIG --libdir 2>/dev/null | filterLibraryPath` fi [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL" [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL" |