anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +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 committed by Vincent van Ravesteijn
parent c0ea37f337
commit b58b8e7c73
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
config/qt4.m4
View File

@ -58,6 +58,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],
[
@ -144,18 +160,9 @@ AC_DEFUN([QT4_DO_IT_ALL],
[AC_MSG_ERROR([LyX requires at least version $1 of Qt. Only version $QT4_VERSION has been found.])
])
AC_PATH_PROGS(MOC4, [moc-qt4 moc],[],$qt4_cv_bin:$PATH)
if test -z "$MOC4"; then
AC_MSG_ERROR([cannot find moc binary.])
fi
AC_PATH_PROGS(UIC4, [uic-qt4 uic],[],$qt4_cv_bin:$PATH)
if test -z "$UIC4"; then
AC_MSG_ERROR([cannot find uic binary.])
fi
AC_PATH_PROGS(RCC4, [rcc-qt4 rcc],[],$qt4_cv_bin:$PATH)
if test -z "$RCC4"; then
AC_MSG_ERROR([cannot find rcc binary.])
fi
QT4_FIND_TOOL([MOC4], [moc])
QT4_FIND_TOOL([UIC4], [uic])
QT4_FIND_TOOL([RCC4], [rcc])
])
AC_DEFUN([QT4_DO_PKG_CONFIG],