forgot these...

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 57477d899e338e854cb1f624403011bc157ae436..65dd7c57a6a80cc84deb01af53999948035da369 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -159,21 +159,25 @@ esac
 
 ### check which frontend we want to use
 
+dnl if the gtk frontend has been specified, then xforms is needed too
+if echo $FRONTENDS | grep gtk | grep -v xforms ; then
+  FRONTENDS="$FRONTENDS xforms"
+fi
+
 dnl The code below is not in a macro, because this would cause big
 dnl problems with the AC_REQUIRE contained in QT_DO_IT_ALL.
 for frontend in $FRONTENDS ; do
   case "$frontend" in
     xforms)
-         [ x$gtk_done = x1 ] || XFORMS_DO_IT_ALL
+         XFORMS_DO_IT_ALL
          FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-xforms\$(EXEEXT)"
-         [ x$gtk_done = x1 ] || FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms"
+         FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms"
          RPM_FRONTEND="xforms"
          RPM_FRONTEND_DEPS='libforms >= 1.0'
          FRONTEND_INFO="${FRONTEND_INFO}\
   XForms Frontend:\n\
       libXpm version:\t\t${XPM_VERSION}\n\
       libforms version:\t\t${XFORMS_VERSION}\n"
-         xforms_done=1
          ;;
   dnl   gnome)
   dnl     XFORMS_DO_IT_ALL
@@ -188,10 +192,8 @@ for frontend in $FRONTENDS ; do
   dnl     FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}"
   dnl  ;;
     gtk)
-         [ x$xforms_done = x1 ] || XFORMS_DO_IT_ALL
          PKG_CHECK_MODULES(GTK_FRONTEND, gtkmm-2.0 libglademm-2.0)
          FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-gtk\$(EXEEXT)"
-         [ x$xforms_done = x1 ] || FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms"
          FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS gtk"
          RPM_FRONTEND="gtk"
          RPM_FRONTEND_DEPS='gtkmm >= 2.2.0'
@@ -201,7 +203,6 @@ for frontend in $FRONTENDS ; do
   GTK Frontend:\n\
     libgtkmm version:\t\t${GTKMM_VERSION}\n\
     libglademm version:\t\t${LIBGLADEMM_VERSION}\n"
-         gtk_done=1
          ;;
 
     qt)