|
a/src/configure.ac |
|
b/src/configure.ac |
|
... |
|
... |
| 440 |
# Discriminate qt3/4. Qt3 qmake prints its version on stderr but we don't
|
440 |
# Discriminate qt3/4. Qt3 qmake prints its version on stderr but we don't
|
| 441 |
# depend on this. We try to detect the qt 4 version string instead.
|
441 |
# depend on this. We try to detect the qt 4 version string instead.
|
| 442 |
qmakevers="`${QMAKE} --version 2>&1`"
|
442 |
qmakevers="`${QMAKE} --version 2>&1`"
|
| 443 |
#echo "qmake version: $qmakevers"
|
443 |
#echo "qmake version: $qmakevers"
|
| 444 |
v4=`expr "$qmakevers" : '.*Qt[ ][ ]*version[ ][ ]*4.*'`
|
444 |
v4=`expr "$qmakevers" : '.*Qt[ ][ ]*version[ ][ ]*4.*'`
|
|
|
445 |
v5=`expr "$qmakevers" : '.*Qt[ ][ ]*version[ ][ ]*5.*'`
|
| 445 |
if test X$v4 = X0 ; then
|
446 |
if test X$v4 = X0 -a X$v5 = X0; then
|
| 446 |
AC_MSG_ERROR([qmake seems to be using Qt version 3 which is not supported any more])
|
447 |
AC_MSG_ERROR([qmake seems to be using Qt version 3 which is not supported any more])
|
| 447 |
QTGUI=qtgui
|
448 |
QTGUI=qtgui
|
| 448 |
else
|
449 |
else
|
|
|
450 |
if test X$v4 != X0 ; then
|
| 449 |
AC_MSG_NOTICE([using qt version 4 user interface])
|
451 |
AC_MSG_NOTICE([using qt version 4 user interface])
|
|
|
452 |
else
|
|
|
453 |
AC_MSG_NOTICE([using qt version 5 user interface])
|
|
|
454 |
fi
|
| 450 |
QTGUI=qtgui
|
455 |
QTGUI=qtgui
|
| 451 |
fi
|
456 |
fi
|
| 452 |
|
457 |
|
| 453 |
cd $QTGUI
|
458 |
cd $QTGUI
|
| 454 |
# We just want a .pro file: no problem with unsubstituted variables at
|
459 |
# We just want a .pro file: no problem with unsubstituted variables at
|