X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.in;h=10e7839325c6b61dd9d3c60147ef14a8c12eca30;hb=4fff14150128dcf569ac291f28ab60f11fbab5b4;hp=2db8f28988d7e58a236e5e26fc332d472afa6f00;hpb=7ea7dabed1b72cc25dcbdc482ac006f2b61dacfd;p=lyx.git

diff --git a/configure.in b/configure.in
index 2db8f28988..10e7839325 100644
--- a/configure.in
+++ b/configure.in
@@ -186,9 +186,18 @@ 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
-    FRONTEND=""
-    FRONTEND_GUILIB="xforms/libxforms.o";;
-  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
@@ -205,41 +214,53 @@ dnl Ensure gnome-config is available...
 	    AC_MSG_ERROR(Did not find libGlade installed)
 	fi
 		
-    FRONTEND="gnome"
-    FRONTEND_GUILIB="gnome/libgnome.la"
+    FRONTEND="xforms gnome"
+    FRONTEND_GUILIB="gnome/*.lo"
     FRONTEND_LDFLAGS="\$(GNOMEMM_LIBDIR)"
     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/libqt2.la"
+    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
@@ -345,10 +366,10 @@ AC_OUTPUT([Makefile \
        src/insets/Makefile \
        src/support/Makefile \
        src/frontends/Makefile \
-       src/frontends/support/Makefile \
        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 \