|
a/src/configure.ac |
|
b/src/configure.ac |
|
... |
|
... |
| 353 |
# depend on this. We try to detect the qt 4 version string instead.
|
353 |
# depend on this. We try to detect the qt 4 version string instead.
|
| 354 |
qmakevers="`${QMAKE} --version 2>&1`"
|
354 |
qmakevers="`${QMAKE} --version 2>&1`"
|
| 355 |
#echo "qmake version: $qmakevers"
|
355 |
#echo "qmake version: $qmakevers"
|
| 356 |
v4=`expr "$qmakevers" : '.*Qt[ ][ ]*version[ ][ ]*4.*'`
|
356 |
v4=`expr "$qmakevers" : '.*Qt[ ][ ]*version[ ][ ]*4.*'`
|
| 357 |
if test X$v4 = X0 ; then
|
357 |
if test X$v4 = X0 ; then
|
| 358 |
AC_MSG_NOTICE([using qt version 3 user interface])
|
358 |
AC_MSG_ERROR([qmake seems to indincate using Qt version 3 which is not supported any more])
|
| 359 |
QTGUI=qtgui
|
359 |
QTGUI=qtgui
|
| 360 |
else
|
360 |
else
|
| 361 |
AC_MSG_NOTICE([using qt version 4 user interface])
|
361 |
AC_MSG_NOTICE([using qt version 4 user interface])
|
| 362 |
QTGUI=qt4gui
|
362 |
QTGUI=qtgui
|
| 363 |
AC_PATH_PROG([UIC3], [uic3], NOTFOUND)
|
|
|
| 364 |
if test X$UIC3 = XNOTFOUND ; then
|
|
|
| 365 |
AC_MSG_ERROR([Cannot find the uic3 program. Maybe you need to add
|
|
|
| 366 |
the qt3 compatibility libraries and tools to your qt4 installation ?])
|
|
|
| 367 |
fi
|
|
|
| 368 |
fi
|
363 |
fi
|
| 369 |
|
364 |
|
| 370 |
cd $QTGUI
|
365 |
cd $QTGUI
|
| 371 |
# We just want a .pro file: no problem with unsubstituted variables at
|
366 |
# We just want a .pro file: no problem with unsubstituted variables at
|
| 372 |
# this point.
|
367 |
# this point.
|
| 373 |
test -f uifrom3 && make -f uifrom3
|
|
|
| 374 |
test -f recoll.pro && chmod +w recoll.pro
|
368 |
test -f recoll.pro && chmod +w recoll.pro
|
| 375 |
cp recoll.pro.in recoll.pro
|
369 |
cp recoll.pro.in recoll.pro
|
| 376 |
#echo QMAKE ${QMAKE}
|
370 |
#echo QMAKE ${QMAKE}
|
| 377 |
${QMAKE} recoll.pro
|
371 |
${QMAKE} recoll.pro
|
| 378 |
if test $? != 0 ; then
|
372 |
if test $? != 0 ; then
|