diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-16 18:01:40 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-16 18:01:40 +0000 |
commit | 02c3c4f89b77ec29d5cda6852c9b6019a90be70f (patch) | |
tree | 5719edb8e3c365523d0f0e4c2af793e8c4f3e92f /admin | |
parent | 614d11e5a1228a9ef48e45613dfb6cfd7873ee49 (diff) | |
download | other-02c3c4f89b77ec29d5cda6852c9b6019a90be70f.tar.gz other-02c3c4f89b77ec29d5cda6852c9b6019a90be70f.zip |
Find the correct moc binary...
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kde-common@1150780 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'admin')
-rw-r--r-- | admin/acinclude.m4.in | 8 |
1 files changed, 8 insertions, 0 deletions
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=""]) |