Fig bug 3335 (http://bugzilla.lyx.org/show_bug.cgi?id=3335)

[lyx.git] / config / qt.m4

diff --git a/config/qt.m4 b/config/qt.m4
index 9327c4c43265c7fd2c323a2582bfdf45e06bbd71..1e548eb90a3ba2dc1fabff7ff1f0a11a391875b8 100644 (file)
--- a/config/qt.m4
+++ b/config/qt.m4
@@ -1,5 +1,5 @@
 dnl find a binary in the path
-AC_DEFUN(QT_FIND_PATH,
+AC_DEFUN([QT_FIND_PATH],
 [
        AC_MSG_CHECKING([for $1])
        AC_CACHE_VAL(qt_cv_path_$1,
@@ -43,16 +43,23 @@ AC_DEFUN(QT_FIND_PATH,
 ])
 
 dnl Find the uic compiler on the path or in qt_cv_dir
-AC_DEFUN(QT_FIND_UIC,
+AC_DEFUN([QT_FIND_UIC],
 [
        QT_FIND_PATH(uic, ac_uic, $qt_cv_dir/bin)
        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
-AC_DEFUN(QT_FIND_MOC,
+AC_DEFUN([QT_FIND_MOC],
 [
        QT_FIND_PATH(moc2, ac_moc2, $qt_cv_dir/bin)
        QT_FIND_PATH(moc, ac_moc1, $qt_cv_dir/bin)
@@ -79,7 +86,7 @@ AC_DEFUN(QT_FIND_MOC,
 ])
 
 dnl check a particular libname
-AC_DEFUN(QT_TRY_LINK,
+AC_DEFUN([QT_TRY_LINK],
 [
        SAVE_LIBS="$LIBS"
        LIBS="$LIBS $1"
@@ -89,7 +96,7 @@ AC_DEFUN(QT_TRY_LINK,
                ],
        [
        QString s("mangle_failure");
-       #if (QT_VERSION < 221)
+       #if (QT_VERSION < 0x030000)
        break_me_(\\\);
        #endif
        ],
@@ -99,7 +106,7 @@ AC_DEFUN(QT_TRY_LINK,
 ])
 
 dnl check we can do a compile
-AC_DEFUN(QT_CHECK_COMPILE,
+AC_DEFUN([QT_CHECK_COMPILE],
 [
        AC_MSG_CHECKING([for Qt library name])
 
@@ -109,7 +116,7 @@ AC_DEFUN(QT_CHECK_COMPILE,
                SAVE_CXXFLAGS=$CXXFLAGS
                CXXFLAGS="$CXXFLAGS $QT_INCLUDES $QT_LDFLAGS"
 
-               for libname in -lqt-mt -lqt3 -lqt2 -lqt;
+               for libname in -lqt-mt -lqt;
                do
                        QT_TRY_LINK($libname)
                        if test -n "$qt_cv_libname"; then
@@ -131,7 +138,7 @@ AC_DEFUN(QT_CHECK_COMPILE,
 ])
 
 dnl get Qt version we're using
-AC_DEFUN(QT_GET_VERSION,
+AC_DEFUN([QT_GET_VERSION],
 [
        AC_CACHE_CHECK([Qt version],lyx_cv_qtversion,
        [
@@ -156,9 +163,46 @@ EOF
        AC_SUBST(QT_VERSION)
 ])
 
+dnl Ascertain whether the Qt libraries are multi-threaded or not
+AC_DEFUN([QT_CHECK_IS_MULTITHREADED],
+[
+       AC_CACHE_CHECK([whether the Qt library is multi-threaded],
+                      qt_cv_is_multithreaded,
+       [
+               AC_LANG_CPLUSPLUS
+               SAVE_CXXFLAGS=$CXXFLAGS
+               SAVE_LIBS="$LIBS"
+               CXXFLAGS="$CXXFLAGS $QT_INCLUDES $QT_LDFLAGS"
+               LIBS="$LIBS $QT_LIB"
+
+               AC_TRY_LINK(
+               [
+#define QT_THREAD_SUPPORT
+#include <qapplication.h>
+               ],
+               [
+       QApplication a(0,0);
+       a.unlock();
+               ],
+               qt_cv_is_multithreaded=yes,
+               qt_cv_is_multithreaded=no
+               )
+
+               LIBS="$SAVE_LIBS"
+               CXXFLAGS=$SAVE_CXXFLAGS
+       ])
+
+       if test x"$qt_cv_is_multithreaded" = xyes; then
+               QT_CPPFLAGS="$QT_CPPFLAGS -DQT_THREAD_SUPPORT"
+       fi
+])
+
 dnl start here
-AC_DEFUN(QT_DO_IT_ALL,
+AC_DEFUN([QT_DO_IT_ALL],
 [
+       dnl this variable is precious
+       AC_ARG_VAR(QTDIR, [the place where the Qt files are, e.g. /usr/lib/qt])
+
        dnl Please leave this alone. I use this file in
        dnl oprofile.
        FATAL=0
@@ -199,11 +243,30 @@ AC_DEFUN(QT_DO_IT_ALL,
        AC_SUBST(QT_INCLUDES)
        AC_SUBST(QT_LDFLAGS)
 
-       QT_FIND_MOC
-       MOC=$ac_moc
+       dnl Preprocessor flags
+       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
+               QT_FIND_MOC
+               MOC=$ac_moc
+       fi
        AC_SUBST(MOC)
-       QT_FIND_UIC
-       UIC=$ac_uic
+       if test -z "$UIC"; then
+               QT_FIND_UIC
+               UIC=$ac_uic
+       fi
        AC_SUBST(UIC)
 
        QT_CHECK_COMPILE
@@ -211,6 +274,8 @@ AC_DEFUN(QT_DO_IT_ALL,
        QT_LIB=$qt_cv_libname;
        AC_SUBST(QT_LIB)
 
+       QT_CHECK_IS_MULTITHREADED
+
        if test -n "$qt_cv_libname"; then
                QT_GET_VERSION
        fi