On Thu, Jul 07, 2016 at 03:20:21PM +0200, Enrico Forestieri wrote: > On Thu, Jul 07, 2016 at 12:34:44PM +0200, Jean-Marc Lasgouttes wrote: > > Le 07/07/2016 à 09:39, Jean-Marc Lasgouttes a écrit : > > >M'y fault indeed. I'll fix it ASAP. > > > > What about this? > > Thanks, this solves the problem on solaris but still doesn't take > into account the fact that one could be using an own compiled > version of Qt rather than the system one, so that qtchooser should > not be used.
What about the attached one, instead? If --with-qt-dir is specified, the presence of qtchooser is not checked and everything goes as before. -- Enrico
diff --git a/config/qt4.m4 b/config/qt4.m4 index 14390f8..6a7a6d9 100644 --- a/config/qt4.m4 +++ b/config/qt4.m4 @@ -74,10 +74,8 @@ AC_DEFUN([QT_FIND_TOOL], lyx_qt_path=$PATH if test -n "$qt_cv_bin" ; then - lyx_qt_path=$qt_cv_bin:$PATH - fi - - if qtchooser -l 2>/dev/null | grep -q ^$qt_ext\$ >/dev/null ; then + AC_PATH_PROGS($1, [$2], [], $qt_cv_bin) + elif 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 if test -z "$$1"; then
