From 02c3c4f89b77ec29d5cda6852c9b6019a90be70f Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 16 Jul 2010 18:01:40 +0000 Subject: [PATCH] Find the correct moc binary... git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kde-common@1150780 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- admin/acinclude.m4.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in index a82b560..2c44123 100644 --- a/admin/acinclude.m4.in +++ b/admin/acinclude.m4.in @@ -311,6 +311,14 @@ AC_DEFUN([AC_PATH_QT_MOC_UIC], qt_bindirs="$ac_qt_bindir $qt_bindirs" fi + if test "$kde_qtver" = "3"; then + qt_bindirs="/usr/share/qt3/bin $qt_bindirs" + fi + + if test "$kde_qtver" = "4"; then + qt_bindirs="/usr/share/qt4/bin $qt_bindirs" + fi + KDE_FIND_PATH(moc, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE]) if test -z "$UIC_NOT_NEEDED"; then KDE_FIND_PATH(uic, UIC_PATH, [$qt_bindirs], [UIC_PATH=""])