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 9e226aa19920b755de44066842e047ffb672790d..8944803b4a066bc6824860cf91ce47b7ffa35090 100644 (file)
--- a/config/qt.m4
+++ b/config/qt.m4
@@ -129,6 +129,32 @@ 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,
 [
@@ -183,4 +209,6 @@ AC_DEFUN(QT_DO_IT_ALL,
  
        QT_LIB=$qt_cv_libname;
        AC_SUBST(QT_LIB)
+
+       QT_GET_VERSION
 ])