|
a/src/configure |
|
b/src/configure |
|
... |
|
... |
2187 |
|
2187 |
|
2188 |
#echo XAPIAN_CONFIG $XAPIAN_CONFIG
|
2188 |
#echo XAPIAN_CONFIG $XAPIAN_CONFIG
|
2189 |
#echo LIBXAPIAN $LIBXAPIAN
|
2189 |
#echo LIBXAPIAN $LIBXAPIAN
|
2190 |
#echo XAPIANCXXFLAGS $XAPIANCXXFLAGS
|
2190 |
#echo XAPIANCXXFLAGS $XAPIANCXXFLAGS
|
2191 |
|
2191 |
|
|
|
2192 |
#### QT
|
|
|
2193 |
# The way qt and its tools (qmake especially) are installed is very
|
|
|
2194 |
# different between systems (and maybe qt versions)
|
|
|
2195 |
#
|
|
|
2196 |
# In general we need QTDIR to be set, because it is used inside the
|
|
|
2197 |
# qmake-generated makefiles. But there are exceptions: ie on debian3.1 (at
|
|
|
2198 |
# least on the sourceforge compile farm), QTDIR is not needed because qmake
|
|
|
2199 |
# generates hard paths (and is installed in /usr/bin). We don't want to
|
|
|
2200 |
# force the user to set QTDIR if it is not needed.
|
|
|
2201 |
#
|
|
|
2202 |
# The logic is then to first look for qmake, possibly using QTDIR if it is
|
|
|
2203 |
# set.
|
|
|
2204 |
#
|
|
|
2205 |
# If QTDIR is not set, we then generate a bogus qt project and check if
|
|
|
2206 |
# QTDIR is needed in the Makefile, in which case we complain.
|
|
|
2207 |
#
|
|
|
2208 |
# QMAKESPEC: on most Linux system, there is a 'default' link inside the
|
|
|
2209 |
# mkspecs directory, so that QMAKESPEC is not needed.
|
|
|
2210 |
# If QMAKESPEC is not set and needed, the qmake test at the previous test
|
|
|
2211 |
# will have failed, and we tell the user to check his environment.
|
|
|
2212 |
|
|
|
2213 |
if test X$QTDIR != X ; then
|
|
|
2214 |
PATH=$QTDIR/bin:$PATH
|
|
|
2215 |
export PATH
|
|
|
2216 |
fi
|
|
|
2217 |
echo $PATH
|
|
|
2218 |
# Extract the first word of "qmake", so it can be a program name with args.
|
|
|
2219 |
set dummy qmake; ac_word=$2
|
|
|
2220 |
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
|
2221 |
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
|
2222 |
if test "${ac_cv_path_QMAKE+set}" = set; then
|
|
|
2223 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
2224 |
else
|
|
|
2225 |
case $QMAKE in
|
|
|
2226 |
[\\/]* | ?:[\\/]*)
|
|
|
2227 |
ac_cv_path_QMAKE="$QMAKE" # Let the user override the test with a path.
|
|
|
2228 |
;;
|
|
|
2229 |
*)
|
|
|
2230 |
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
|
2231 |
for as_dir in $PATH
|
|
|
2232 |
do
|
|
|
2233 |
IFS=$as_save_IFS
|
|
|
2234 |
test -z "$as_dir" && as_dir=.
|
|
|
2235 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
|
2236 |
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
|
2237 |
ac_cv_path_QMAKE="$as_dir/$ac_word$ac_exec_ext"
|
|
|
2238 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
|
2239 |
break 2
|
|
|
2240 |
fi
|
|
|
2241 |
done
|
|
|
2242 |
done
|
|
|
2243 |
|
|
|
2244 |
test -z "$ac_cv_path_QMAKE" && ac_cv_path_QMAKE="NOTFOUND"
|
|
|
2245 |
;;
|
|
|
2246 |
esac
|
|
|
2247 |
fi
|
|
|
2248 |
QMAKE=$ac_cv_path_QMAKE
|
|
|
2249 |
|
|
|
2250 |
if test -n "$QMAKE"; then
|
|
|
2251 |
echo "$as_me:$LINENO: result: $QMAKE" >&5
|
|
|
2252 |
echo "${ECHO_T}$QMAKE" >&6
|
|
|
2253 |
else
|
|
|
2254 |
echo "$as_me:$LINENO: result: no" >&5
|
|
|
2255 |
echo "${ECHO_T}no" >&6
|
|
|
2256 |
fi
|
|
|
2257 |
|
|
|
2258 |
if test X$QMAKE = XNOTFOUND ; then
|
|
|
2259 |
{ { echo "$as_me:$LINENO: error: Cannot find the qmake program. Maybe you need to install
|
|
|
2260 |
it and/or set the QTDIR environment variable?" >&5
|
|
|
2261 |
echo "$as_me: error: Cannot find the qmake program. Maybe you need to install
|
|
|
2262 |
it and/or set the QTDIR environment variable?" >&2;}
|
|
|
2263 |
{ (exit 1); exit 1; }; }
|
|
|
2264 |
fi
|
|
|
2265 |
|
|
|
2266 |
test -d tmp || mkdir tmp || exit 1
|
|
|
2267 |
cd tmp
|
|
|
2268 |
cat > bogus.pro <<EOF
|
|
|
2269 |
TEMPLATE = app
|
|
|
2270 |
LANGUAGE = C++
|
|
|
2271 |
CONFIG += qt warn_on thread release debug
|
|
|
2272 |
SOURCES += bogus.cpp
|
|
|
2273 |
EOF
|
|
|
2274 |
echo " " > bogus.cpp
|
|
|
2275 |
${QMAKE} bogus.pro
|
|
|
2276 |
if test $? != 0 ; then
|
|
|
2277 |
{ { echo "$as_me:$LINENO: error: Cannot use qmake to generate a Makefile. Maybe you need to
|
|
|
2278 |
check the QTDIR and QMAKESPEC environment variables?" >&5
|
|
|
2279 |
echo "$as_me: error: Cannot use qmake to generate a Makefile. Maybe you need to
|
|
|
2280 |
check the QTDIR and QMAKESPEC environment variables?" >&2;}
|
|
|
2281 |
{ (exit 1); exit 1; }; }
|
|
|
2282 |
fi
|
|
|
2283 |
# is QTDIR set and do we actually need it ?
|
|
|
2284 |
if test X$QTDIR = X ; then
|
|
|
2285 |
QTDIRNEEDED=`grep INCPATH Makefile | grep = | grep QTDIR`
|
|
|
2286 |
if test "X$QTDIRNEEDED" != "X" ; then
|
|
|
2287 |
{ { echo "$as_me:$LINENO: error: You need to set the QTDIR variable to point to the QT
|
|
|
2288 |
installation. If there is no default mkspecs, you should also set QMAKESPEC" >&5
|
|
|
2289 |
echo "$as_me: error: You need to set the QTDIR variable to point to the QT
|
|
|
2290 |
installation. If there is no default mkspecs, you should also set QMAKESPEC" >&2;}
|
|
|
2291 |
{ (exit 1); exit 1; }; }
|
|
|
2292 |
fi
|
|
|
2293 |
fi
|
|
|
2294 |
rm -f bogus.pro bogus.cpp Makefile
|
|
|
2295 |
cd ..
|
|
|
2296 |
|
2192 |
|
2297 |
|
2193 |
|
2298 |
|
2194 |
|
2299 |
|
2195 |
|
2300 |
|
2196 |
|
2301 |
|
|
... |
|
... |
2792 |
s,@CPPFLAGS@,$CPPFLAGS,;t t
|
2897 |
s,@CPPFLAGS@,$CPPFLAGS,;t t
|
2793 |
s,@ac_ct_CC@,$ac_ct_CC,;t t
|
2898 |
s,@ac_ct_CC@,$ac_ct_CC,;t t
|
2794 |
s,@EXEEXT@,$EXEEXT,;t t
|
2899 |
s,@EXEEXT@,$EXEEXT,;t t
|
2795 |
s,@OBJEXT@,$OBJEXT,;t t
|
2900 |
s,@OBJEXT@,$OBJEXT,;t t
|
2796 |
s,@XAPIAN_CONFIG@,$XAPIAN_CONFIG,;t t
|
2901 |
s,@XAPIAN_CONFIG@,$XAPIAN_CONFIG,;t t
|
|
|
2902 |
s,@QMAKE@,$QMAKE,;t t
|
2797 |
s,@LIBXAPIAN@,$LIBXAPIAN,;t t
|
2903 |
s,@LIBXAPIAN@,$LIBXAPIAN,;t t
|
2798 |
s,@XAPIANCXXFLAGS@,$XAPIANCXXFLAGS,;t t
|
2904 |
s,@XAPIANCXXFLAGS@,$XAPIANCXXFLAGS,;t t
|
2799 |
s,@LIBICONV@,$LIBICONV,;t t
|
2905 |
s,@LIBICONV@,$LIBICONV,;t t
|
2800 |
s,@INCICONV@,$INCICONV,;t t
|
2906 |
s,@INCICONV@,$INCICONV,;t t
|
2801 |
CEOF
|
2907 |
CEOF
|