[vidalia-svn] r1668: If there is a qmake and a qmake-qt4 in the same path, we pro (trunk)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-03-10 21:32:39 -0500 (Sat, 10 Mar 2007)
New Revision: 1668

Modified:
   trunk/configure.in
Log:
If there is a qmake and a qmake-qt4 in the same path, we probably want
qmake-qt4.


Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2007-03-11 01:14:46 UTC (rev 1667)
+++ trunk/configure.in	2007-03-11 02:32:39 UTC (rev 1668)
@@ -25,11 +25,11 @@
 AC_MSG_CHECKING([for Qt >= 4.1.0])
 for path in $QTPATHS; do
   # "qmake" is sometimes spelled "qmake-qt4"
-  if test -x $path/bin/qmake; then
-    QMAKE=$path/bin/qmake
+  if test -x $path/bin/qmake-qt4; then
+    QMAKE=$path/bin/qmake-qt4
   else
-    if test -x $path/bin/qmake-qt4; then
-      QMAKE=$path/bin/qmake-qt4
+    if test -x $path/bin/qmake; then
+      QMAKE=$path/bin/qmake
     fi
   fi
   if test x$QMAKE != x; then