diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-26 02:04:25 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-26 02:04:25 +0000 |
| commit | 68b791fab128b1c34d1a817c8cb886f61654d8d6 (patch) | |
| tree | 1b38fecde378663ccd8c1cb4b218a12f97493c50 /admin/acinclude.m4.in | |
| parent | 02c3c4f89b77ec29d5cda6852c9b6019a90be70f (diff) | |
| download | other-68b791fab128b1c34d1a817c8cb886f61654d8d6.tar.gz other-68b791fab128b1c34d1a817c8cb886f61654d8d6.zip | |
First attempt at getting TQT integrated...
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kde-common@1154613 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'admin/acinclude.m4.in')
| -rw-r--r-- | admin/acinclude.m4.in | 34 |
1 files changed, 33 insertions, 1 deletions
diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in index 2c44123..f1c8062 100644 --- a/admin/acinclude.m4.in +++ b/admin/acinclude.m4.in @@ -251,6 +251,18 @@ configure. ]) ]) +AC_DEFUN([KDE_TQTMOC_ERROR_MESSAGE], +[ + AC_MSG_ERROR([No Trinity Qt meta object compiler (moc-tqt) found! +Please check whether you installed the Trinity Qt Interface correctly. +You need to have a running moc-tqt binary. +configure tried to run $ac_cv_path_moc and the test didn't +succeed. If configure shouldn't have tried this one, set +the environment variable TQTMOC to the right one before running +configure. +]) +]) + AC_DEFUN([KDE_UIC_ERROR_MESSAGE], [ AC_MSG_WARN([No Qt ui compiler (uic) found! @@ -2773,12 +2785,32 @@ AC_LANG_RESTORE if eval "test ! \"`echo $kde_cv_tqt`\" = no"; then AC_MSG_RESULT(no) -dnl AC_MSG_ERROR([You are attempting to compile Trinity without the Trinity Qt Interface installed. Please install libtqtinterface-dev and try again!]) + AC_MSG_ERROR([You are attempting to compile Trinity without the Trinity Qt Interface installed. Please install libtqtinterface-dev and try again!]) else AC_MSG_RESULT(yes) LIBTQT_LDFLAGS="-ltqt" all_libraries="$all_libraries $LIBTQT_LDFLAGS" QT_LDFLAGS="$QT_LDFLAGS $LIBTQT_LDFLAGS" + LIBTQT_CXXFLAGS="-include tqt.h" + all_includes="$all_includes $LIBTQT_CXXFLAGS" + QT_INCLUDES="$QT_INCLUDES $LIBTQT_CXXFLAGS" + + KDE_FIND_PATH(moc-tqt, TQTMOC, [$qt_bindirs], [KDE_TQTMOC_ERROR_MESSAGE]) + AC_SUBST(TQTMOC) + + KDE_FIND_PATH(dcopidl-tqt, TQTDCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl-tqt)]) + KDE_FIND_PATH(dcopidl2cpp-tqt, TQTDCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp-tqt)]) + if test "$build_arts" '!=' "no"; then + KDE_FIND_PATH(mcopidl-tqt, TQTMCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl-tqt)]) + fi + if test -n "$kde32ornewer"; then + KDE_FIND_PATH(dcopidlng-tqt, TQTDCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng-tqt)]) + fi + + AC_SUBST(TQTDCOPIDL) + AC_SUBST(TQTMCOPIDL) + AC_SUBST(TQTDCOPIDLNG) + AC_SUBST(TQTDCOPIDL2CPP) fi ]) |