|
a/src/configure |
|
b/src/configure |
|
... |
|
... |
| 663 |
aspellProg
|
663 |
aspellProg
|
| 664 |
CXX
|
664 |
CXX
|
| 665 |
CXXFLAGS
|
665 |
CXXFLAGS
|
| 666 |
ac_ct_CXX
|
666 |
ac_ct_CXX
|
| 667 |
XAPIAN_CONFIG
|
667 |
XAPIAN_CONFIG
|
| 668 |
QMAKE
|
668 |
QMAKEPATH
|
| 669 |
UIC3
|
669 |
UIC3
|
| 670 |
XMKMF
|
670 |
XMKMF
|
| 671 |
CXXCPP
|
671 |
CXXCPP
|
| 672 |
X_CFLAGS
|
672 |
X_CFLAGS
|
| 673 |
X_PRE_LIBS
|
673 |
X_PRE_LIBS
|
|
... |
|
... |
| 675 |
X_EXTRA_LIBS
|
675 |
X_EXTRA_LIBS
|
| 676 |
INCICONV
|
676 |
INCICONV
|
| 677 |
LIBICONV
|
677 |
LIBICONV
|
| 678 |
LIBXAPIAN
|
678 |
LIBXAPIAN
|
| 679 |
LIBFAM
|
679 |
LIBFAM
|
|
|
680 |
QMAKE
|
| 680 |
QTGUI
|
681 |
QTGUI
|
| 681 |
QTRECOLL_DATADIR
|
682 |
QTRECOLL_DATADIR
|
| 682 |
XAPIANCXXFLAGS
|
683 |
XAPIANCXXFLAGS
|
| 683 |
HAVE_MKDTEMP
|
684 |
HAVE_MKDTEMP
|
| 684 |
LIBOBJS
|
685 |
LIBOBJS
|
|
... |
|
... |
| 4558 |
if test X$QTDIR != X ; then
|
4559 |
if test X$QTDIR != X ; then
|
| 4559 |
PATH=$QTDIR/bin:$PATH
|
4560 |
PATH=$QTDIR/bin:$PATH
|
| 4560 |
export PATH
|
4561 |
export PATH
|
| 4561 |
fi
|
4562 |
fi
|
| 4562 |
|
4563 |
|
| 4563 |
# MacosX stuff: we don't support this (the native search tool is more than
|
|
|
| 4564 |
# good enough), but we make things work just enough so that the program can
|
|
|
| 4565 |
# be compiled and roughly installed (not as a .app, but to /usr/local),
|
|
|
| 4566 |
# basically to enable using a Macbook for development
|
|
|
| 4567 |
if test X$sys = XDarwin ; then
|
4564 |
if test X$QMAKE = X ; then
|
| 4568 |
# The defaults tends to be macx-xcode, which we cant use
|
4565 |
QMAKE=qmake
|
| 4569 |
QMAKESPEC=macx-g++
|
|
|
| 4570 |
export QMAKESPEC
|
|
|
| 4571 |
#QMAKESPEC_SPEC="-spec max-g++"
|
|
|
| 4572 |
#AC_SUBST(QMAKESPEC_SPEC)
|
|
|
| 4573 |
fi
|
4566 |
fi
|
| 4574 |
|
4567 |
|
| 4575 |
# Extract the first word of "qmake", so it can be a program name with args.
|
4568 |
# Extract the first word of "$QMAKE", so it can be a program name with args.
|
| 4576 |
set dummy qmake; ac_word=$2
|
4569 |
set dummy $QMAKE; ac_word=$2
|
| 4577 |
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
4570 |
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
| 4578 |
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
4571 |
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
| 4579 |
if test "${ac_cv_path_QMAKE+set}" = set; then
|
4572 |
if test "${ac_cv_path_QMAKEPATH+set}" = set; then
|
| 4580 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
4573 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
| 4581 |
else
|
4574 |
else
|
| 4582 |
case $QMAKE in
|
4575 |
case $QMAKEPATH in
|
| 4583 |
[\\/]* | ?:[\\/]*)
|
4576 |
[\\/]* | ?:[\\/]*)
|
| 4584 |
ac_cv_path_QMAKE="$QMAKE" # Let the user override the test with a path.
|
4577 |
ac_cv_path_QMAKEPATH="$QMAKEPATH" # Let the user override the test with a path.
|
| 4585 |
;;
|
4578 |
;;
|
| 4586 |
*)
|
4579 |
*)
|
| 4587 |
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
4580 |
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
| 4588 |
for as_dir in $PATH
|
4581 |
for as_dir in $PATH
|
| 4589 |
do
|
4582 |
do
|
| 4590 |
IFS=$as_save_IFS
|
4583 |
IFS=$as_save_IFS
|
| 4591 |
test -z "$as_dir" && as_dir=.
|
4584 |
test -z "$as_dir" && as_dir=.
|
| 4592 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
4585 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
| 4593 |
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
4586 |
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| 4594 |
ac_cv_path_QMAKE="$as_dir/$ac_word$ac_exec_ext"
|
4587 |
ac_cv_path_QMAKEPATH="$as_dir/$ac_word$ac_exec_ext"
|
| 4595 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
4588 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| 4596 |
break 2
|
4589 |
break 2
|
| 4597 |
fi
|
4590 |
fi
|
| 4598 |
done
|
4591 |
done
|
| 4599 |
done
|
4592 |
done
|
| 4600 |
IFS=$as_save_IFS
|
4593 |
IFS=$as_save_IFS
|
| 4601 |
|
4594 |
|
| 4602 |
test -z "$ac_cv_path_QMAKE" && ac_cv_path_QMAKE="NOTFOUND"
|
4595 |
test -z "$ac_cv_path_QMAKEPATH" && ac_cv_path_QMAKEPATH="NOTFOUND"
|
| 4603 |
;;
|
4596 |
;;
|
| 4604 |
esac
|
4597 |
esac
|
| 4605 |
fi
|
4598 |
fi
|
| 4606 |
QMAKE=$ac_cv_path_QMAKE
|
4599 |
QMAKEPATH=$ac_cv_path_QMAKEPATH
|
| 4607 |
if test -n "$QMAKE"; then
|
4600 |
if test -n "$QMAKEPATH"; then
|
| 4608 |
{ echo "$as_me:$LINENO: result: $QMAKE" >&5
|
4601 |
{ echo "$as_me:$LINENO: result: $QMAKEPATH" >&5
|
| 4609 |
echo "${ECHO_T}$QMAKE" >&6; }
|
4602 |
echo "${ECHO_T}$QMAKEPATH" >&6; }
|
| 4610 |
else
|
4603 |
else
|
| 4611 |
{ echo "$as_me:$LINENO: result: no" >&5
|
4604 |
{ echo "$as_me:$LINENO: result: no" >&5
|
| 4612 |
echo "${ECHO_T}no" >&6; }
|
4605 |
echo "${ECHO_T}no" >&6; }
|
| 4613 |
fi
|
4606 |
fi
|
| 4614 |
|
4607 |
|
| 4615 |
|
4608 |
|
| 4616 |
if test X$QMAKE = XNOTFOUND ; then
|
4609 |
if test X$QMAKEPATH = XNOTFOUND ; then
|
| 4617 |
{ { echo "$as_me:$LINENO: error: Cannot find the qmake program. Maybe you need to install
|
4610 |
{ { echo "$as_me:$LINENO: error: Cannot find the qmake program. Maybe you need to install
|
| 4618 |
qt development files and tools and/or set the QTDIR environment variable?" >&5
|
4611 |
qt development files and tools and/or set the QTDIR environment variable?" >&5
|
| 4619 |
echo "$as_me: error: Cannot find the qmake program. Maybe you need to install
|
4612 |
echo "$as_me: error: Cannot find the qmake program. Maybe you need to install
|
| 4620 |
qt development files and tools and/or set the QTDIR environment variable?" >&2;}
|
4613 |
qt development files and tools and/or set the QTDIR environment variable?" >&2;}
|
| 4621 |
{ (exit 1); exit 1; }; }
|
4614 |
{ (exit 1); exit 1; }; }
|
| 4622 |
fi
|
4615 |
fi
|
|
|
4616 |
QMAKE=$QMAKEPATH
|
| 4623 |
|
4617 |
|
|
|
4618 |
# MAC OS X: we don't support this (the native search tool is more than
|
|
|
4619 |
# good enough), but we make things work just enough so that the program can
|
|
|
4620 |
# be compiled and roughly installed (not as a .app, but to /usr/local),
|
|
|
4621 |
# basically to enable using a Macbook for development
|
| 4624 |
if test X$sys = XDarwin ; then
|
4622 |
if test X$sys = XDarwin ; then
|
|
|
4623 |
# The default is xcode
|
| 4625 |
QMAKE="${QMAKE} -spec macx-g++"
|
4624 |
QMAKE="${QMAKE} -spec macx-g++"
|
| 4626 |
fi
|
4625 |
fi
|
| 4627 |
|
4626 |
|
| 4628 |
# Discriminate qt3/4. Qt3 qmake prints its version on stderr but we don't
|
4627 |
# Discriminate qt3/4. Qt3 qmake prints its version on stderr but we don't
|
| 4629 |
# depend on this. We try to detect the qt 4 version string instead.
|
4628 |
# depend on this. We try to detect the qt 4 version string instead.
|
|
... |
|
... |
| 6972 |
aspellProg!$aspellProg$ac_delim
|
6971 |
aspellProg!$aspellProg$ac_delim
|
| 6973 |
CXX!$CXX$ac_delim
|
6972 |
CXX!$CXX$ac_delim
|
| 6974 |
CXXFLAGS!$CXXFLAGS$ac_delim
|
6973 |
CXXFLAGS!$CXXFLAGS$ac_delim
|
| 6975 |
ac_ct_CXX!$ac_ct_CXX$ac_delim
|
6974 |
ac_ct_CXX!$ac_ct_CXX$ac_delim
|
| 6976 |
XAPIAN_CONFIG!$XAPIAN_CONFIG$ac_delim
|
6975 |
XAPIAN_CONFIG!$XAPIAN_CONFIG$ac_delim
|
| 6977 |
QMAKE!$QMAKE$ac_delim
|
6976 |
QMAKEPATH!$QMAKEPATH$ac_delim
|
| 6978 |
UIC3!$UIC3$ac_delim
|
6977 |
UIC3!$UIC3$ac_delim
|
| 6979 |
XMKMF!$XMKMF$ac_delim
|
6978 |
XMKMF!$XMKMF$ac_delim
|
| 6980 |
CXXCPP!$CXXCPP$ac_delim
|
6979 |
CXXCPP!$CXXCPP$ac_delim
|
| 6981 |
X_CFLAGS!$X_CFLAGS$ac_delim
|
6980 |
X_CFLAGS!$X_CFLAGS$ac_delim
|
| 6982 |
X_PRE_LIBS!$X_PRE_LIBS$ac_delim
|
6981 |
X_PRE_LIBS!$X_PRE_LIBS$ac_delim
|
|
... |
|
... |
| 6984 |
X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
|
6983 |
X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
|
| 6985 |
INCICONV!$INCICONV$ac_delim
|
6984 |
INCICONV!$INCICONV$ac_delim
|
| 6986 |
LIBICONV!$LIBICONV$ac_delim
|
6985 |
LIBICONV!$LIBICONV$ac_delim
|
| 6987 |
LIBXAPIAN!$LIBXAPIAN$ac_delim
|
6986 |
LIBXAPIAN!$LIBXAPIAN$ac_delim
|
| 6988 |
LIBFAM!$LIBFAM$ac_delim
|
6987 |
LIBFAM!$LIBFAM$ac_delim
|
|
|
6988 |
QMAKE!$QMAKE$ac_delim
|
| 6989 |
QTGUI!$QTGUI$ac_delim
|
6989 |
QTGUI!$QTGUI$ac_delim
|
| 6990 |
QTRECOLL_DATADIR!$QTRECOLL_DATADIR$ac_delim
|
6990 |
QTRECOLL_DATADIR!$QTRECOLL_DATADIR$ac_delim
|
| 6991 |
XAPIANCXXFLAGS!$XAPIANCXXFLAGS$ac_delim
|
6991 |
XAPIANCXXFLAGS!$XAPIANCXXFLAGS$ac_delim
|
| 6992 |
HAVE_MKDTEMP!$HAVE_MKDTEMP$ac_delim
|
6992 |
HAVE_MKDTEMP!$HAVE_MKDTEMP$ac_delim
|
| 6993 |
LIBOBJS!$LIBOBJS$ac_delim
|
6993 |
LIBOBJS!$LIBOBJS$ac_delim
|
| 6994 |
LTLIBOBJS!$LTLIBOBJS$ac_delim
|
6994 |
LTLIBOBJS!$LTLIBOBJS$ac_delim
|
| 6995 |
_ACEOF
|
6995 |
_ACEOF
|
| 6996 |
|
6996 |
|
| 6997 |
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 70; then
|
6997 |
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 71; then
|
| 6998 |
break
|
6998 |
break
|
| 6999 |
elif $ac_last_try; then
|
6999 |
elif $ac_last_try; then
|
| 7000 |
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
7000 |
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
| 7001 |
echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
|
7001 |
echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
|
| 7002 |
{ (exit 1); exit 1; }; }
|
7002 |
{ (exit 1); exit 1; }; }
|