Fix FTBFS with TQt3

2 files changed, 9 insertions, 4 deletions

diff --git a/acinclude.m4.in b/acinclude.m4.in
index b485a92..d66d04e 100644
--- a/acinclude.m4.in
+++ b/acinclude.m4.in
@@ -1663,12 +1663,17 @@ if test "$kde_qtver" != "1"; then
     kde_qt_header="Qt/qstyle.h"
   else
     kde_qt_header=qstyle.h
+    kde_tqt_header=ntqstyle.h
   fi
 else
   kde_qt_header=qglobal.h
+  kde_tqt_header=ntqglobal.h
 fi
 
 AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir)
+if test -n "$qt_incdir"; then
+   AC_FIND_FILE($kde_tqt_header, $qt_incdirs, qt_incdir)
+fi
 ac_qt_includes="$qt_incdir"
 
 qt_libdirs=""
@@ -1834,7 +1839,7 @@ AC_REQUIRE([AC_PATH_QT_MOC_UIC])
 
 if test x$ac_uic_supports_libpath = xyes; then
 
-AC_MSG_CHECKING([if UIC has KDE plugins available])
+AC_MSG_CHECKING([if UIC has TDE plugins available])
 AC_CACHE_VAL(kde_cv_uic_plugins,
 [
 cat > actest.ui << EOF
@@ -2029,8 +2034,8 @@ ac_kde_includes="$kde_incdir"
 
 if test -n "$ac_kde_includes" && test ! -r "$ac_kde_includes/$kde_check_header"; then
   AC_MSG_ERROR([
-in the prefix, you've chosen, are no KDE headers installed. This will fail.
-So, check this please and use another prefix!])
+No TDE headers are installed in the chosen prefix. This will fail.
+Please check this and use another prefix if needed!])
 fi
 
 kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/trinity /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/trinity/lib${tdelibsuff} /opt/trinity/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
diff --git a/am_edit b/am_edit
index b457563..58ba215 100644
--- a/am_edit
+++ b/am_edit
@@ -1376,7 +1376,7 @@ sub tag_UIFILES ()
                 $dep_lines .= "$source.h: $sourcedir$source.ui\n";
                 $dep_lines .= "\trm -rf $source.h;\n";
                 if (!$kdeopts{"qtonly"}) {
-                    $dep_lines .= "\t\$(UIC) $sourcedir$source.ui | \$(PERL) -pi -e \"s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g\" >> $source.h ;\n";
+                    $dep_lines .= "\t\$(UIC) $sourcedir$source.ui | \$(PERL) -pi -e \"s,public TQWizard,public KWizard,g; s,#include <tqwizard.h>,#include <kwizard.h>,g\" >> $source.h ;\n";
                 } else {
                     $dep_lines .= "\t\$(UIC) -o $source.h $sourcedir$source.ui\n";
                 }