fix some document dialog ui and add some FIXMEs

[lyx.git] / config / qt.m4

diff --git a/config/qt.m4 b/config/qt.m4
index b70ef6215e7196cac68fa1db762b295cc737768f..8944803b4a066bc6824860cf91ce47b7ffa35090 100644 (file)
--- a/config/qt.m4
+++ b/config/qt.m4
@@ -1,8 +1,3 @@
-
-dnl Please leave this alone. I use this file in
-dnl oprofile.
-FATAL=1
-
 dnl find a binary in the path
 AC_DEFUN(QT_FIND_PATH,
 [
@@ -134,9 +129,39 @@ AC_DEFUN(QT_CHECK_COMPILE,
        fi
 ])
 
+dnl get Qt version we're using
+AC_DEFUN(QT_GET_VERSION,
+[
+       AC_CACHE_CHECK([Qt version],lyx_cv_qtversion,
+       [
+               AC_LANG_CPLUSPLUS
+               SAVE_CPPFLAGS=$CPPFLAGS
+               CPPFLAGS="$CPPFLAGS $QT_INCLUDES"
+
+               cat > conftest.$ac_ext <<EOF
+#line __oline__ "configure"
+#include "confdefs.h"
+#include <qglobal.h>
+"%%%"QT_VERSION_STR"%%%"
+EOF
+               lyx_cv_qtversion=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \
+                       grep '^"%%%"'  2>/dev/null | \
+                       sed -e 's/"%%%"//g' -e 's/"//g'`
+               rm -f conftest.$ac_ext
+               CPPFLAGS=$SAVE_CPPFLAGS
+       ])
+ 
+       QT_VERSION=$lyx_cv_qtversion
+       AC_SUBST(QT_VERSION)
+])
+ 
 dnl start here 
 AC_DEFUN(QT_DO_IT_ALL,
 [
+       dnl Please leave this alone. I use this file in
+       dnl oprofile.
+       FATAL=1
+
        AC_ARG_WITH(qt-dir, [  --with-qt-dir           where the root of Qt is installed ],
                [ qt_cv_dir=`eval echo "$withval"/` ])
         
@@ -184,4 +209,6 @@ AC_DEFUN(QT_DO_IT_ALL,
  
        QT_LIB=$qt_cv_libname;
        AC_SUBST(QT_LIB)
+
+       QT_GET_VERSION
 ])