From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Mon, 4 Jul 2016 14:22:57 +0000 (+0200)
Subject: Autoconf : Try to select the correct Qt tools by using the -qt option
X-Git-Tag: 2.3.0alpha1~1325
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=d044986724e98921510c95adecb61d2688b1f598;p=lyx.git

Autoconf : Try to select the correct Qt tools by using the -qt option

With this change, it is now possible to configure with --enable-qt5
and have make use "moc -qt=qt5" automatically.

This is done when the command qtchooser is available nd the desired Qt
version (qt4/qt5) is available.

This means that it is now possible to have qt4 and qt5 builds easily
on a same linux system.
---

diff --git a/config/qt4.m4 b/config/qt4.m4
index 2bcd4f3bfc..14390f8443 100644
--- a/config/qt4.m4
+++ b/config/qt4.m4
@@ -71,11 +71,17 @@ AC_DEFUN([QT_FIND_TOOL],
 	if test "x$USE_QT5" != "xno" ; then
 		qt_ext=qt5
 	fi
+
+	lyx_qt_path=$PATH
 	if test -n "$qt_cv_bin" ; then
-		AC_PATH_PROGS($1, [$2], [], $qt_cv_bin)
+		lyx_qt_path=$qt_cv_bin:$PATH
+	fi
+
+	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
 	if test -z "$$1"; then
-		AC_PATH_PROGS($1, [$2-$qt_ext $2],[],$PATH)
+		AC_CHECK_PROGS($1, [$2-$qt_ext $2],[],$lyx_qt_path)
 	fi
 	if test -z "$$1"; then
 		AC_MSG_ERROR([cannot find $2 binary.])