onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-09-13 00:19:55 +02:00
Code Issues Releases Wiki Activity

checking for qmake-qt4

Browse Source
This commit is contained in:
Vadim Kurland
2008-08-31 16:55:23 +00:00
parent b802d25c37
commit 799b1268a3
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build_num
+1 -1
View File
@@ -1 +1 @@
#define BUILD_NUM 505 #define BUILD_NUM 507
configure.in
+9 -3
View File
@@ -52,12 +52,18 @@ EXTENDED_PATH="/usr/local/bin:$PATH"
AC_ARG_WITH(qmake, [ --with-qmake=qmake Specify the qmake to be used (debian qmake-qt4) ]) AC_ARG_WITH(qmake, [ --with-qmake=qmake Specify the qmake to be used (debian qmake-qt4) ])
if test -n "$with_qmake"; then if test -n "$with_qmake"; then
AC_PATH_PROG(QMAKE, $with_qmake, ,[$EXTENDED_PATH]) AC_PATH_PROG(QMAKE, $with_qmake, ,[$EXTENDED_PATH])
else
AC_PATH_PROG(QMAKE, qmake, ,[$EXTENDED_PATH])
fi
if test -z "$QMAKE"; then if test -z "$QMAKE"; then
AC_MSG_ERROR("Could not find qmake") AC_MSG_ERROR("Could not find qmake")
fi fi
else
AC_PATH_PROG(QMAKE, qmake, ,[$EXTENDED_PATH])
if test -z "$QMAKE"; then
AC_PATH_PROG(QMAKE, qmake-qt4, ,[$EXTENDED_PATH])
if test -z "$QMAKE"; then
AC_MSG_ERROR("Could not find qmake")
fi
fi
fi
AC_MSG_CHECKING(checking version of QT this qmake is part of) AC_MSG_CHECKING(checking version of QT this qmake is part of)
qmake_version=`$QMAKE -v 2>&1 | awk '/Using Qt version/ { print $4;}'` qmake_version=`$QMAKE -v 2>&1 | awk '/Using Qt version/ { print $4;}'`