Le 07/07/2016 à 09:39, Jean-Marc Lasgouttes a écrit :
M'y fault indeed. I'll fix it ASAP.
What about this?
JMarc
JMarc
Le 6 juillet 2016 21:52:42 GMT+02:00, Enrico Forestieri <for...@lyx.org> a
écrit :
Rather, there is now another problem with Qt5. Until now it was not
mandatory having the Qt5 binaries in the PATH. Indeed, specifying
--with-qt-dir sufficed for finding them.
>From d7881b66fb65e8f568d189f618462a17f0c643ff Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgout...@lyx.org>
Date: Thu, 7 Jul 2016 12:20:26 +0200
Subject: [PATCH] Keep the full path for Qt tools
This is required when moc and friends are not in path, and it was a
mistake to emove that in d0449867.
For some reason however, I cannot get AC_PATH_PROG to test a programs
with argument: the argument is actually lost, which defeats the
purpose. Therefore I add it back afterwards, but it does not show on output.
---
config/qt4.m4 | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/config/qt4.m4 b/config/qt4.m4
index 14390f8..1e99f50 100644
--- a/config/qt4.m4
+++ b/config/qt4.m4
@@ -78,10 +78,13 @@ AC_DEFUN([QT_FIND_TOOL],
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])
+ AC_PATH_PROG($1, $2, [], [$lyx_qt_path])
+ dnl for some reason I cannot pass the parameter above
+ dnl therefore the check result will not show it.
+ $1="$$1 -qt=$qt_ext"
fi
if test -z "$$1"; then
- AC_CHECK_PROGS($1, [$2-$qt_ext $2],[],$lyx_qt_path)
+ AC_PATH_PROGS($1, [$2-$qt_ext $2],[],$lyx_qt_path)
fi
if test -z "$$1"; then
AC_MSG_ERROR([cannot find $2 binary.])
--
2.7.4
