diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index e853e3bf99..9c6505107e 100644
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -511,9 +511,9 @@ AC_DEFUN(LYX_CXX_GLOBAL_CSTD,[
 dnl Usage LYX_PATH_XPM: Checks for xpm library and header
 AC_DEFUN(LYX_PATH_XPM,[
 ### Check for Xpm library
-AC_CHECK_LIB(Xpm, XpmCreateBufferFromImage,LYX_LIBS="-lXpm $LYX_LIBS",
-        [LYX_LIB_ERROR(libXpm,Xpm)], $LYX_LIBS)
-
+AC_CHECK_LIB(Xpm, XpmCreateBufferFromImage,XPM_LIB="-lXpm",
+        [LYX_LIB_ERROR(libXpm,Xpm)], $XPM_LIB)
+AC_SUBST(XPM_LIB)
 ### Check for Xpm headers
 lyx_cv_xpm_h_location="<xpm.h>"
 AC_CHECK_HEADER(X11/xpm.h,[
@@ -562,10 +562,10 @@ fi])
 dnl Usage LYX_PATH_XFORMS: Checks for xforms library and flags
 AC_DEFUN(LYX_PATH_XFORMS,[
 ### Check for xforms library
-AC_CHECK_LIB(forms, fl_initialize, LYX_LIBS="-lforms $LYX_LIBS", 
-  [AC_CHECK_LIB(xforms, fl_initialize, LYX_LIBS="-lxforms $LYX_LIBS", 
-    [LYX_LIB_ERROR(libforms or libxforms,xforms)], $LYX_LIBS)], $LYX_LIBS) 
-
+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)], $XFORMS_LIB)], $XFORMS_LIB) 
+AC_SUBST(XFORMS_LIB)
 ### Check for xforms headers
 lyx_cv_forms_h_location="<forms.h>"
 AC_CHECK_HEADER(X11/forms.h,[
diff --git a/configure.in b/configure.in
index fc2111a186..0957b85bcc 100644
--- a/configure.in
+++ b/configure.in
@@ -186,9 +186,17 @@ 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="xforms"
-    FRONTEND_GUILIB="xforms/*.lo"
-    FRONTEND_INCLUDES="-I\$(srcdir)/xforms";;
+	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+))
@@ -223,18 +231,18 @@ dnl Ensure gnome-config is available...
 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 
diff --git a/src/frontends/qt2/Makefile.am b/src/frontends/qt2/Makefile.am
index f0e34e3e49..2fbed66dba 100644
--- a/src/frontends/qt2/Makefile.am
+++ b/src/frontends/qt2/Makefile.am
@@ -1,6 +1,10 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+DISTCLEANFILES = $(BUILTSOURCES) *.orig *.rej *~ *.bak core
+ETAGS_ARGS = --lang=c++
+
 noinst_LTLIBRARIES = libqt2.la
+
 BOOST_INCLUDES = -I$(top_srcdir)/boost
 SUBDIRS=xforms ui moc
 INCLUDES = -I${top_srcdir}/src/ -I${top_srcdir}/src/frontends/ \
@@ -8,15 +12,11 @@ INCLUDES = -I${top_srcdir}/src/ -I${top_srcdir}/src/frontends/ \
 	-I$(top_srcdir)/src/frontends/controllers
 AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
 
-DISTCLEANFILES = $(BUILTSOURCES) *.orig *.rej *~ *.bak core
 
 LIBS=
-ETAGS_ARGS = --lang=c++
 
 include Makefile.dialogs
 
-ETAGS_ARGS = --lang=c++
-
 libqt2_la_LIBADD = \
 	xforms/libqt2xforms.la \
 	ui/libqt2ui.la \
diff --git a/src/frontends/qt2/xforms/Makefile.am b/src/frontends/qt2/xforms/Makefile.am
index f4a2b26d9f..11aae05e7c 100644
--- a/src/frontends/qt2/xforms/Makefile.am
+++ b/src/frontends/qt2/xforms/Makefile.am
@@ -1,17 +1,18 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+DISTCLEANFILES = $(XFORMS_SOURCES) $(BUILTSOURCES) *.orig *.rej *~ *.bak core
+
 noinst_LTLIBRARIES = libqt2xforms.la
+
 BOOST_INCLUDES = -I$(top_srcdir)/boost
 INCLUDES = -I${top_srcdir}/src/ -I${top_srcdir}/src/frontends/ \
 	${SIGC_CFLAGS} -I$(top_srcdir)/images ${FRONTEND_INCLUDES} $(BOOST_INCLUDES) \
 	-I$(top_srcdir)/src/frontends/controllers
 
-DISTCLEANFILES = $(XFORMS_SOURCES) $(BUILTSOURCES) *.orig *.rej *~ *.bak core
-
 LIBS=
 ETAGS_ARGS = --lang=c++
 
-XFORMS_SOURCES = \
+libqt2xforms_la_SOURCES = \
 	bmtable.h \
 	bmtable.c \
 	combox.h \
@@ -84,11 +85,10 @@ XFORMS_SOURCES = \
 	xformsBC.C \
 	xforms_helpers.h \
 	xforms_helpers.C
- 
-$(XFORMS_SOURCES):
-	for i in $(XFORMS_SOURCES); do ln -sf "${top_srcdir}/src/frontends/xforms/$$i" . ; done
- 
-ETAGS_ARGS = --lang=c++
 
-libqt2xforms_la_SOURCES = \
-	$(XFORMS_SOURCES)
+libqt2xforms.la: link_files $(XFORMS_SOURCES)
+
+link_files:
+	for i in $(XFORMS_SOURCES); do \
+		ln -sf "${top_srcdir}/src/frontends/xforms/$$i" . ; \
+	 done