Use tqmoc directly instead of tmoc

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/35/head
Michele Calgaro 2 weeks ago
parent 9e0d473a4d
commit e45962e5cb
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -256,9 +256,9 @@ configure.
AC_DEFUN([KDE_TQTMOC_ERROR_MESSAGE],
[
AC_MSG_ERROR([No Trinity TQt meta object compiler (tmoc) found!
AC_MSG_ERROR([No Trinity TQt meta object compiler (tqmoc) found!
Please check whether you installed the Trinity TQt Interface correctly.
You need to have a running tmoc binary.
You need to have a running tqmoc 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
@ -319,7 +319,7 @@ AC_DEFUN([AC_PATH_TQT_MOC_UIC],
AC_REQUIRE([KDE_CHECK_PERL])
tqt_bindirs=""
for dir in $kde_tqt_dirs; do
tqt_bindirs="$tqt_bindirs $dir/bin $dir/src/moc"
tqt_bindirs="$tqt_bindirs $dir/bin $dir/src/tqmoc"
done
tqt_bindirs="$tqt_bindirs /usr/bin /usr/X11R6/bin /usr/local/tqt/bin"
if test ! "$ac_tqt_bindir" = "NO"; then
@ -2476,7 +2476,7 @@ 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 TQt Interface installed. Please install libtqtinterface-dev and try again!])
AC_MSG_WARN([You are attempting to compile Trinity without the Trinity TQt Interface installed. Please install libtqtinterface-dev and try again!])
TQTMOC="\$PATH=\$PATH:\$(srcdir)/ tmoc"
TQTMOC="\$PATH=\$PATH:\$(srcdir)/ tqmoc"
LIBTQT_LDFLAGS="-ltqt"
AC_SUBST(LIBTQT_LDFLAGS)
tqtlib="$tqtlib $LIBTQT_LDFLAGS"
@ -2492,7 +2492,7 @@ dnl all_libraries="$all_libraries $LIBTQT_LDFLAGS"
all_includes="$all_includes $LIBTQT_CXXFLAGS"
TQT_INCLUDES="$TQT_INCLUDES $LIBTQT_CXXFLAGS"
KDE_FIND_PATH(tmoc, TQTMOC, [$tqt_bindirs], [KDE_TQTMOC_ERROR_MESSAGE])
KDE_FIND_PATH(tqmoc, TQTMOC, [$tqt_bindirs], [KDE_TQTMOC_ERROR_MESSAGE])
AC_SUBST(TQTMOC)
KDE_FIND_PATH(dcopidl, TQTDCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)])

Loading…
Cancel
Save