Fix FTBFS with TQt3

pull/1/head
Timothy Pearson 12 years ago
parent 8dda14c151
commit b388be75f5

@ -1663,12 +1663,17 @@ if test "$kde_qtver" != "1"; then
kde_qt_header="Qt/qstyle.h" kde_qt_header="Qt/qstyle.h"
else else
kde_qt_header=qstyle.h kde_qt_header=qstyle.h
kde_tqt_header=ntqstyle.h
fi fi
else else
kde_qt_header=qglobal.h kde_qt_header=qglobal.h
kde_tqt_header=ntqglobal.h
fi fi
AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir) 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" ac_qt_includes="$qt_incdir"
qt_libdirs="" qt_libdirs=""
@ -1834,7 +1839,7 @@ AC_REQUIRE([AC_PATH_QT_MOC_UIC])
if test x$ac_uic_supports_libpath = xyes; then 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, AC_CACHE_VAL(kde_cv_uic_plugins,
[ [
cat > actest.ui << EOF 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 if test -n "$ac_kde_includes" && test ! -r "$ac_kde_includes/$kde_check_header"; then
AC_MSG_ERROR([ AC_MSG_ERROR([
in the prefix, you've chosen, are no KDE headers installed. This will fail. No TDE headers are installed in the chosen prefix. This will fail.
So, check this please and use another prefix!]) Please check this and use another prefix if needed!])
fi 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}" 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}"

@ -1376,7 +1376,7 @@ sub tag_UIFILES ()
$dep_lines .= "$source.h: $sourcedir$source.ui\n"; $dep_lines .= "$source.h: $sourcedir$source.ui\n";
$dep_lines .= "\trm -rf $source.h;\n"; $dep_lines .= "\trm -rf $source.h;\n";
if (!$kdeopts{"qtonly"}) { 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 { } else {
$dep_lines .= "\t\$(UIC) -o $source.h $sourcedir$source.ui\n"; $dep_lines .= "\t\$(UIC) -o $source.h $sourcedir$source.ui\n";
} }

Loading…
Cancel
Save