1 --- configure.old 2015-10-02 14:46:38.000000000 +0200
2 +++ configure 2015-10-19 21:12:04.440451289 +0200
3 @@ -1591,20 +1591,18 @@
4 cnf_append "PATH_SDK_QT4_LIB" '$'"(firstword `strip_L "$LIBQT4"`)"
5 if [ "$foundqt4" = "2" ]; then
6 cnf_append "VBOX_WITH_QT4_SUN" "1"
7 - elif [ "$foundqt4" = "3" ]; then
8 - cnf_append "VBOX_PATH_QT4" "$TOOLQT4"
9 - cnf_append "PATH_SDK_QT4" "$TOOLQT4"
10 - cnf_append "PATH_TOOL_QT4_BIN" "$TOOLQT4BIN"
13 + if ! [ "$foundqt4" = "3" ]; then
14 + TOOLQT4BIN="$TOOLQT4/bin"
16 test_header "Qt4 devtools"
17 # try it with a suffix, some platforms use that
18 - if which_wrapper "$TOOLQT4/bin/moc-qt4" > /dev/null; then
19 + if which_wrapper "$TOOLQT4BIN/moc-qt4" > /dev/null; then
24 - moc_ver=`$TOOLQT4/bin/moc$QT4BINSUFF -v 2>&1|sed 's+^.*(Qt \(.*\))+\1+'`
25 + moc_ver=`$TOOLQT4BIN/moc$QT4BINSUFF -v 2>&1|sed 's+^.*(Qt \(.*\))+\1+'`
27 log_failure "moc$QT4BINSUFF not working"
30 log_success "found version $moc_ver"
31 cnf_append "VBOX_PATH_QT4" "$TOOLQT4"
32 cnf_append "PATH_SDK_QT4" "$TOOLQT4"
33 - cnf_append "PATH_TOOL_QT4_BIN" "$TOOLQT4/bin"
34 + cnf_append "PATH_TOOL_QT4_BIN" "$TOOLQT4BIN"
35 [ -n "$QT4BINSUFF" ] && cnf_append "TOOL_QT4_BIN_SUFF" "$QT4BINSUFF"