|
a/src/configure.ac |
|
b/src/configure.ac |
|
... |
|
... |
| 83 |
|
83 |
|
| 84 |
if test X$QTDIR != X ; then
|
84 |
if test X$QTDIR != X ; then
|
| 85 |
PATH=$QTDIR/bin:$PATH
|
85 |
PATH=$QTDIR/bin:$PATH
|
| 86 |
export PATH
|
86 |
export PATH
|
| 87 |
fi
|
87 |
fi
|
| 88 |
echo $PATH
|
88 |
|
| 89 |
AC_PATH_PROG([QMAKE], [qmake], NOTFOUND)
|
89 |
AC_PATH_PROG([QMAKE], [qmake], NOTFOUND)
|
| 90 |
if test X$QMAKE = XNOTFOUND ; then
|
90 |
if test X$QMAKE = XNOTFOUND ; then
|
| 91 |
AC_MSG_ERROR([Cannot find the qmake program. Maybe you need to install
|
91 |
AC_MSG_ERROR([Cannot find the qmake program. Maybe you need to install
|
| 92 |
it and/or set the QTDIR environment variable?])
|
92 |
it and/or set the QTDIR environment variable?])
|
| 93 |
fi
|
93 |
fi
|
| 94 |
|
94 |
|
| 95 |
test -d tmp || mkdir tmp || exit 1
|
95 |
cd qtgui
|
| 96 |
cd tmp
|
|
|
| 97 |
cat > bogus.pro <<EOF
|
|
|
| 98 |
TEMPLATE = app
|
|
|
| 99 |
LANGUAGE = C++
|
|
|
| 100 |
CONFIG += qt warn_on thread release debug
|
|
|
| 101 |
SOURCES += bogus.cpp
|
|
|
| 102 |
EOF
|
|
|
| 103 |
echo " " > bogus.cpp
|
|
|
| 104 |
${QMAKE} bogus.pro
|
96 |
${QMAKE} recoll.pro
|
| 105 |
if test $? != 0 ; then
|
97 |
if test $? != 0 ; then
|
| 106 |
AC_MSG_ERROR([Cannot use qmake to generate a Makefile. Maybe you need to
|
98 |
AC_MSG_ERROR([Cannot use qmake to generate a Makefile. Maybe you need to
|
| 107 |
check the QTDIR and QMAKESPEC environment variables?])
|
99 |
check the QTDIR and QMAKESPEC environment variables?])
|
| 108 |
fi
|
100 |
fi
|
| 109 |
# is QTDIR set and do we actually need it ?
|
101 |
# is QTDIR set and do we actually need it ?
|
|
... |
|
... |
| 112 |
if test "X$QTDIRNEEDED" != "X" ; then
|
104 |
if test "X$QTDIRNEEDED" != "X" ; then
|
| 113 |
AC_MSG_ERROR([You need to set the QTDIR variable to point to the QT
|
105 |
AC_MSG_ERROR([You need to set the QTDIR variable to point to the QT
|
| 114 |
installation. If there is no default mkspecs, you should also set QMAKESPEC])
|
106 |
installation. If there is no default mkspecs, you should also set QMAKESPEC])
|
| 115 |
fi
|
107 |
fi
|
| 116 |
fi
|
108 |
fi
|
| 117 |
rm -f bogus.pro bogus.cpp Makefile
|
|
|
| 118 |
cd ..
|
109 |
cd ..
|
| 119 |
|
110 |
|
| 120 |
AC_SUBST(LIBXAPIAN)
|
111 |
AC_SUBST(LIBXAPIAN)
|
| 121 |
AC_SUBST(XAPIANCXXFLAGS)
|
112 |
AC_SUBST(XAPIANCXXFLAGS)
|
| 122 |
AC_SUBST(LIBICONV)
|
113 |
AC_SUBST(LIBICONV)
|