tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

do a better search for qt configuration

Browse Source
This commit is contained in:
dockes 2006-01-14 13:09:13 +00:00
parent ef1cfe1aac
commit d9acca162b
2 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/configure vendored
View File

@ -2214,7 +2214,7 @@ if test X$QTDIR != X ; then
PATH=$QTDIR/bin:$PATH PATH=$QTDIR/bin:$PATH
export PATH export PATH
fi fi
echo $PATH
# Extract the first word of "qmake", so it can be a program name with args. # Extract the first word of "qmake", so it can be a program name with args.
set dummy qmake; ac_word=$2 set dummy qmake; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5 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; }; } { (exit 1); exit 1; }; }
fi fi
test -d tmp || mkdir tmp || exit 1 cd qtgui
cd tmp ${QMAKE} recoll.pro
cat > bogus.pro <<EOF
TEMPLATE = app
LANGUAGE = C++
CONFIG += qt warn_on thread release debug
SOURCES += bogus.cpp
EOF
echo " " > bogus.cpp
${QMAKE} bogus.pro
if test $? != 0 ; then if test $? != 0 ; then
{ { echo "$as_me:$LINENO: error: Cannot use qmake to generate a Makefile. Maybe you need to { { echo "$as_me:$LINENO: error: Cannot use qmake to generate a Makefile. Maybe you need to
check the QTDIR and QMAKESPEC environment variables?" >&5 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; }; } { (exit 1); exit 1; }; }
fi fi
fi fi
rm -f bogus.pro bogus.cpp Makefile
cd .. cd ..

15
src/configure.ac
View File

@ -85,23 +85,15 @@ if test X$QTDIR != X ; then
PATH=$QTDIR/bin:$PATH PATH=$QTDIR/bin:$PATH
export PATH export PATH
fi fi
echo $PATH
AC_PATH_PROG([QMAKE], [qmake], NOTFOUND) AC_PATH_PROG([QMAKE], [qmake], NOTFOUND)
if test X$QMAKE = XNOTFOUND ; then if test X$QMAKE = XNOTFOUND ; then
AC_MSG_ERROR([Cannot find the qmake program. Maybe you need to install AC_MSG_ERROR([Cannot find the qmake program. Maybe you need to install
it and/or set the QTDIR environment variable?]) it and/or set the QTDIR environment variable?])
fi fi
test -d tmp || mkdir tmp || exit 1 cd qtgui
cd tmp ${QMAKE} recoll.pro
cat > bogus.pro <<EOF
TEMPLATE = app
LANGUAGE = C++
CONFIG += qt warn_on thread release debug
SOURCES += bogus.cpp
EOF
echo " " > bogus.cpp
${QMAKE} bogus.pro
if test $? != 0 ; then if test $? != 0 ; then
AC_MSG_ERROR([Cannot use qmake to generate a Makefile. Maybe you need to AC_MSG_ERROR([Cannot use qmake to generate a Makefile. Maybe you need to
check the QTDIR and QMAKESPEC environment variables?]) 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]) installation. If there is no default mkspecs, you should also set QMAKESPEC])
fi fi
fi fi
rm -f bogus.pro bogus.cpp Makefile
cd .. cd ..
AC_SUBST(LIBXAPIAN) AC_SUBST(LIBXAPIAN)