|
a/src/configure.ac |
|
b/src/configure.ac |
|
... |
|
... |
| 30 |
;;
|
30 |
;;
|
| 31 |
*) # The argument should be the path to the aspell program
|
31 |
*) # The argument should be the path to the aspell program
|
| 32 |
aspellProg=$withAspell
|
32 |
aspellProg=$withAspell
|
| 33 |
;;
|
33 |
;;
|
| 34 |
esac
|
34 |
esac
|
| 35 |
echo withAspell = $withAspell
|
|
|
| 36 |
|
35 |
|
| 37 |
if test X$withAspell != Xno ; then
|
36 |
if test X$withAspell != Xno ; then
|
| 38 |
AC_DEFINE(RCL_USE_ASPELL, 1, [Compile the aspell interface])
|
37 |
AC_DEFINE(RCL_USE_ASPELL, 1, [Compile the aspell interface])
|
| 39 |
if test X$aspellProg != X ; then
|
38 |
if test X$aspellProg != X ; then
|
| 40 |
aspellBase=`dirname $aspellProg`
|
39 |
aspellBase=`dirname $aspellProg`
|
|
... |
|
... |
| 208 |
# QMAKESPEC: on most Linux system, there is a 'default' link inside the
|
207 |
# QMAKESPEC: on most Linux system, there is a 'default' link inside the
|
| 209 |
# mkspecs directory, so that QMAKESPEC is not needed.
|
208 |
# mkspecs directory, so that QMAKESPEC is not needed.
|
| 210 |
# If QMAKESPEC is not set and needed, the qmake test at the previous test
|
209 |
# If QMAKESPEC is not set and needed, the qmake test at the previous test
|
| 211 |
# will have failed, and we tell the user to check his environment.
|
210 |
# will have failed, and we tell the user to check his environment.
|
| 212 |
#
|
211 |
#
|
| 213 |
# Note about qt4: if --enable-qt4 (enables the qt4gui directory), and the
|
|
|
| 214 |
# QTDIR variable are inconsistent, too bad.
|
|
|
| 215 |
#
|
|
|
| 216 |
|
212 |
|
| 217 |
if test X$QTDIR != X ; then
|
213 |
if test X$QTDIR != X ; then
|
| 218 |
PATH=$QTDIR/bin:$PATH
|
214 |
PATH=$QTDIR/bin:$PATH
|
| 219 |
export PATH
|
215 |
export PATH
|
| 220 |
fi
|
216 |
fi
|
|
... |
|
... |
| 242 |
fi
|
238 |
fi
|
| 243 |
|
239 |
|
| 244 |
# Discriminate qt3/4. Qt3 qmake prints its version on stderr but we don't
|
240 |
# 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.
|
241 |
# depend on this. We try to detect the qt 4 version string instead.
|
| 246 |
qmakevers="`qmake --version 2>&1`"
|
242 |
qmakevers="`qmake --version 2>&1`"
|
| 247 |
echo "qmake version: $qmakevers"
|
243 |
#echo "qmake version: $qmakevers"
|
| 248 |
v4=`expr "$qmakevers" : '.*Qt[ ][ ]*version[ ][ ]*4.*'`
|
244 |
v4=`expr "$qmakevers" : '.*Qt[ ][ ]*version[ ][ ]*4.*'`
|
| 249 |
if test X$v4 = X0 ; then
|
245 |
if test X$v4 = X0 ; then
|
| 250 |
AC_MSG_NOTICE([using qt version 3 user interface])
|
246 |
AC_MSG_NOTICE([using qt version 3 user interface])
|
| 251 |
QTGUI=qtgui
|
247 |
QTGUI=qtgui
|
| 252 |
else
|
248 |
else
|
| 253 |
AC_MSG_NOTICE([using qt version 4 user interface])
|
249 |
AC_MSG_NOTICE([using qt version 4 user interface])
|
| 254 |
QTGUI=qt4gui
|
250 |
QTGUI=qt4gui
|
|
|
251 |
AC_PATH_PROG([UIC3], [uic3], NOTFOUND)
|
|
|
252 |
if test X$UIC3 = XNOTFOUND ; then
|
|
|
253 |
AC_MSG_ERROR([Cannot find the uic3 program. Maybe you need to add
|
|
|
254 |
the qt3 compatibility libraries and tools to your qt4 installation ?])
|
|
|
255 |
fi
|
| 255 |
fi
|
256 |
fi
|
| 256 |
|
257 |
|
| 257 |
cd $QTGUI
|
258 |
cd $QTGUI
|
| 258 |
# We just want a .pro file: no problem with unsubstituted variables at
|
259 |
# We just want a .pro file: no problem with unsubstituted variables at
|
| 259 |
# this point.
|
260 |
# this point.
|
| 260 |
test -f uifrom3 && make -f uifrom3
|
261 |
test -f uifrom3 && make -f uifrom3
|
| 261 |
test -f recoll.pro && chmod +w recoll.pro
|
262 |
test -f recoll.pro && chmod +w recoll.pro
|
| 262 |
cp recoll.pro.in recoll.pro
|
263 |
cp recoll.pro.in recoll.pro
|
| 263 |
echo QMAKE ${QMAKE}
|
264 |
#echo QMAKE ${QMAKE}
|
| 264 |
${QMAKE} recoll.pro
|
265 |
${QMAKE} recoll.pro
|
| 265 |
if test $? != 0 ; then
|
266 |
if test $? != 0 ; then
|
| 266 |
AC_MSG_ERROR([Cannot use qmake to generate a Makefile. Maybe you need to
|
267 |
AC_MSG_ERROR([Cannot use qmake to generate a Makefile. Maybe you need to
|
| 267 |
check the QTDIR and QMAKESPEC environment variables?])
|
268 |
check the QTDIR and QMAKESPEC environment variables?])
|
| 268 |
fi
|
269 |
fi
|