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 fa5b34dd1d5363b4901a1bd45c67496e49818c21..58058744831d020886fb482db29e71437fb5aff1 100644 (file)
--- a/config/configure.in
+++ b/config/configure.in
@@ -154,16 +154,15 @@ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
 AC_CHECK_FUNCS(XOpenIM)
 
 ### check which frontend we want to use
-# We have to check for xforms anyway
-LYX_PATH_XPM
-LYX_PATH_XFORMS
 
 #LYX_USE_FRONTEND
 dnl The code below is not in a macro, because this would cause big
 dnl problems with the AC_REQUIRE contained in KDE_DO_IT_ALL.
 case "$lyx_use_frontend" in
   xforms)
-  # for now don't set it for xforms as this is always entered
+       LYX_PATH_XPM
+       LYX_PATH_XFORMS
+       LYX_USE_XFORMS_IMAGE_LOADER
        FRONTEND="xforms"
        FRONTEND_GUILIB="xforms/*.lo xforms/forms/*.lo"
        FRONTEND_INCLUDES="-I\$(srcdir)/xforms"
@@ -179,6 +178,9 @@ case "$lyx_use_frontend" in
     libforms version:             ${XFORMS_VERSION}\n"
        ;;
   gnome)
+    LYX_PATH_XPM
+    LYX_PATH_XFORMS
+    LYX_USE_XFORMS_IMAGE_LOADER
     PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0)
     AC_SUBST(GNOME_FRONTEND_CFLAGS)
     AC_SUBST(GNOME_FRONTEND_LIBS)
@@ -188,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
@@ -207,11 +215,6 @@ LYX_ERROR(dnl
    the development tools.])
 fi
 
-### Check whether the xforms library has a viable image loader
-### For now, run this test always so config.h is unchanged by a change in
-### frontend
-LYX_USE_XFORMS_IMAGE_LOADER
-
 ### Setup GNU gettext
 dnl GNU gettext is written in C
 AC_LANG_C