|
a/src/configure |
|
b/src/configure |
|
... |
|
... |
| 777 |
if test -n "$ac_init_help"; then
|
777 |
if test -n "$ac_init_help"; then
|
| 778 |
case $ac_init_help in
|
778 |
case $ac_init_help in
|
| 779 |
short | recursive ) echo "Configuration of Recoll 1.0:";;
|
779 |
short | recursive ) echo "Configuration of Recoll 1.0:";;
|
| 780 |
esac
|
780 |
esac
|
| 781 |
cat <<\_ACEOF
|
781 |
cat <<\_ACEOF
|
|
|
782 |
|
|
|
783 |
Optional Features:
|
|
|
784 |
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
|
|
|
785 |
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
|
|
|
786 |
--enable-qt4 Use qt version 4
|
| 782 |
|
787 |
|
| 783 |
Some influential environment variables:
|
788 |
Some influential environment variables:
|
| 784 |
CC C compiler command
|
789 |
CC C compiler command
|
| 785 |
CFLAGS C compiler flags
|
790 |
CFLAGS C compiler flags
|
| 786 |
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
|
791 |
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
|
|
... |
|
... |
| 2216 |
#
|
2221 |
#
|
| 2217 |
# QMAKESPEC: on most Linux system, there is a 'default' link inside the
|
2222 |
# QMAKESPEC: on most Linux system, there is a 'default' link inside the
|
| 2218 |
# mkspecs directory, so that QMAKESPEC is not needed.
|
2223 |
# mkspecs directory, so that QMAKESPEC is not needed.
|
| 2219 |
# If QMAKESPEC is not set and needed, the qmake test at the previous test
|
2224 |
# If QMAKESPEC is not set and needed, the qmake test at the previous test
|
| 2220 |
# will have failed, and we tell the user to check his environment.
|
2225 |
# will have failed, and we tell the user to check his environment.
|
|
|
2226 |
#
|
|
|
2227 |
# Note about qt4: if --enable-qt4 (enables the qt4gui directory), and the
|
|
|
2228 |
# QTDIR variable are inconsistent, too bad.
|
|
|
2229 |
#
|
|
|
2230 |
# Check whether --enable-qt4 or --disable-qt4 was given.
|
|
|
2231 |
if test "${enable_qt4+set}" = set; then
|
|
|
2232 |
enableval="$enable_qt4"
|
|
|
2233 |
rcl_cv_qt4=$enableval
|
|
|
2234 |
else
|
|
|
2235 |
rcl_cv_qt4=no
|
|
|
2236 |
fi;
|
|
|
2237 |
{ echo "$as_me:$LINENO: rcl_cv_qt4 $rcl_cv_qt4" >&5
|
|
|
2238 |
echo "$as_me: rcl_cv_qt4 $rcl_cv_qt4" >&6;}
|
|
|
2239 |
if test X$rcl_cv_qt4 = Xyes ; then
|
|
|
2240 |
QTGUI=qt4gui
|
|
|
2241 |
else
|
|
|
2242 |
QTGUI=qtgui
|
|
|
2243 |
fi
|
| 2221 |
|
2244 |
|
| 2222 |
if test X$QTDIR != X ; then
|
2245 |
if test X$QTDIR != X ; then
|
| 2223 |
PATH=$QTDIR/bin:$PATH
|
2246 |
PATH=$QTDIR/bin:$PATH
|
| 2224 |
export PATH
|
2247 |
export PATH
|
| 2225 |
fi
|
2248 |
fi
|
|
... |
|
... |
| 2270 |
echo "$as_me: error: Cannot find the qmake program. Maybe you need to install
|
2293 |
echo "$as_me: error: Cannot find the qmake program. Maybe you need to install
|
| 2271 |
it and/or set the QTDIR environment variable?" >&2;}
|
2294 |
it and/or set the QTDIR environment variable?" >&2;}
|
| 2272 |
{ (exit 1); exit 1; }; }
|
2295 |
{ (exit 1); exit 1; }; }
|
| 2273 |
fi
|
2296 |
fi
|
| 2274 |
|
2297 |
|
| 2275 |
cd qtgui
|
2298 |
cd $QTGUI
|
| 2276 |
# We just want a .pro file: no problem with unsubstituted variables
|
2299 |
# We just want a .pro file: no problem with unsubstituted variables
|
| 2277 |
cp recoll.pro.in recoll.pro
|
2300 |
cp recoll.pro.in recoll.pro
|
| 2278 |
${QMAKE} recoll.pro
|
2301 |
${QMAKE} recoll.pro
|
| 2279 |
if test $? != 0 ; then
|
2302 |
if test $? != 0 ; then
|
| 2280 |
{ { echo "$as_me:$LINENO: error: Cannot use qmake to generate a Makefile. Maybe you need to
|
2303 |
{ { echo "$as_me:$LINENO: error: Cannot use qmake to generate a Makefile. Maybe you need to
|
|
... |
|
... |
| 2312 |
|
2335 |
|
| 2313 |
|
2336 |
|
| 2314 |
|
2337 |
|
| 2315 |
|
2338 |
|
| 2316 |
|
2339 |
|
|
|
2340 |
|
| 2317 |
ac_config_files="$ac_config_files mk/localdefs"
|
2341 |
ac_config_files="$ac_config_files mk/localdefs"
|
| 2318 |
|
2342 |
|
| 2319 |
ac_config_files="$ac_config_files recollinstall"
|
2343 |
ac_config_files="$ac_config_files recollinstall"
|
| 2320 |
|
2344 |
|
| 2321 |
ac_config_files="$ac_config_files Makefile"
|
2345 |
ac_config_files="$ac_config_files Makefile"
|
| 2322 |
|
2346 |
|
| 2323 |
ac_config_files="$ac_config_files sampleconf/recoll.conf"
|
2347 |
ac_config_files="$ac_config_files sampleconf/recoll.conf"
|
| 2324 |
|
2348 |
|
| 2325 |
ac_config_files="$ac_config_files qtgui/recoll.pro"
|
2349 |
ac_config_files="$ac_config_files $QTGUI/recoll.pro"
|
| 2326 |
|
2350 |
|
| 2327 |
|
2351 |
|
| 2328 |
for d in bincimapmime index lib query
|
2352 |
for d in bincimapmime index lib query
|
| 2329 |
do
|
2353 |
do
|
| 2330 |
rm -f $d/alldeps.stamp
|
2354 |
rm -f $d/alldeps.stamp
|
|
... |
|
... |
| 2831 |
# Handling of arguments.
|
2855 |
# Handling of arguments.
|
| 2832 |
"mk/localdefs" ) CONFIG_FILES="$CONFIG_FILES mk/localdefs" ;;
|
2856 |
"mk/localdefs" ) CONFIG_FILES="$CONFIG_FILES mk/localdefs" ;;
|
| 2833 |
"recollinstall" ) CONFIG_FILES="$CONFIG_FILES recollinstall" ;;
|
2857 |
"recollinstall" ) CONFIG_FILES="$CONFIG_FILES recollinstall" ;;
|
| 2834 |
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
2858 |
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
| 2835 |
"sampleconf/recoll.conf" ) CONFIG_FILES="$CONFIG_FILES sampleconf/recoll.conf" ;;
|
2859 |
"sampleconf/recoll.conf" ) CONFIG_FILES="$CONFIG_FILES sampleconf/recoll.conf" ;;
|
| 2836 |
"qtgui/recoll.pro" ) CONFIG_FILES="$CONFIG_FILES qtgui/recoll.pro" ;;
|
2860 |
"$QTGUI/recoll.pro" ) CONFIG_FILES="$CONFIG_FILES $QTGUI/recoll.pro" ;;
|
| 2837 |
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
|
2861 |
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
|
| 2838 |
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
|
2862 |
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
|
| 2839 |
{ (exit 1); exit 1; }; };;
|
2863 |
{ (exit 1); exit 1; }; };;
|
| 2840 |
esac
|
2864 |
esac
|
| 2841 |
done
|
2865 |
done
|
|
... |
|
... |
| 2926 |
s,@LIBXAPIAN@,$LIBXAPIAN,;t t
|
2950 |
s,@LIBXAPIAN@,$LIBXAPIAN,;t t
|
| 2927 |
s,@XAPIANCXXFLAGS@,$XAPIANCXXFLAGS,;t t
|
2951 |
s,@XAPIANCXXFLAGS@,$XAPIANCXXFLAGS,;t t
|
| 2928 |
s,@LIBICONV@,$LIBICONV,;t t
|
2952 |
s,@LIBICONV@,$LIBICONV,;t t
|
| 2929 |
s,@INCICONV@,$INCICONV,;t t
|
2953 |
s,@INCICONV@,$INCICONV,;t t
|
| 2930 |
s,@QTRECOLL_DATADIR@,$QTRECOLL_DATADIR,;t t
|
2954 |
s,@QTRECOLL_DATADIR@,$QTRECOLL_DATADIR,;t t
|
|
|
2955 |
s,@QTGUI@,$QTGUI,;t t
|
| 2931 |
CEOF
|
2956 |
CEOF
|
| 2932 |
|
2957 |
|
| 2933 |
_ACEOF
|
2958 |
_ACEOF
|
| 2934 |
|
2959 |
|
| 2935 |
cat >>$CONFIG_STATUS <<\_ACEOF
|
2960 |
cat >>$CONFIG_STATUS <<\_ACEOF
|