diff --git a/ChangeLog b/ChangeLog index 8d1ff3b222..dc1cbf1843 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2002-03-04 Lars Gullik Bjønnes + + * configure.in: help qt2 along a bit + 2002-03-01 John Levon * configure.in: fixup qt2 diff --git a/configure.in b/configure.in index 0957b85bcc..775367f922 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