tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

removed --enable-qt4, rely on qmake output instead

Browse Source
This commit is contained in:
dockes 2007-05-21 07:24:14 +00:00
parent 93cc651b58
commit 134edf9c45
6 changed files with 70 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/VERSION
View File

@ -1 +1 @@
1.8.2
1.9.0

48
src/configure vendored
View File

@ -806,11 +806,6 @@ if test -n "$ac_init_help"; then
esac
cat <<\_ACEOF
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-qt4 Use qt version 4
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
@ -1410,7 +1405,7 @@ fi;
case $withFam in
no);;
yes)
for dir in /usr/local/lib /usr/lib;do
for dir in /usr/local/lib ${libdir};do
if test -f $dir/libfam.so ; then famLib=$dir/libfam.so;break;fi
done
;;
@ -1471,8 +1466,8 @@ else
fi;
if test X$withInotify != Xno ; then
{ echo "$as_me:$LINENO: Enabled support for inotify monitoring" >&5
echo "$as_me: Enabled support for inotify monitoring" >&6;}
{ echo "$as_me:$LINENO: enabled support for inotify monitoring" >&5
echo "$as_me: enabled support for inotify monitoring" >&6;}
cat >>confdefs.h <<\_ACEOF
#define RCL_MONITOR 1
@ -2501,7 +2496,7 @@ if test $ac_cv_lib_iconv_iconv_open = yes; then
fi
if test A"$LIBICONV" = A ; then
dir=/usr/lib
dir=${libdir}
LDFLAGS="$S_LDFLAGS -L$dir"
unset ac_cv_lib_iconv_iconv_open
echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5
@ -2573,7 +2568,7 @@ if test $ac_cv_lib_iconv_iconv_open = yes; then
fi
if test A"$LIBICONV" = A; then
dir=/usr/lib
dir=${libdir}
LDFLAGS="$S_LDFLAGS -L$dir"
unset ac_cv_lib_iconv_iconv_open
echo "$as_me:$LINENO: checking for iconv_open in -lc" >&5
@ -2748,20 +2743,6 @@ XAPIANCXXFLAGS=`$XAPIAN_CONFIG --cxxflags`
# Note about qt4: if --enable-qt4 (enables the qt4gui directory), and the
# QTDIR variable are inconsistent, too bad.
#
# Check whether --enable-qt4 or --disable-qt4 was given.
if test "${enable_qt4+set}" = set; then
enableval="$enable_qt4"
rcl_cv_qt4=$enableval
else
rcl_cv_qt4=no
fi;
{ echo "$as_me:$LINENO: rcl_cv_qt4 $rcl_cv_qt4" >&5
echo "$as_me: rcl_cv_qt4 $rcl_cv_qt4" >&6;}
if test X$rcl_cv_qt4 = Xyes ; then
QTGUI=qt4gui
else
QTGUI=qtgui
fi
if test X$QTDIR != X ; then
PATH=$QTDIR/bin:$PATH
@ -2810,12 +2791,27 @@ fi
if test X$QMAKE = XNOTFOUND ; then
{ { echo "$as_me:$LINENO: error: Cannot find the qmake program. Maybe you need to install
it and/or set the QTDIR environment variable?" >&5
qt development files and tools and/or set the QTDIR environment variable?" >&5
echo "$as_me: error: Cannot find the qmake program. Maybe you need to install
it and/or set the QTDIR environment variable?" >&2;}
qt development files and tools and/or set the QTDIR environment variable?" >&2;}
{ (exit 1); exit 1; }; }
fi
# Discriminate qt3/4. Qt3 qmake prints its version on stderr but we don't
# depend on this. We try to detect the qt 4 version string instead.
qmakevers="`qmake --version 2>&1`"
echo "qmake version: $qmakevers"
v4=`expr "$qmakevers" : '.*Qt *version *4.*'`
if test X$v4 = X0 ; then
{ echo "$as_me:$LINENO: using qt version 3 user interface" >&5
echo "$as_me: using qt version 3 user interface" >&6;}
QTGUI=qtgui
else
{ echo "$as_me:$LINENO: using qt version 4 user interface" >&5
echo "$as_me: using qt version 4 user interface" >&6;}
QTGUI=qt4gui
fi
cd $QTGUI
# We just want a .pro file: no problem with unsubstituted variables at
# this point.

25
src/configure.ac
View File

@ -190,16 +190,6 @@ XAPIANCXXFLAGS=`$XAPIAN_CONFIG --cxxflags`
# Note about qt4: if --enable-qt4 (enables the qt4gui directory), and the
# QTDIR variable are inconsistent, too bad.
#
AC_ARG_ENABLE(qt4,
AC_HELP_STRING([--enable-qt4],
[Use qt version 4]),
rcl_cv_qt4=$enableval, rcl_cv_qt4=no)
AC_MSG_NOTICE(rcl_cv_qt4 $rcl_cv_qt4)
if test X$rcl_cv_qt4 = Xyes ; then
QTGUI=qt4gui
else
QTGUI=qtgui
fi
if test X$QTDIR != X ; then
PATH=$QTDIR/bin:$PATH
@ -209,7 +199,20 @@ fi
AC_PATH_PROG([QMAKE], [qmake], NOTFOUND)
if test X$QMAKE = XNOTFOUND ; then
AC_MSG_ERROR([Cannot find the qmake program. Maybe you need to install
it and/or set the QTDIR environment variable?])
qt development files and tools and/or set the QTDIR environment variable?])
fi
# Discriminate qt3/4. Qt3 qmake prints its version on stderr but we don't
# depend on this. We try to detect the qt 4 version string instead.
qmakevers="`qmake --version 2>&1`"
echo "qmake version: $qmakevers"
v4=`expr "$qmakevers" : '.*Qt[ ][ ]*version[ ][ ]*4.*'`
if test X$v4 = X0 ; then
AC_MSG_NOTICE([using qt version 3 user interface])
QTGUI=qtgui
else
AC_MSG_NOTICE([using qt version 4 user interface])
QTGUI=qt4gui
fi
cd $QTGUI

26
src/doc/user/usermanual.sgml
View File

@ -24,7 +24,7 @@
Dockes</holder>
</copyright>
<releaseinfo>$Id: usermanual.sgml,v 1.41 2007-05-18 07:41:40 dockes Exp $</releaseinfo>
<releaseinfo>$Id: usermanual.sgml,v 1.42 2007-05-21 07:24:14 dockes Exp $</releaseinfo>
<abstract>
<para>This document introduces full text search notions
@ -1656,8 +1656,9 @@ fvwm
upwards. Not all parameters can be meaningfully redefined,
this is specified for each in the next section. </para>
<para>The tilde character (~) is expanded in file names to the
name of the user's home directory.</para>
<para>When found at the beginning of a file path, the tilde
character (~) is expanded to the name of the user's home
directory, as a shell would do.</para>
<para>White space is used for separation inside lists.
List elements with embedded spaces can be quoted using
@ -1850,6 +1851,25 @@ skippedPaths = ~/somedir/*.txt
</listitem>
</varlistentry>
<varlistentry><term><literal>aspellLanguage</literal></term>
<listitem><para>Language definitions to use when creating
the aspell dictionary. The value must match a set of
aspell language definition files. You can type "aspell
config" to see where these are installed (look for
data-dir). The default if the variable is not set is to
use your desktop national language environment to guess
the value.</para>
</listitem>
</varlistentry>
<varlistentry><term><literal>noaspell</literal></term>
<listitem><para>If this is set, the aspell dictionary
generation is turned off. Useful for cases where you don't
need the functionality or when it is unusable because
aspell crashes during dictionary generation.</para>
</listitem>
</varlistentry>
</variablelist>
</sect2>

1
src/qt4gui/uifrom3
View File

@ -9,4 +9,5 @@ for i in ../qtgui/*.ui ; do
done
# Link the images
rm -f images
ln -s ../qtgui/images .

12
src/sampleconf/recoll.conf.in
View File

@ -1,4 +1,4 @@
# @(#$Id: recoll.conf.in,v 1.15 2007-05-18 07:41:22 dockes Exp $ (C) 2004 J.F.Dockes
# @(#$Id: recoll.conf.in,v 1.16 2007-05-21 07:24:14 dockes Exp $ (C) 2004 J.F.Dockes
#
# Recoll default configuration file. This should be copied to
# ~/.recoll/recoll.conf
@ -65,10 +65,16 @@ indexallfilenames = 1
# Language definitions to use when creating the aspell dictionary.
# The value must match a set of aspell language definition files.
# You can type "aspell config" to see where these are installed.
# The default is english: "en"
# You can use a value of "disable" to disable aspell support.
# The default if this is not set is to use the NLS environment to guess the
# value
# aspellLanguage = en
# Disabling aspell use. The aspell dictionary generation takes some time,
# and some combinations of aspell version, language, and local terms,
# result in aspell dumping core each time. You can disable the aspell
# dictionary generation by setting the following variable:
# noaspell = 1
# You could specify different parameters for a subdirectory like this:
#[~/hungariandocs/plain]
#defaultcharset = iso-8859-2