diff --git a/src/configure b/src/configure index 835a0965..3124960b 100755 --- a/src/configure +++ b/src/configure @@ -2214,7 +2214,7 @@ if test X$QTDIR != X ; then PATH=$QTDIR/bin:$PATH export PATH fi -echo $PATH + # Extract the first word of "qmake", so it can be a program name with args. set dummy qmake; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -2263,16 +2263,8 @@ it and/or set the QTDIR environment variable?" >&2;} { (exit 1); exit 1; }; } fi -test -d tmp || mkdir tmp || exit 1 -cd tmp -cat > bogus.pro < bogus.cpp -${QMAKE} bogus.pro +cd qtgui +${QMAKE} recoll.pro if test $? != 0 ; then { { echo "$as_me:$LINENO: error: Cannot use qmake to generate a Makefile. Maybe you need to check the QTDIR and QMAKESPEC environment variables?" >&5 @@ -2291,7 +2283,6 @@ installation. If there is no default mkspecs, you should also set QMAKESPEC" >&2 { (exit 1); exit 1; }; } fi fi -rm -f bogus.pro bogus.cpp Makefile cd .. diff --git a/src/configure.ac b/src/configure.ac index 83940b3b..524fd61a 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -85,23 +85,15 @@ if test X$QTDIR != X ; then PATH=$QTDIR/bin:$PATH export PATH fi -echo $PATH + AC_PATH_PROG([QMAKE], [qmake], NOTFOUND) if test X$QMAKE = XNOTFOUND ; then AC_MSG_ERROR([Cannot find the qmake program. Maybe you need to install it and/or set the QTDIR environment variable?]) fi -test -d tmp || mkdir tmp || exit 1 -cd tmp -cat > bogus.pro < bogus.cpp -${QMAKE} bogus.pro +cd qtgui +${QMAKE} recoll.pro if test $? != 0 ; then AC_MSG_ERROR([Cannot use qmake to generate a Makefile. Maybe you need to check the QTDIR and QMAKESPEC environment variables?]) @@ -114,7 +106,6 @@ if test X$QTDIR = X ; then installation. If there is no default mkspecs, you should also set QMAKESPEC]) fi fi -rm -f bogus.pro bogus.cpp Makefile cd .. AC_SUBST(LIBXAPIAN)