X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.in;h=10e7839325c6b61dd9d3c60147ef14a8c12eca30;hb=4fff14150128dcf569ac291f28ab60f11fbab5b4;hp=0957b85bccf4f0513afe4fc3efa293b77eea77f4;hpb=81753592d8d05eb6648b4635f2fe9a90830ba566;p=lyx.git

diff --git a/configure.in b/configure.in
index 0957b85bcc..10e7839325 100644
--- a/configure.in
+++ b/configure.in
@@ -220,12 +220,14 @@ dnl Ensure gnome-config is available...
     FRONTEND_INCLUDES="-I\${srcdir}/gnome \$(GNOMEMM_INCLUDEDIR) \$(GTKMM_CFLAGS) `gnome-config --cflags libglade gnomeui`"
     FRONTEND_LIBS="\$(GNOMEMM_LIBS) \$(GTKMM_LIBS) `gnome-config --libs libglade gnomeui`";;
   qt2)
+	LYX_PATH_XPM
+	LYX_PATH_XFORMS
     QT2_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 -I\${top_srcdir}/src/frontends/xforms \$(QT2_INCLUDES)"
-    FRONTEND_LIBS="\$(QT2_LIBS)";;
+    FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ \$(QT2_LIBS)";;
   *)
     LYX_ERROR(Unknown frontend $lyx_use_frontend);;
 esac
@@ -249,6 +251,16 @@ 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
+
+### 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 x$lyx_use_xforms_image_loader = xno)
+
 ### Setup GNU gettext
 dnl GNU gettext is written in C
 AC_LANG_C