GUI: enable using QWebView WebKit browser instead of Qt native QTextBrowser to display the result list. On by default, can be disabled with configure --disable-webkit

This commit is contained in:
Jean-Francois Dockes
2012-02-23 14:16:47 +01:00
parent 7fefaf540f
commit ea0f4725cb
16 changed files with 387 additions and 108 deletions
+35 -10
View File
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for Recoll 1.16.2.
# Generated by GNU Autoconf 2.68 for Recoll 1.17.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -557,8 +557,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Recoll'
PACKAGE_TARNAME='recoll'
PACKAGE_VERSION='1.16.2'
PACKAGE_STRING='Recoll 1.16.2'
PACKAGE_VERSION='1.17.0'
PACKAGE_STRING='Recoll 1.17.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -603,6 +603,8 @@ ac_subst_vars='LTLIBOBJS
LIBOBJS
RCLVERSION
NOPIC
QMAKE_DISABLE_WEBKIT
QMAKE_ENABLE_WEBKIT
NOCMDLINE
NOQTMAKE
HAVE_MKDTEMP
@@ -689,6 +691,7 @@ enable_xattr
enable_camelcase
enable_pic
enable_qtgui
enable_webkit
enable_x11mon
with_x
'
@@ -1248,7 +1251,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures Recoll 1.16.2 to adapt to many kinds of systems.
\`configure' configures Recoll 1.17.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1313,7 +1316,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of Recoll 1.16.2:";;
short | recursive ) echo "Configuration of Recoll 1.17.0:";;
esac
cat <<\_ACEOF
@@ -1338,6 +1341,7 @@ Optional Features:
code. This is necessary for building the php
extension.
--disable-qtgui Disable the QT-based graphical user interface.
--disable-webkit Disable use of qt-webkit.
--disable-x11mon Disable recollindex support for X11 session
monitoring.
@@ -1436,7 +1440,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
Recoll configure 1.16.2
Recoll configure 1.17.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1989,7 +1993,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by Recoll $as_me 1.16.2, which was
It was created by Recoll $as_me 1.17.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -4709,8 +4713,27 @@ $as_echo "$as_me: using qt version 4 user interface" >&6;}
fi
cd ..
##### Using Qt webkit for reslist display? Else Qt textbrowser
# Check whether --enable-webkit was given.
if test "${enable_webkit+set}" = set; then :
enableval=$enable_webkit; enableWebkit=$enableval
else
enableWebkit="yes"
fi
if test "$enableWebkit" = "yes" ; then
QMAKE_ENABLE_WEBKIT=""
QMAKE_DISABLE_WEBKIT="#"
else
QMAKE_ENABLE_WEBKIT="#"
QMAKE_DISABLE_WEBKIT=""
fi
ac_config_files="$ac_config_files $QTGUI/recoll.pro"
##################### End QT detection
fi
@@ -5566,7 +5589,9 @@ test "X$m_prefix" = "XNONE" && m_prefix=/usr/local
m_datadir=${m_prefix}/share
QTRECOLL_DATADIR=${m_datadir}/recoll
RCLVERSION='1.16.2'
RCLVERSION='1.17.0'
@@ -6127,7 +6152,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by Recoll $as_me 1.16.2, which was
This file was extended by Recoll $as_me 1.17.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6189,7 +6214,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
Recoll config.status 1.16.2
Recoll config.status 1.17.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"