fix some document dialog ui and add some FIXMEs

[lyx.git] / config / xforms.m4

diff --git a/config/xforms.m4 b/config/xforms.m4
index 7b07a3eac44c0537c2174e810e74236b7ad7cc63..2f6d146484fd8331689dff1a595071013ee25656 100644 (file)
--- a/config/xforms.m4
+++ b/config/xforms.m4
@@ -4,12 +4,11 @@ dnl Usage LYX_PATH_XFORMS: Checks for xforms library and flags
 dnl   If it is found, the variable XFORMS_LIB is set to the relevant -l flags,
 dnl and FORMS_H_LOCATION / FLIMAGE_H_LOCATION is also set
 AC_DEFUN(LYX_PATH_XFORMS,[
-
-LIBS="$XPM_LIB $LIBS"
+AC_REQUIRE([LYX_PATH_XPM])
 
 AC_CHECK_LIB(forms, fl_initialize, XFORMS_LIB="-lforms",
   [AC_CHECK_LIB(xforms, fl_initialize, XFORMS_LIB="-lxforms",
-    [LYX_LIB_ERROR(libforms or libxforms,xforms)])])
+    [LYX_LIB_ERROR(libforms or libxforms,xforms)], $XPM_LIB)], $XPM_LIB)
 AC_SUBST(XFORMS_LIB)
 
 ### Check for xforms headers
@@ -65,11 +64,12 @@ fi
 
 dnl Check whether the xforms library has a viable image loader
 AC_DEFUN(LYX_USE_XFORMS_IMAGE_LOADER,
-[
+[AC_REQUIRE([LYX_PATH_XFORMS])
 save_LIBS=$LIBS
-LIBS="$XFORMS_LIB $LIBS"
+LIBS="$XFORMS_LIB $XPM_LIB $LIBS"
 lyx_use_xforms_image_loader=no
-AC_LANG_PUSH(C)
+AC_LANG_SAVE
+AC_LANG_C
 
 AC_CHECK_LIB(jpeg, jpeg_read_header,
   [XFORMS_IMAGE_LIB=-ljpeg
@@ -78,7 +78,7 @@ AC_SEARCH_LIBS(flimage_dup, flimage,
   [lyx_use_xforms_image_loader=yes
    if test "$ac_cv_search_flimage_dup" != "none required" ; then
      XFORMS_IMAGE_LIB="-lflimage $XFORMS_IMAGE_LIB"
-     LIBS="$XFORMS_IMAGE_LIB $XFORMS_LIB $LIBS"
+     LIBS="$XFORMS_IMAGE_LIB $LIBS"
   fi])
 AC_SUBST(XFORMS_IMAGE_LIB)
 
@@ -92,7 +92,8 @@ fi
 
 ### If the gui cannot load images itself, then we default to the
 ### very simple one in graphics/GraphicsImageXPM.[Ch]
-AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER,
-              test $lyx_use_xforms_image_loader = no)
-AC_LANG_POP(C)
+#AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER,
+#             test x$lyx_use_xforms_image_loader = xno)
+
+AC_LANG_RESTORE
 LIBS=$save_LIBS])