anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-19 22:40:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Qt tools search when a Qt directory has been specified

Browse Source 
When --with-qt-dir has been specified, programs like "moc" in the Qt
directory are unlikely to have a qualified name like moc-qt4.
Therefore, such qualified names are only considered when the base
version has not been found.
This commit is contained in:
Jean-Marc Lasgouttes 2013-07-09 17:20:25 +02:00
parent db8abfec04
commit b2e76d22d5
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
config/qt4.m4
View File

@ -59,6 +59,22 @@ AC_DEFUN([QT4_CHECK_COMPILE],
fi
])
AC_DEFUN([QT4_FIND_TOOL],
[
$1=
if test -n "$qt4_cv_bin" ; then
AC_PATH_PROGS($1, [$2], [], $qt4_cv_bin)
fi
if test -z "$$1"; then
AC_PATH_PROGS($1, [$2-qt4 $2],[],$PATH)
fi
if test -z "$$1"; then
AC_MSG_ERROR([cannot find $2 binary.])
fi
])
dnl get Qt version we're using
AC_DEFUN([QT4_GET_VERSION],
[
@ -139,9 +155,10 @@ AC_DEFUN([QT4_DO_IT_ALL],
if test "$pkg_failed" != "no" ; then
QT4_DO_MANUAL_CONFIG
fi
AC_PATH_PROGS(MOC4, [moc-qt4 moc],[],$qt4_cv_bin:$PATH)
AC_PATH_PROGS(UIC4, [uic-qt4 uic],[],$qt4_cv_bin:$PATH)
AC_PATH_PROGS(RCC4, [rcc-qt4 rcc],[],$qt4_cv_bin:$PATH)
QT4_FIND_TOOL([MOC4], [moc])
QT4_FIND_TOOL([UIC4], [uic])
QT4_FIND_TOOL([RCC4], [rcc])
])
AC_DEFUN([QT4_DO_PKG_CONFIG],

2
status.20x
View File

@ -118,3 +118,5 @@ What's new
- Add support for automake 1.13.
- Fix compilation with clang LLVM compiler.
- Fix Qt tools search when a Qt directory has been specified.