Switch to unified view

a/src/configure b/src/configure
...
...
2212
2212
2213
if test X$QTDIR != X ; then
2213
if test X$QTDIR != X ; then
2214
   PATH=$QTDIR/bin:$PATH
2214
   PATH=$QTDIR/bin:$PATH
2215
   export PATH
2215
   export PATH
2216
fi
2216
fi
2217
echo $PATH
2217
2218
# Extract the first word of "qmake", so it can be a program name with args.
2218
# Extract the first word of "qmake", so it can be a program name with args.
2219
set dummy qmake; ac_word=$2
2219
set dummy qmake; ac_word=$2
2220
echo "$as_me:$LINENO: checking for $ac_word" >&5
2220
echo "$as_me:$LINENO: checking for $ac_word" >&5
2221
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2221
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2222
if test "${ac_cv_path_QMAKE+set}" = set; then
2222
if test "${ac_cv_path_QMAKE+set}" = set; then
...
...
2261
echo "$as_me: error: Cannot find the qmake program. Maybe you need to install
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;}
2262
it and/or set the QTDIR environment variable?" >&2;}
2263
   { (exit 1); exit 1; }; }
2263
   { (exit 1); exit 1; }; }
2264
fi
2264
fi
2265
2265
2266
test -d tmp || mkdir tmp || exit 1
2266
cd qtgui
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
2267
${QMAKE} recoll.pro
2276
if test $? != 0 ; then
2268
if test $? != 0 ; then
2277
   { { echo "$as_me:$LINENO: error: Cannot use qmake to generate a Makefile. Maybe you need to
2269
   { { 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
2270
check the QTDIR and QMAKESPEC environment variables?" >&5
2279
echo "$as_me: error: Cannot use qmake to generate a Makefile. Maybe you need to
2271
echo "$as_me: error: Cannot use qmake to generate a Makefile. Maybe you need to
2280
check the QTDIR and QMAKESPEC environment variables?" >&2;}
2272
check the QTDIR and QMAKESPEC environment variables?" >&2;}
...
...
2289
echo "$as_me: error: You need to set the QTDIR variable to point to the QT
2281
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;}
2282
installation. If there is no default mkspecs, you should also set QMAKESPEC" >&2;}
2291
   { (exit 1); exit 1; }; }
2283
   { (exit 1); exit 1; }; }
2292
   fi
2284
   fi
2293
fi
2285
fi
2294
rm -f bogus.pro bogus.cpp Makefile
2295
cd ..
2286
cd ..
2296
2287
2297
2288
2298
2289
2299
2290