replaced last convenience class in iconpallete

[features.git] / config / qt.m4

diff --git a/config/qt.m4 b/config/qt.m4
index c7c299ca2e9c9737cb77d37dce3ff3874bbd2f3e..31c97043c119c6e82f0526a078d7aaa7acfea1e6 100644 (file)
--- a/config/qt.m4
+++ b/config/qt.m4
@@ -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,7 +367,14 @@ AC_DEFUN([QT4_CHECK_COMPILE],
                AC_LANG_CPLUSPLUS
                SAVE_CXXFLAGS=$CXXFLAGS
                CXXFLAGS="$CXXFLAGS $QT4_INCLUDES $QT4_LDFLAGS"
-               QT4_TRY_LINK(-lQtCore)
+               for libname in '-lQtCore -lQtGui' \
+                              '-lQtCore4 -lQtGui4'
+               do
+                       QT4_TRY_LINK($libname)
+                       if test -n "$qt4_cv_libname"; then
+                               break;
+                       fi
+               done
                CXXFLAGS=$SAVE_CXXFLAGS
        ])
 
@@ -377,7 +384,6 @@ AC_DEFUN([QT4_CHECK_COMPILE],
                        AC_MSG_ERROR([Cannot compile a simple Qt 4 executable. Check you have the right \$QT4DIR !])
                fi
        else
-               qt4_cv_libname="$qt4_cv_libname -lQtGui -lQt3Support"
                AC_MSG_RESULT([$qt4_cv_libname])
        fi
 ])
@@ -447,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 QtGui Qt3Support; do
+               for i in Qt QtCore QtGui; do
                        QT4_INCLUDES="$QT4_INCLUDES -I$qt4_cv_includes/$i"
                done
        fi