diff options
| author | Timothy Pearson <[email protected]> | 2011-11-18 01:15:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-11-18 01:15:47 -0600 |
| commit | 21cb4a9d2a0e083b10dee6d22958c4f58de6c5b2 (patch) | |
| tree | e5ad1417833a6d9fbdcd8cbc9e0c9f4ee35ef3ad | |
| parent | 695f133cedd0b6cc48534e8a9a959f086fd79376 (diff) | |
| download | admin-21cb4a9d2a0e083b10dee6d22958c4f58de6c5b2.tar.gz admin-21cb4a9d2a0e083b10dee6d22958c4f58de6c5b2.zip | |
Fix native TQt3 detection
| -rw-r--r-- | acinclude.m4.in | 46 |
1 files changed, 44 insertions, 2 deletions
diff --git a/acinclude.m4.in b/acinclude.m4.in index a4cc24e..196d38a 100644 --- a/acinclude.m4.in +++ b/acinclude.m4.in @@ -1149,10 +1149,17 @@ EOF fi if test "$kde_qtver" = "3"; then +if $PKG_CONFIG --exists qt-mt ; then cat >> conftest.$ac_ext <<EOF #include <qglobal.h> #include <qapplication.h> EOF +else +cat >> conftest.$ac_ext <<EOF +#include <tqglobal.h> +#include <tqapplication.h> +EOF +fi fi if test "$kde_qtver" = "2"; then @@ -1172,11 +1179,19 @@ fi fi if test "$kde_qtver" = "3"; then +if $PKG_CONFIG --exists qt-mt ; then cat >> conftest.$ac_ext <<EOF #include <qcursor.h> #include <qstylefactory.h> #include <private/qucomextra_p.h> EOF +else +cat >> conftest.$ac_ext <<EOF +#include <tqcursor.h> +#include <tqstylefactory.h> +#include <tqucomextra_p.h> +EOF +fi fi if test "$kde_qtver" = "4"; then @@ -1206,10 +1221,17 @@ EOF fi fi if test "$kde_qtver" = "3"; then +if $PKG_CONFIG --exists qt-mt ; then cat >> conftest.$ac_ext <<EOF (void)QStyleFactory::create(QString::null); QCursor c(Qt::WhatsThisCursor); EOF +else +cat >> conftest.$ac_ext <<EOF + (void)TQStyleFactory::create(TQString::null); + TQCursor c(TQt::WhatsThisCursor); +EOF +fi fi if test "$kde_qtver" = "4"; then cat >> conftest.$ac_ext <<EOF @@ -1356,6 +1378,10 @@ if test $kde_qtver = 3; then if test "$PKG_CONFIG" != "no" ; then if $PKG_CONFIG --exists qt-mt ; then kde_qt_dirs="$kde_qt_dirs `$PKG_CONFIG --variable=prefix qt-mt`" + else + if $PKG_CONFIG --exists tqt-mt ; then + kde_qt_dirs="$kde_qt_dirs `$PKG_CONFIG --variable=prefix tqt-mt`" + fi fi fi fi @@ -1491,7 +1517,11 @@ if test -z "$LIBQT_GLOB"; then if test "x$kde_use_qt_emb" = "xyes"; then LIBQT_GLOB="libqte.*" else - LIBQT_GLOB="libqt.*" + if $PKG_CONFIG --exists qt-mt ; then + LIBQT_GLOB="libqt.*" + else + LIBQT_GLOB="libtqt.*" + fi fi fi fi @@ -1507,7 +1537,11 @@ if test "$kde_qtver" = "3"; then if test "x$kde_use_qt_emb" = "xyes"; then qtlib="qte" else - qtlib="qt" + if $PKG_CONFIG --exists qt-mt ; then + qtlib="qt" + else + qtlib="tqt" + fi fi fi @@ -1606,6 +1640,10 @@ fi if test "$PKG_CONFIG" != "no" ; then if $PKG_CONFIG --exists qt-mt ; then qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir qt-mt`" + else + if $PKG_CONFIG --exists tqt-mt ; then + qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir tqt-mt`" + fi fi fi qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/tqt3 /usr/include/qt3 $x_includes" @@ -1636,6 +1674,10 @@ fi if test "$PKG_CONFIG" != "no" ; then if $PKG_CONFIG --exists qt-mt ; then qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir qt-mt`" + else + if $PKG_CONFIG --exists tqt-mt ; then + qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir tqt-mt`" + fi fi fi qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" |