Small fixes for STLPort compliance

[lyx.git] / config / qt.m4

diff --git a/config/qt.m4 b/config/qt.m4
index bb0270cf41849d401163022df3fb21bfcd89beb8..6e220787364aa2f6f39847c5eb6c11083c3f8844 100644 (file)
--- a/config/qt.m4
+++ b/config/qt.m4
@@ -49,6 +49,13 @@ AC_DEFUN([QT_FIND_UIC],
        if test -z "$ac_uic" -a "$FATAL" = 1; then
                AC_MSG_ERROR([uic binary not found in \$PATH or $qt_cv_dir/bin !])
        fi
+       AC_MSG_CHECKING([whether uic supports -nounload])
+       if $ac_uic --help 2>&1 | grep nounload >/dev/null ; then
+               AC_MSG_RESULT([yes])
+               ac_uic="$ac_uic -nounload"
+       else
+               AC_MSG_RESULT([no])
+       fi
 ])
 
 dnl Find the right moc in path/qt_cv_dir
@@ -89,7 +96,7 @@ AC_DEFUN([QT_TRY_LINK],
                ],
        [
        QString s("mangle_failure");
-       #if (QT_VERSION < 221)
+       #if (QT_VERSION < 0x030000)
        break_me_(\\\);
        #endif
        ],
@@ -237,10 +244,18 @@ AC_DEFUN([QT_DO_IT_ALL],
        AC_SUBST(QT_LDFLAGS)
 
        dnl Preprocessor flags
-       QT_CPPFLAGS="-DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_STL"
+       QT_CPPFLAGS="-DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_STL -DQT_NO_EMIT"
        case ${host} in
        *mingw*) QT_CPPFLAGS="-DQT_DLL $QT_CPPFLAGS";;
        esac
+
+       case ${host_os} in
+       cygwin* ) 
+               if test "x$with_x" = xno ; then 
+                       QT_CPPFLAGS="$QT_CPPFLAGS -DQ_CYGWIN_WIN"
+               fi;;
+       esac
+
        AC_SUBST(QT_CPPFLAGS)
 
        if test -z "$MOC"; then