diff --git a/acinclude.m4 b/acinclude.m4 index 4104b78..666cf5e 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1446,7 +1446,7 @@ fi dnl ------------------------------------------------------------------------ dnl Try to find the Qt headers and libraries. dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed) -dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed) +dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed) dnl ------------------------------------------------------------------------ dnl AC_DEFUN([AC_PATH_TQT_1_3], @@ -1773,10 +1773,10 @@ AC_SUBST(qt_libraries) AC_SUBST(qt_includes) if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then - QT_INCLUDES="" + TQT_INCLUDES="" else - QT_INCLUDES="-I$qt_includes" - all_includes="$QT_INCLUDES $all_includes" + TQT_INCLUDES="-I$qt_includes" + all_includes="$TQT_INCLUDES $all_includes" fi if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then @@ -1787,7 +1787,7 @@ else fi test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS" -AC_SUBST(QT_INCLUDES) +AC_SUBST(TQT_INCLUDES) AC_SUBST(QT_LDFLAGS) AC_PATH_TQT_MOC_UIC @@ -2900,7 +2900,7 @@ dnl all_libraries="$all_libraries $LIBTQT_LDFLAGS" qtlib="$qtlib $LIBTQT_LDFLAGS" LIBTQT_CXXFLAGS="-include tqt.h" all_includes="$all_includes $LIBTQT_CXXFLAGS" - QT_INCLUDES="$QT_INCLUDES $LIBTQT_CXXFLAGS" + TQT_INCLUDES="$TQT_INCLUDES $LIBTQT_CXXFLAGS" KDE_FIND_PATH(tmoc, TQTMOC, [$qt_bindirs], [KDE_TQTMOC_ERROR_MESSAGE]) AC_SUBST(TQTMOC)