|
a/src/configure.ac |
|
b/src/configure.ac |
|
... |
|
... |
| 264 |
AC_MSG_ERROR([Cannot find xapian-config command in $PATH. Is
|
264 |
AC_MSG_ERROR([Cannot find xapian-config command in $PATH. Is
|
| 265 |
xapian-core installed ?])
|
265 |
xapian-core installed ?])
|
| 266 |
exit 1
|
266 |
exit 1
|
| 267 |
fi
|
267 |
fi
|
| 268 |
LIBXAPIAN=`$XAPIAN_CONFIG --libs`
|
268 |
LIBXAPIAN=`$XAPIAN_CONFIG --libs`
|
|
|
269 |
# The --static thing fails with older Xapians. Happily enough they don't
|
|
|
270 |
# need it either (because there are no needed libraries (no uuid and we
|
|
|
271 |
# deal explicitely with libz)
|
|
|
272 |
LIBXAPIANSTATICEXTRA=`$XAPIAN_CONFIG --static --libs 2> /dev/null`
|
| 269 |
# Workaround for problem in xapian-config in some versions: wrongly lists
|
273 |
# Workaround for problem in xapian-config in some versions: wrongly lists
|
| 270 |
# libstdc++.la in the lib list
|
274 |
# libstdc++.la in the lib list
|
| 271 |
for i in $LIBXAPIAN ; do
|
275 |
for i in $LIBXAPIAN ; do
|
| 272 |
case $i in
|
276 |
case $i in
|
| 273 |
*stdc++*|-lm|-lgcc_s|-lc);;
|
277 |
*stdc++*|-lm|-lgcc_s|-lc);;
|
|
... |
|
... |
| 279 |
LIBXAPIAN="$LIBXAPIAN -lz"
|
283 |
LIBXAPIAN="$LIBXAPIAN -lz"
|
| 280 |
XAPIANCXXFLAGS=`$XAPIAN_CONFIG --cxxflags`
|
284 |
XAPIANCXXFLAGS=`$XAPIAN_CONFIG --cxxflags`
|
| 281 |
|
285 |
|
| 282 |
#echo XAPIAN_CONFIG: $XAPIAN_CONFIG
|
286 |
#echo XAPIAN_CONFIG: $XAPIAN_CONFIG
|
| 283 |
#echo LIBXAPIAN: $LIBXAPIAN
|
287 |
#echo LIBXAPIAN: $LIBXAPIAN
|
|
|
288 |
#echo LIBXAPIANSTATICEXTRA: $LIBXAPIANSTATICEXTRA
|
| 284 |
#echo XAPIANCXXFLAGS: $XAPIANCXXFLAGS
|
289 |
#echo XAPIANCXXFLAGS: $XAPIANCXXFLAGS
|
| 285 |
|
290 |
|
| 286 |
#### QT
|
291 |
#### QT
|
| 287 |
# The way qt and its tools (qmake especially) are installed is very
|
292 |
# The way qt and its tools (qmake especially) are installed is very
|
| 288 |
# different between systems (and maybe qt versions)
|
293 |
# different between systems (and maybe qt versions)
|
|
... |
|
... |
| 322 |
fi
|
327 |
fi
|
| 323 |
|
328 |
|
| 324 |
if test X$QMAKE = X ; then
|
329 |
if test X$QMAKE = X ; then
|
| 325 |
QMAKE=qmake
|
330 |
QMAKE=qmake
|
| 326 |
fi
|
331 |
fi
|
| 327 |
|
332 |
case $QMAKE in
|
|
|
333 |
*/*) QMAKEPATH=$QMAKE;;
|
| 328 |
AC_PATH_PROG([QMAKEPATH], $QMAKE, NOTFOUND)
|
334 |
*) AC_PATH_PROG([QMAKEPATH], $QMAKE, NOTFOUND);;
|
|
|
335 |
esac
|
|
|
336 |
|
| 329 |
if test X$QMAKEPATH = XNOTFOUND ; then
|
337 |
if test X$QMAKEPATH = XNOTFOUND ; then
|
| 330 |
AC_MSG_ERROR([Cannot find the qmake program. Maybe you need to install
|
338 |
AC_MSG_ERROR([Cannot find the qmake program. Maybe you need to install
|
| 331 |
qt development files and tools and/or set the QTDIR environment variable?])
|
339 |
qt development files and tools and/or set the QTDIR environment variable?])
|
| 332 |
fi
|
340 |
fi
|
| 333 |
QMAKE=$QMAKEPATH
|
341 |
QMAKE=$QMAKEPATH
|
|
... |
|
... |
| 422 |
AC_SUBST(X_LIBX11)
|
430 |
AC_SUBST(X_LIBX11)
|
| 423 |
AC_SUBST(X_EXTRA_LIBS)
|
431 |
AC_SUBST(X_EXTRA_LIBS)
|
| 424 |
AC_SUBST(INCICONV)
|
432 |
AC_SUBST(INCICONV)
|
| 425 |
AC_SUBST(LIBICONV)
|
433 |
AC_SUBST(LIBICONV)
|
| 426 |
AC_SUBST(LIBXAPIAN)
|
434 |
AC_SUBST(LIBXAPIAN)
|
|
|
435 |
AC_SUBST(LIBXAPIANSTATICEXTRA)
|
| 427 |
AC_SUBST(LIBFAM)
|
436 |
AC_SUBST(LIBFAM)
|
| 428 |
AC_SUBST(QMAKE)
|
437 |
AC_SUBST(QMAKE)
|
| 429 |
AC_SUBST(QTGUI)
|
438 |
AC_SUBST(QTGUI)
|
| 430 |
AC_SUBST(QTRECOLL_DATADIR)
|
439 |
AC_SUBST(QTRECOLL_DATADIR)
|
| 431 |
AC_SUBST(XAPIANCXXFLAGS)
|
440 |
AC_SUBST(XAPIANCXXFLAGS)
|