From 5afc68d6518301db940874563ce107bd15120ca9 Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Tue, 3 Aug 2004 14:03:19 +0000
Subject: [PATCH] fix gtk frontend selection

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8864 a592a061-630c-0410-9148-cb99ea01b6c8
---
 ChangeLog    |  5 +++++
 configure.ac | 13 +++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5e7675ef7c..94969c2bde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-03  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* configure.ac: instead of the previous code (which does not
+	work), just add xforms to the list of frontends if gtk is specified
+
 2004-07-26  Lars Gullik Bjonnes  <larsbj@gullik.net>
 
 	* configure.ac: add code that some xforms tests are run only once
diff --git a/configure.ac b/configure.ac
index 57477d899e..65dd7c57a6 100644
--- 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)
-- 
2.39.2