fix some document dialog ui and add some FIXMEs

[lyx.git] / config / configure.in

diff --git a/config/configure.in b/config/configure.in
index 5bb3a79e5d84e9468c66dfb4c2f1fe9796fef71f..58058744831d020886fb482db29e71437fb5aff1 100644 (file)
--- a/config/configure.in
+++ b/config/configure.in
@@ -190,17 +190,23 @@ case "$lyx_use_frontend" in
     FRONTEND_LDFLAGS="${GNOME_FRONTEND_LIBS}"
     FRONTEND_INCLUDES="-I\${srcdir}/gnome -I\${srcdir}/xforms ${GNOME_FRONTEND_CFLAGS} "
     FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}";;
-  qt2)
-    QT2_DO_IT_ALL
+  qt)
+    QT_DO_IT_ALL
     FRONTEND="qt2"
     FRONTEND_GUILIB="qt2/*.lo qt2/ui/*.lo qt2/moc/*.lo qt2/ui/moc/*.lo"
-    FRONTEND_LDFLAGS="\$(QT2_LDFLAGS)"
-    FRONTEND_INCLUDES="-I\${srcdir}/qt2 \$(QT2_INCLUDES)"
-    FRONTEND_LIBS="\$(QT2_LIBS)";;
+    FRONTEND_LDFLAGS="\$(QT_LDFLAGS)"
+    FRONTEND_INCLUDES="-I\${srcdir}/qt2 \$(QT_INCLUDES)"
+    FRONTEND_LIBS="\$(QT_LIB)"
+    FRONTEND_INFO="    Qt version:                   ${QT_VERSION}\n"
+    ;;
   *)
     LYX_ERROR(Unknown frontend $lyx_use_frontend);;
 esac
 
+AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER,
+              test x$lyx_use_xforms_image_loader = xno)
+
+
 ### Check for xforms and xpm (only if X has been found).
 if test "$have_x" = no ; then
 LYX_ERROR(dnl