qt2.diff

[features.git] / configure.in

diff --git a/configure.in b/configure.in
index 32f1f300517b45dbbc40c10bf487fcb3628700d9..fc2111a1869bb6fc3cc332e0726693e4f559ffc3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -189,7 +189,7 @@ case "$lyx_use_frontend" in
     FRONTEND="xforms"
     FRONTEND_GUILIB="xforms/*.lo"
     FRONTEND_INCLUDES="-I\$(srcdir)/xforms";;
-  gnome)    
+  gnome)
     AM_PATH_GTKMM(1.2.1,,
         AC_MSG_ERROR(Cannot find GTK--: Please install Version 1.2.1+))
     AM_PATH_GNOMEMM
@@ -213,10 +213,10 @@ dnl Ensure gnome-config is available...
     FRONTEND_LIBS="\$(GNOMEMM_LIBS) \$(GTKMM_LIBS) `gnome-config --libs libglade gnomeui`";;
   qt2)
     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_INCLUDES="-I\${srcdir}/qt2 -I\${top_srcdir}/src/frontends/xforms \$(QT2_INCLUDES)"
     FRONTEND_LIBS="\$(QT2_LIBS)";;
   *)
     LYX_ERROR(Unknown frontend $lyx_use_frontend);;
@@ -349,6 +349,7 @@ AC_OUTPUT([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 \