|
a/src/configure.ac |
|
b/src/configure.ac |
|
... |
|
... |
241 |
QMAKE="${QMAKE} -spec macx-g++"
|
241 |
QMAKE="${QMAKE} -spec macx-g++"
|
242 |
fi
|
242 |
fi
|
243 |
|
243 |
|
244 |
# Discriminate qt3/4. Qt3 qmake prints its version on stderr but we don't
|
244 |
# Discriminate qt3/4. Qt3 qmake prints its version on stderr but we don't
|
245 |
# depend on this. We try to detect the qt 4 version string instead.
|
245 |
# depend on this. We try to detect the qt 4 version string instead.
|
246 |
qmakevers="`qmake --version 2>&1`"
|
246 |
qmakevers="`${QMAKE} --version 2>&1`"
|
247 |
#echo "qmake version: $qmakevers"
|
247 |
#echo "qmake version: $qmakevers"
|
248 |
v4=`expr "$qmakevers" : '.*Qt[ ][ ]*version[ ][ ]*4.*'`
|
248 |
v4=`expr "$qmakevers" : '.*Qt[ ][ ]*version[ ][ ]*4.*'`
|
249 |
if test X$v4 = X0 ; then
|
249 |
if test X$v4 = X0 ; then
|
250 |
AC_MSG_NOTICE([using qt version 3 user interface])
|
250 |
AC_MSG_NOTICE([using qt version 3 user interface])
|
251 |
QTGUI=qtgui
|
251 |
QTGUI=qtgui
|