diff --git a/koffice-i18n-bg/acinclude.m4 b/koffice-i18n-bg/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-bg/acinclude.m4
+++ b/koffice-i18n-bg/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-ca/acinclude.m4 b/koffice-i18n-ca/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-ca/acinclude.m4
+++ b/koffice-i18n-ca/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-cs/acinclude.m4 b/koffice-i18n-cs/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-cs/acinclude.m4
+++ b/koffice-i18n-cs/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-cy/acinclude.m4 b/koffice-i18n-cy/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-cy/acinclude.m4
+++ b/koffice-i18n-cy/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-da/acinclude.m4 b/koffice-i18n-da/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-da/acinclude.m4
+++ b/koffice-i18n-da/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-de/acinclude.m4 b/koffice-i18n-de/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-de/acinclude.m4
+++ b/koffice-i18n-de/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-el/acinclude.m4 b/koffice-i18n-el/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-el/acinclude.m4
+++ b/koffice-i18n-el/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-en_GB/acinclude.m4 b/koffice-i18n-en_GB/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-en_GB/acinclude.m4
+++ b/koffice-i18n-en_GB/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-es/acinclude.m4 b/koffice-i18n-es/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-es/acinclude.m4
+++ b/koffice-i18n-es/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-et/acinclude.m4 b/koffice-i18n-et/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-et/acinclude.m4
+++ b/koffice-i18n-et/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-eu/acinclude.m4 b/koffice-i18n-eu/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-eu/acinclude.m4
+++ b/koffice-i18n-eu/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-fa/acinclude.m4 b/koffice-i18n-fa/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-fa/acinclude.m4
+++ b/koffice-i18n-fa/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-fi/acinclude.m4 b/koffice-i18n-fi/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-fi/acinclude.m4
+++ b/koffice-i18n-fi/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-fr/acinclude.m4 b/koffice-i18n-fr/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-fr/acinclude.m4
+++ b/koffice-i18n-fr/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-ga/acinclude.m4 b/koffice-i18n-ga/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-ga/acinclude.m4
+++ b/koffice-i18n-ga/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-gl/acinclude.m4 b/koffice-i18n-gl/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-gl/acinclude.m4
+++ b/koffice-i18n-gl/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-hu/acinclude.m4 b/koffice-i18n-hu/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-hu/acinclude.m4
+++ b/koffice-i18n-hu/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-it/acinclude.m4 b/koffice-i18n-it/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-it/acinclude.m4
+++ b/koffice-i18n-it/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-ja/acinclude.m4 b/koffice-i18n-ja/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-ja/acinclude.m4
+++ b/koffice-i18n-ja/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-km/acinclude.m4 b/koffice-i18n-km/acinclude.m4
index ca8a6a24..dcce5d84 100644
--- a/koffice-i18n-km/acinclude.m4
+++ b/koffice-i18n-km/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-lv/acinclude.m4 b/koffice-i18n-lv/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-lv/acinclude.m4
+++ b/koffice-i18n-lv/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-ms/acinclude.m4 b/koffice-i18n-ms/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-ms/acinclude.m4
+++ b/koffice-i18n-ms/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-nb/acinclude.m4 b/koffice-i18n-nb/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-nb/acinclude.m4
+++ b/koffice-i18n-nb/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-nds/acinclude.m4 b/koffice-i18n-nds/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-nds/acinclude.m4
+++ b/koffice-i18n-nds/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-ne/acinclude.m4 b/koffice-i18n-ne/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-ne/acinclude.m4
+++ b/koffice-i18n-ne/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-nl/acinclude.m4 b/koffice-i18n-nl/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-nl/acinclude.m4
+++ b/koffice-i18n-nl/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-pl/acinclude.m4 b/koffice-i18n-pl/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-pl/acinclude.m4
+++ b/koffice-i18n-pl/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-pt/acinclude.m4 b/koffice-i18n-pt/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-pt/acinclude.m4
+++ b/koffice-i18n-pt/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-pt_BR/acinclude.m4 b/koffice-i18n-pt_BR/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-pt_BR/acinclude.m4
+++ b/koffice-i18n-pt_BR/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-ru/acinclude.m4 b/koffice-i18n-ru/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-ru/acinclude.m4
+++ b/koffice-i18n-ru/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-sk/acinclude.m4 b/koffice-i18n-sk/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-sk/acinclude.m4
+++ b/koffice-i18n-sk/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-sl/acinclude.m4 b/koffice-i18n-sl/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-sl/acinclude.m4
+++ b/koffice-i18n-sl/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-sr/acinclude.m4 b/koffice-i18n-sr/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-sr/acinclude.m4
+++ b/koffice-i18n-sr/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-sr@Latn/acinclude.m4 b/koffice-i18n-sr@Latn/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-sr@Latn/acinclude.m4
+++ b/koffice-i18n-sr@Latn/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-sv/acinclude.m4 b/koffice-i18n-sv/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-sv/acinclude.m4
+++ b/koffice-i18n-sv/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-tr/acinclude.m4 b/koffice-i18n-tr/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-tr/acinclude.m4
+++ b/koffice-i18n-tr/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-uk/acinclude.m4 b/koffice-i18n-uk/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-uk/acinclude.m4
+++ b/koffice-i18n-uk/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-zh_CN/acinclude.m4 b/koffice-i18n-zh_CN/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-zh_CN/acinclude.m4
+++ b/koffice-i18n-zh_CN/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi
diff --git a/koffice-i18n-zh_TW/acinclude.m4 b/koffice-i18n-zh_TW/acinclude.m4
index c8c8fcb8..5562f152 100644
--- a/koffice-i18n-zh_TW/acinclude.m4
+++ b/koffice-i18n-zh_TW/acinclude.m4
@@ -2023,7 +2023,7 @@ For more details about this problem, look at the end of config.log.])
 AC_DEFUN([KDE_CHECK_KDEQTADDON],
 [
 AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
 [
  kde_ldflags_safe="$LDFLAGS"
  kde_libs_safe="$LIBS"
@@ -2039,8 +2039,8 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  [
    QDomDocument doc;
  ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
+  kde_cv_have_kdetqtaddon=yes,
+  kde_cv_have_kdetqtaddon=no
  )
 
  LDFLAGS=$kde_ldflags_safe
@@ -2048,9 +2048,9 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  CXXFLAGS=$kde_cxxflags_safe
 ])
 
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
 
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
   AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
 It is a separate package (and CVS module) named kde-qt-addon.])
 fi