case "$lyx_use_frontend" in
xforms)
# for now don't set it for xforms as this is always entered
- FRONTEND="xforms"
- FRONTEND_GUILIB="xforms/*.lo"
- FRONTEND_INCLUDES="-I\$(srcdir)/xforms";;
- gnome)
+ LYX_PATH_XPM
+ LYX_PATH_XFORMS
+ FRONTEND="xforms"
+ FRONTEND_GUILIB="xforms/*.lo"
+ FRONTEND_INCLUDES="-I\$(srcdir)/xforms"
+ FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@"
+ FRONTEND_INFO=`cat <<EOF
+ libXpm version: ${XPM_VERSION}\n\
+ libforms version: ${XFORMS_VERSION}\n
+`
+ ;;
+ gnome)
AM_PATH_GTKMM(1.2.1,,
AC_MSG_ERROR(Cannot find GTK--: Please install Version 1.2.1+))
AM_PATH_GNOMEMM
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="xforms qt2"
- FRONTEND_GUILIB="qt2/*.lo qt2/ui/*.lo qt2/moc/*.lo ui/moc/*.lo"
+ 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_INCLUDES="-I\${srcdir}/qt2 -I\${top_srcdir}/src/frontends/xforms \$(QT2_INCLUDES)"
+ FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ \$(QT2_LIBS)";;
*)
LYX_ERROR(Unknown frontend $lyx_use_frontend);;
esac
### Check for xforms and xpm (only if X has been found).
-if test "$have_x" = yes ; then
+if test "$have_x" = no ; then
# We surely need these two libraries and want to check carefully the
# version numbers...
-LYX_PATH_XPM
-LYX_PATH_XFORMS
-FRONTEND_INFO=`cat <<EOF
- libXpm version: ${XPM_VERSION}\n\
- libforms version: ${XFORMS_VERSION}\n
-`
-
-AC_SUBST(LYX_LIBS)
-else
+#LYX_PATH_XPM
+#LYX_PATH_XFORMS
+#FRONTEND_INFO=`cat <<EOF
+# libXpm version: ${XPM_VERSION}\n\
+# libforms version: ${XFORMS_VERSION}\n
+#`
+#
+#AC_SUBST(LYX_LIBS)
+#else
LYX_ERROR(dnl
[Cannot find X window libraries and/or headers. Check your installation.
If you use a Linux system, check that you have installed
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
src/frontends/controllers/Makefile \
src/frontends/xforms/Makefile \
src/frontends/qt2/Makefile \
+ src/frontends/qt2/xforms/Makefile \
src/frontends/qt2/moc/Makefile \
src/frontends/qt2/ui/Makefile \
src/frontends/qt2/ui/moc/Makefile \