|
a/src/configure.ac |
|
b/src/configure.ac |
|
... |
|
... |
318 |
#echo XAPIAN_CONFIG: $XAPIAN_CONFIG
|
318 |
#echo XAPIAN_CONFIG: $XAPIAN_CONFIG
|
319 |
#echo LIBXAPIAN: $LIBXAPIAN
|
319 |
#echo LIBXAPIAN: $LIBXAPIAN
|
320 |
#echo LIBXAPIANDIR: $LIBXAPIANDIR
|
320 |
#echo LIBXAPIANDIR: $LIBXAPIANDIR
|
321 |
#echo LIBXAPIANSTATICEXTRA: $LIBXAPIANSTATICEXTRA
|
321 |
#echo LIBXAPIANSTATICEXTRA: $LIBXAPIANSTATICEXTRA
|
322 |
#echo XAPIANCXXFLAGS: $XAPIANCXXFLAGS
|
322 |
#echo XAPIANCXXFLAGS: $XAPIANCXXFLAGS
|
|
|
323 |
|
|
|
324 |
|
|
|
325 |
XSLT_CONFIG=${XSLT_CONFIG:-no}
|
|
|
326 |
if test "$XSLT_CONFIG" = "no"; then
|
|
|
327 |
AC_PATH_PROG(XSLT_CONFIG0, [xslt-config], no)
|
|
|
328 |
XSLT_CONFIG=$XSLT_CONFIG0
|
|
|
329 |
fi
|
|
|
330 |
if test "$XSLT_CONFIG" = "no" ; then
|
|
|
331 |
AC_MSG_ERROR([Cannot find xslt-config command in $PATH. Is
|
|
|
332 |
libxslt installed ?])
|
|
|
333 |
exit 1
|
|
|
334 |
fi
|
|
|
335 |
|
|
|
336 |
XSLT_CFLAGS=`xslt-config --cflags`
|
|
|
337 |
XSLT_LINKADD=`xslt-config --libs`
|
323 |
|
338 |
|
324 |
AC_ARG_ENABLE(xadump,
|
339 |
AC_ARG_ENABLE(xadump,
|
325 |
AC_HELP_STRING([--enable-xadump],
|
340 |
AC_HELP_STRING([--enable-xadump],
|
326 |
[Enable building the xadump low level Xapian access program.]),
|
341 |
[Enable building the xadump low level Xapian access program.]),
|
327 |
enableXADUMP=$enableval, enableXADUMP="no")
|
342 |
enableXADUMP=$enableval, enableXADUMP="no")
|
|
... |
|
... |
525 |
AC_SUBST(QMAKE_ENABLE_ZEITGEIST)
|
540 |
AC_SUBST(QMAKE_ENABLE_ZEITGEIST)
|
526 |
AC_SUBST(QMAKE_DISABLE_ZEITGEIST)
|
541 |
AC_SUBST(QMAKE_DISABLE_ZEITGEIST)
|
527 |
AC_SUBST(LIBQZEITGEIST)
|
542 |
AC_SUBST(LIBQZEITGEIST)
|
528 |
AC_SUBST(RCLVERSION)
|
543 |
AC_SUBST(RCLVERSION)
|
529 |
AC_SUBST(RCLLIBVERSION)
|
544 |
AC_SUBST(RCLLIBVERSION)
|
|
|
545 |
AC_SUBST(XSLT_CFLAGS)
|
|
|
546 |
AC_SUBST(XSLT_LINKADD)
|
530 |
|
547 |
|
531 |
# All object files depend on localdefs which has the cc flags. Avoid
|
548 |
# All object files depend on localdefs which has the cc flags. Avoid
|
532 |
# changing it unless necessary
|
549 |
# changing it unless necessary
|
533 |
AC_CONFIG_FILES(Makefile)
|
550 |
AC_CONFIG_FILES(Makefile)
|
534 |
AC_CONFIG_FILES(common/rclversion.h)
|
551 |
AC_CONFIG_FILES(common/rclversion.h)
|