diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-01 14:12:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-01 14:12:05 -0600 |
| commit | b388be75f5047b0c1718ef2d6749a7bde6991db9 (patch) | |
| tree | 06c50ef9ad5e595d3e69e27070ef1b6f7bc919fd /acinclude.m4.in | |
| parent | 8dda14c1519bf5376c4b1cb21173f3e95adb1ae7 (diff) | |
| download | admin-b388be75f5047b0c1718ef2d6749a7bde6991db9.tar.gz admin-b388be75f5047b0c1718ef2d6749a7bde6991db9.zip | |
Fix FTBFS with TQt3
Diffstat (limited to 'acinclude.m4.in')
| -rw-r--r-- | acinclude.m4.in | 11 |
1 files changed, 8 insertions, 3 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}" |