|
a/src/configure |
|
b/src/configure |
|
... |
|
... |
| 803 |
if test -n "$ac_init_help"; then
|
803 |
if test -n "$ac_init_help"; then
|
| 804 |
case $ac_init_help in
|
804 |
case $ac_init_help in
|
| 805 |
short | recursive ) echo "Configuration of Recoll 1.6:";;
|
805 |
short | recursive ) echo "Configuration of Recoll 1.6:";;
|
| 806 |
esac
|
806 |
esac
|
| 807 |
cat <<\_ACEOF
|
807 |
cat <<\_ACEOF
|
| 808 |
|
|
|
| 809 |
Optional Features:
|
|
|
| 810 |
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
|
|
|
| 811 |
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
|
|
|
| 812 |
--enable-qt4 Use qt version 4
|
|
|
| 813 |
|
808 |
|
| 814 |
Optional Packages:
|
809 |
Optional Packages:
|
| 815 |
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
810 |
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
| 816 |
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
|
811 |
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
|
| 817 |
--without-aspell Disable use of aspell spelling package to provide
|
812 |
--without-aspell Disable use of aspell spelling package to provide
|
|
... |
|
... |
| 1408 |
withFam=no
|
1403 |
withFam=no
|
| 1409 |
fi;
|
1404 |
fi;
|
| 1410 |
case $withFam in
|
1405 |
case $withFam in
|
| 1411 |
no);;
|
1406 |
no);;
|
| 1412 |
yes)
|
1407 |
yes)
|
| 1413 |
for dir in /usr/local/lib /usr/lib;do
|
1408 |
for dir in /usr/local/lib ${libdir};do
|
| 1414 |
if test -f $dir/libfam.so ; then famLib=$dir/libfam.so;break;fi
|
1409 |
if test -f $dir/libfam.so ; then famLib=$dir/libfam.so;break;fi
|
| 1415 |
done
|
1410 |
done
|
| 1416 |
;;
|
1411 |
;;
|
| 1417 |
*) # The argument should be the path to the fam library
|
1412 |
*) # The argument should be the path to the fam library
|
| 1418 |
famLib=$withFam
|
1413 |
famLib=$withFam
|
|
... |
|
... |
| 1469 |
else
|
1464 |
else
|
| 1470 |
withInotify=$inot_default
|
1465 |
withInotify=$inot_default
|
| 1471 |
fi;
|
1466 |
fi;
|
| 1472 |
|
1467 |
|
| 1473 |
if test X$withInotify != Xno ; then
|
1468 |
if test X$withInotify != Xno ; then
|
| 1474 |
{ echo "$as_me:$LINENO: Enabled support for inotify monitoring" >&5
|
1469 |
{ echo "$as_me:$LINENO: enabled support for inotify monitoring" >&5
|
| 1475 |
echo "$as_me: Enabled support for inotify monitoring" >&6;}
|
1470 |
echo "$as_me: enabled support for inotify monitoring" >&6;}
|
| 1476 |
|
1471 |
|
| 1477 |
cat >>confdefs.h <<\_ACEOF
|
1472 |
cat >>confdefs.h <<\_ACEOF
|
| 1478 |
#define RCL_MONITOR 1
|
1473 |
#define RCL_MONITOR 1
|
| 1479 |
_ACEOF
|
1474 |
_ACEOF
|
| 1480 |
|
1475 |
|
|
... |
|
... |
| 2499 |
if test $ac_cv_lib_iconv_iconv_open = yes; then
|
2494 |
if test $ac_cv_lib_iconv_iconv_open = yes; then
|
| 2500 |
LIBICONV="-L$dir -liconv";INCICONV=-I/usr/local/include
|
2495 |
LIBICONV="-L$dir -liconv";INCICONV=-I/usr/local/include
|
| 2501 |
fi
|
2496 |
fi
|
| 2502 |
|
2497 |
|
| 2503 |
if test A"$LIBICONV" = A ; then
|
2498 |
if test A"$LIBICONV" = A ; then
|
| 2504 |
dir=/usr/lib
|
2499 |
dir=${libdir}
|
| 2505 |
LDFLAGS="$S_LDFLAGS -L$dir"
|
2500 |
LDFLAGS="$S_LDFLAGS -L$dir"
|
| 2506 |
unset ac_cv_lib_iconv_iconv_open
|
2501 |
unset ac_cv_lib_iconv_iconv_open
|
| 2507 |
echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5
|
2502 |
echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5
|
| 2508 |
echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6
|
2503 |
echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6
|
| 2509 |
if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then
|
2504 |
if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then
|
|
... |
|
... |
| 2571 |
if test $ac_cv_lib_iconv_iconv_open = yes; then
|
2566 |
if test $ac_cv_lib_iconv_iconv_open = yes; then
|
| 2572 |
LIBICONV="-L$dir -liconv";INCICONV=-I/usr/include
|
2567 |
LIBICONV="-L$dir -liconv";INCICONV=-I/usr/include
|
| 2573 |
fi
|
2568 |
fi
|
| 2574 |
|
2569 |
|
| 2575 |
if test A"$LIBICONV" = A; then
|
2570 |
if test A"$LIBICONV" = A; then
|
| 2576 |
dir=/usr/lib
|
2571 |
dir=${libdir}
|
| 2577 |
LDFLAGS="$S_LDFLAGS -L$dir"
|
2572 |
LDFLAGS="$S_LDFLAGS -L$dir"
|
| 2578 |
unset ac_cv_lib_iconv_iconv_open
|
2573 |
unset ac_cv_lib_iconv_iconv_open
|
| 2579 |
echo "$as_me:$LINENO: checking for iconv_open in -lc" >&5
|
2574 |
echo "$as_me:$LINENO: checking for iconv_open in -lc" >&5
|
| 2580 |
echo $ECHO_N "checking for iconv_open in -lc... $ECHO_C" >&6
|
2575 |
echo $ECHO_N "checking for iconv_open in -lc... $ECHO_C" >&6
|
| 2581 |
if test "${ac_cv_lib_c_iconv_open+set}" = set; then
|
2576 |
if test "${ac_cv_lib_c_iconv_open+set}" = set; then
|
|
... |
|
... |
| 2746 |
# will have failed, and we tell the user to check his environment.
|
2741 |
# will have failed, and we tell the user to check his environment.
|
| 2747 |
#
|
2742 |
#
|
| 2748 |
# Note about qt4: if --enable-qt4 (enables the qt4gui directory), and the
|
2743 |
# Note about qt4: if --enable-qt4 (enables the qt4gui directory), and the
|
| 2749 |
# QTDIR variable are inconsistent, too bad.
|
2744 |
# QTDIR variable are inconsistent, too bad.
|
| 2750 |
#
|
2745 |
#
|
| 2751 |
# Check whether --enable-qt4 or --disable-qt4 was given.
|
|
|
| 2752 |
if test "${enable_qt4+set}" = set; then
|
|
|
| 2753 |
enableval="$enable_qt4"
|
|
|
| 2754 |
rcl_cv_qt4=$enableval
|
|
|
| 2755 |
else
|
|
|
| 2756 |
rcl_cv_qt4=no
|
|
|
| 2757 |
fi;
|
|
|
| 2758 |
{ echo "$as_me:$LINENO: rcl_cv_qt4 $rcl_cv_qt4" >&5
|
|
|
| 2759 |
echo "$as_me: rcl_cv_qt4 $rcl_cv_qt4" >&6;}
|
|
|
| 2760 |
if test X$rcl_cv_qt4 = Xyes ; then
|
|
|
| 2761 |
QTGUI=qt4gui
|
|
|
| 2762 |
else
|
|
|
| 2763 |
QTGUI=qtgui
|
|
|
| 2764 |
fi
|
|
|
| 2765 |
|
2746 |
|
| 2766 |
if test X$QTDIR != X ; then
|
2747 |
if test X$QTDIR != X ; then
|
| 2767 |
PATH=$QTDIR/bin:$PATH
|
2748 |
PATH=$QTDIR/bin:$PATH
|
| 2768 |
export PATH
|
2749 |
export PATH
|
| 2769 |
fi
|
2750 |
fi
|
|
... |
|
... |
| 2808 |
echo "${ECHO_T}no" >&6
|
2789 |
echo "${ECHO_T}no" >&6
|
| 2809 |
fi
|
2790 |
fi
|
| 2810 |
|
2791 |
|
| 2811 |
if test X$QMAKE = XNOTFOUND ; then
|
2792 |
if test X$QMAKE = XNOTFOUND ; then
|
| 2812 |
{ { echo "$as_me:$LINENO: error: Cannot find the qmake program. Maybe you need to install
|
2793 |
{ { echo "$as_me:$LINENO: error: Cannot find the qmake program. Maybe you need to install
|
| 2813 |
it and/or set the QTDIR environment variable?" >&5
|
2794 |
qt development files and tools and/or set the QTDIR environment variable?" >&5
|
| 2814 |
echo "$as_me: error: Cannot find the qmake program. Maybe you need to install
|
2795 |
echo "$as_me: error: Cannot find the qmake program. Maybe you need to install
|
| 2815 |
it and/or set the QTDIR environment variable?" >&2;}
|
2796 |
qt development files and tools and/or set the QTDIR environment variable?" >&2;}
|
| 2816 |
{ (exit 1); exit 1; }; }
|
2797 |
{ (exit 1); exit 1; }; }
|
|
|
2798 |
fi
|
|
|
2799 |
|
|
|
2800 |
# Discriminate qt3/4. Qt3 qmake prints its version on stderr but we don't
|
|
|
2801 |
# depend on this. We try to detect the qt 4 version string instead.
|
|
|
2802 |
qmakevers="`qmake --version 2>&1`"
|
|
|
2803 |
echo "qmake version: $qmakevers"
|
|
|
2804 |
v4=`expr "$qmakevers" : '.*Qt *version *4.*'`
|
|
|
2805 |
if test X$v4 = X0 ; then
|
|
|
2806 |
{ echo "$as_me:$LINENO: using qt version 3 user interface" >&5
|
|
|
2807 |
echo "$as_me: using qt version 3 user interface" >&6;}
|
|
|
2808 |
QTGUI=qtgui
|
|
|
2809 |
else
|
|
|
2810 |
{ echo "$as_me:$LINENO: using qt version 4 user interface" >&5
|
|
|
2811 |
echo "$as_me: using qt version 4 user interface" >&6;}
|
|
|
2812 |
QTGUI=qt4gui
|
| 2817 |
fi
|
2813 |
fi
|
| 2818 |
|
2814 |
|
| 2819 |
cd $QTGUI
|
2815 |
cd $QTGUI
|
| 2820 |
# We just want a .pro file: no problem with unsubstituted variables at
|
2816 |
# We just want a .pro file: no problem with unsubstituted variables at
|
| 2821 |
# this point.
|
2817 |
# this point.
|