#3 Give precedence to --qt.*dir over QTDIR

open
nobody
None
5
2008-06-28
2008-06-28
No

This patch gives precedence of command line arguments (--qt.*dir) over the QTDIR environment variable (what one would expect)

Another valid reason to do that it to put the handling of --with_qtdir and $QTDIR at the same place.

diff -u -r qgit-1.5.8.org/configure qgit-1.5.8.my/configure
--- qgit-1.5.8.org/configure 2007-12-31 06:35:19.000000000 +0100
+++ qgit-1.5.8.my/configure 2008-06-28 16:31:40.000000000 +0200
@@ -4704,14 +4704,17 @@

+if test -n "$QTDIR"; then
+ : ${QTBINDIR="$QTDIR/bin"}
+ : ${QTINCDIR="$QTDIR/include"}
+fi
+
# Check whether --with-qtdir was given.
if test "${with_qtdir+set}" = set; then
withval=$with_qtdir; QTDIR=$withval
fi

-
-
# Check whether --with-qt-binaries was given.
if test "${with_qt_binaries+set}" = set; then
withval=$with_qt_binaries; QTBINDIR=$withval
@@ -4732,10 +4735,6 @@
fi

-if test -n "$QTDIR"; then
- : ${QTBINDIR="$QTDIR/bin"}
- : ${QTINCDIR="$QTDIR/include"}
-fi

{ echo "$as_me:$LINENO: checking for Qt includes" >&5
echo $ECHO_N "checking for Qt includes... $ECHO_C" >&6; }

Discussion

  • Patch file

     
    Attachments
    • summary: Give precedence to QT...DIR over QTDIR --> Give precedence to --qt.*dir over QTDIR