diff options
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 9676e4e..ad094b1 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -239,14 +239,14 @@ AC_DEFUN([KDE_FIND_PATH], fi ]) -AC_DEFUN([KDE_MOC_ERROR_MESSAGE], +AC_DEFUN([KDE_TQMOC_ERROR_MESSAGE], [ - AC_MSG_ERROR([No Qt meta object compiler (moc) found! + AC_MSG_ERROR([No Qt meta object compiler (tqmoc) found! Please check whether you installed Qt correctly. -You need to have a running moc binary. -configure tried to run $ac_cv_path_moc and the test didn't +You need to have a running tqmoc binary. +configure tried to run $ac_cv_path_tqmoc and the test didn't succeed. If configure shouldn't have tried this one, set -the environment variable MOC to the right one before running +the environment variable TQMOC to the right one before running configure. ]) ]) @@ -299,19 +299,19 @@ dnl Find the meta object compiler and the ui compiler in the PATH, dnl in $QTDIR/bin, and some more usual places dnl ------------------------------------------------------------------------ dnl -AC_DEFUN([AC_PATH_QT_MOC_UIC], +AC_DEFUN([AC_PATH_QT_TQMOC_UIC], [ AC_REQUIRE([KDE_CHECK_PERL]) qt_bindirs="" for dir in $kde_qt_dirs; do - qt_bindirs="$qt_bindirs $dir/bin $dir/src/moc" + qt_bindirs="$qt_bindirs $dir/bin $dir/src/tqmoc" done qt_bindirs="$qt_bindirs /usr/bin /usr/X11R6/bin /usr/local/qt/bin" if test ! "$ac_qt_bindir" = "NO"; then qt_bindirs="$ac_qt_bindir $qt_bindirs" fi - KDE_FIND_PATH(moc, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE]) + KDE_FIND_PATH(tqmoc, TQMOC, [$qt_bindirs], [KDE_TQMOC_ERROR_MESSAGE]) if test -z "$UIC_NOT_NEEDED"; then KDE_FIND_PATH(uic, UIC_PATH, [$qt_bindirs], [UIC_PATH=""]) if test -z "$UIC_PATH" ; then @@ -336,7 +336,7 @@ AC_DEFUN([AC_PATH_QT_MOC_UIC], UIC="echo uic not available: " fi - AC_SUBST(MOC) + AC_SUBST(TQMOC) AC_SUBST(UIC) UIC_TR="i18n" @@ -1572,7 +1572,7 @@ test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS" AC_SUBST(QT_INCLUDES) AC_SUBST(QT_LDFLAGS) -AC_PATH_QT_MOC_UIC +AC_PATH_QT_TQMOC_UIC KDE_CHECK_QT_JPEG @@ -1602,7 +1602,7 @@ AC_PATH_QT_1_3 AC_DEFUN([KDE_CHECK_UIC_PLUGINS], [ -AC_REQUIRE([AC_PATH_QT_MOC_UIC]) +AC_REQUIRE([AC_PATH_QT_TQMOC_UIC]) if test x$ac_uic_supports_libpath = xyes; then @@ -1612,7 +1612,7 @@ AC_CACHE_VAL(kde_cv_uic_plugins, cat > actest.ui << EOF <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>NewConnectionDialog</class> -<widget class="QDialog"> +<widget class=TQDIALOG_OBJECT_NAME_STRING> <widget class="KLineEdit"> <property name="name"> <cstring>testInput</cstring> |