anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix gtk frontend selection

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8864 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2004-08-03 14:03:19 +00:00
parent b62363c070
commit 5afc68d651
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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

13
configure.ac
View File

@ -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)