anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 02:49:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Account for the case in which Qt tools are not in PATH

Browse Source 
If the Qt directory is specified by --with-qt-dir, the full path
of the tools is retained. Otherwise, if qtchooser is detected,
the generic names are attempted with proper arguments to select
the desired Qt version. Otherwise, the generic names with and without
proper suffixes (either -qt5 or -qt4) are checked in the PATH.

This means that --with-qt-dir=qtdir should be used only if the tools
are not in the PATH, or qtdir/bin/{moc,rcc,uic} are the right versions
for the desired Qt. In any case, it is later checked that the selected
tools are the right ones and a warning is issued if there is a mismatch.
This commit is contained in:
Enrico Forestieri 2016-07-07 23:12:07 +02:00
parent 5a3401c66e
commit f0aa129938
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config/qt4.m4
View File

@ -72,16 +72,13 @@ AC_DEFUN([QT_FIND_TOOL],
qt_ext=qt5 qt_ext=qt5
fi fi
lyx_qt_path=$PATH
if test -n "$qt_cv_bin" ; then if test -n "$qt_cv_bin" ; then
lyx_qt_path=$qt_cv_bin:$PATH AC_PATH_PROGS($1, [$2], [], $qt_cv_bin)
fi elif qtchooser -l 2>/dev/null | grep -q ^$qt_ext\$ >/dev/null ; then
AC_CHECK_PROG($1, $2, [$2 -qt=$qt_ext],, [$PATH])
if qtchooser -l 2>/dev/null | grep -q ^$qt_ext\$ >/dev/null ; then
AC_CHECK_PROG($1, $2, [$2 -qt=$qt_ext],, [$lyx_qt_path])
fi fi
if test -z "$$1"; then if test -z "$$1"; then
AC_CHECK_PROGS($1, [$2-$qt_ext $2],[],$lyx_qt_path) AC_CHECK_PROGS($1, [$2-$qt_ext $2],[],$PATH)
fi fi
if test -z "$$1"; then if test -z "$$1"; then
AC_MSG_ERROR([cannot find $2 binary.]) AC_MSG_ERROR([cannot find $2 binary.])