diff --git a/acinclude.m4 b/acinclude.m4 index 21ce9cf..7c3b9dc 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1262,7 +1262,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], @@ -1532,10 +1532,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 @@ -1546,7 +1546,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 diff --git a/aclocal.m4 b/aclocal.m4 index 02c6863..5d0bd77 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1274,7 +1274,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], @@ -1544,10 +1544,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 @@ -1558,7 +1558,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 diff --git a/ksystemlog/po/Makefile b/ksystemlog/po/Makefile index 016e509..73f5fcc 100644 --- a/ksystemlog/po/Makefile +++ b/ksystemlog/po/Makefile @@ -155,7 +155,7 @@ PACKAGE_VERSION = PATH_SEPARATOR = : PERL = /usr/bin/perl QTE_NORTTI = -QT_INCLUDES = -I/usr/share/qt3/include +TQT_INCLUDES = -I/usr/share/qt3/include QT_LDFLAGS = -L/usr/share/qt3/lib RANLIB = ranlib SET_MAKE =