]> git.lyx.org Git - features.git/blobdiff - config/qt.m4
replaced last convenience class in iconpallete
[features.git] / config / qt.m4
index 525979dc848516f01c8b8b17a189e394f7576cc2..31c97043c119c6e82f0526a078d7aaa7acfea1e6 100644 (file)
@@ -96,7 +96,7 @@ AC_DEFUN([QT_TRY_LINK],
                ],
        [
        QString s("mangle_failure");
-       #if (QT_VERSION < 221)
+       #if (QT_VERSION < 0x030000)
        break_me_(\\\);
        #endif
        ],
@@ -367,8 +367,8 @@ AC_DEFUN([QT4_CHECK_COMPILE],
                AC_LANG_CPLUSPLUS
                SAVE_CXXFLAGS=$CXXFLAGS
                CXXFLAGS="$CXXFLAGS $QT4_INCLUDES $QT4_LDFLAGS"
-               for libname in '-lQtCore -lQtGui -lQtXml -lQt3Support' \
-                              '-lQtCore4 -lQtGui4 -lQtXml4 -lQt3Support4'
+               for libname in '-lQtCore -lQtGui' \
+                              '-lQtCore4 -lQtGui4'
                do
                        QT4_TRY_LINK($libname)
                        if test -n "$qt4_cv_libname"; then
@@ -453,7 +453,7 @@ AC_DEFUN([QT4_DO_IT_ALL],
        QT4_LDFLAGS=
        if test -n "$qt4_cv_includes"; then
                QT4_INCLUDES="-I$qt4_cv_includes"
-               for i in Qt QtCore QtGui Qt3Support; do
+               for i in Qt QtCore QtGui; do
                        QT4_INCLUDES="$QT4_INCLUDES -I$qt4_cv_includes/$i"
                done
        fi