| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061 |
- From f23a18de3c398c908c92b8cf8f20edc12435b9d1 Mon Sep 17 00:00:00 2001
- From: Peter Seiderer <ps.report@gmx.net>
- Date: Thu, 19 Feb 2015 22:41:02 +0100
- Subject: [PATCH] configure: add '-psql_config' option
- Allow setting of pg_config path for cross compilation (do
- the same as for mysql_config).
- Signed-off-by: Peter Seiderer <ps.report@gmx.net>
- ---
- configure | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
- diff --git a/configure b/configure
- index 0c66ecf..491486a 100755
- --- a/configure
- +++ b/configure
- @@ -578,6 +578,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
- @@ -885,6 +886,7 @@ while [ "$#" -gt 0 ]; do
- -arch| \
- -host-arch| \
- -mysql_config| \
- + -psql_config| \
- -qpa| \
- -qconfig| \
- -qreal| \
- @@ -1066,6 +1068,9 @@ while [ "$#" -gt 0 ]; do
- mysql_config)
- CFG_MYSQL_CONFIG="$VAL"
- ;;
- + psql_config)
- + CFG_PSQL_CONFIG="$VAL"
- + ;;
- prefix)
- QT_INSTALL_PREFIX="$VAL"
- ;;
- @@ -4369,10 +4374,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"
- --
- 2.1.4
|
