anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

disable gnome frontend

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5931 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2003-01-10 14:06:45 +00:00
parent c0ead27970
commit 9ae9b9df62
4 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/ChangeLog
View File

@ -1,3 +1,9 @@
2003-01-09 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* lyxinclude.m4:
* configure.ac:
* configure.in: comment out gnome frontend support
2003-01-08 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2003-01-08 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* lyxinclude.m4 (LYX_CHECK_ERRORS): do not delete $cache_file if * lyxinclude.m4 (LYX_CHECK_ERRORS): do not delete $cache_file if

28
config/configure.ac
View File

@ -57,8 +57,6 @@ AC_AIX
### check which frontend we want to use ### check which frontend we want to use
LYX_USE_FRONTEND LYX_USE_FRONTEND
#old gnome stuff removed by Michael Koziarski 25-05-2002
### Check for a C++ compiler ### Check for a C++ compiler
LYX_PROG_CXX LYX_PROG_CXX
### Some checks on what the C++ compiler can(not) do ### Some checks on what the C++ compiler can(not) do
@ -171,20 +169,20 @@ case "$lyx_use_frontend" in
FRONTEND_INFO=" libXpm version: ${XPM_VERSION}\n\ FRONTEND_INFO=" libXpm version: ${XPM_VERSION}\n\
libforms version: ${XFORMS_VERSION}\n" libforms version: ${XFORMS_VERSION}\n"
;; ;;
gnome) dnl gnome)
LYX_PATH_XPM dnl LYX_PATH_XPM
LYX_PATH_XFORMS dnl LYX_PATH_XFORMS
LYX_CHECK_XFORMS_IMAGE_LOADER dnl LYX_CHECK_XFORMS_IMAGE_LOADER
PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0) dnl PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0)
AC_SUBST(GNOME_FRONTEND_CFLAGS) dnl AC_SUBST(GNOME_FRONTEND_CFLAGS)
AC_SUBST(GNOME_FRONTEND_LIBS) dnl AC_SUBST(GNOME_FRONTEND_LIBS)
FRONTEND="xforms gnome" dnl FRONTEND="xforms gnome"
FRONTEND_GUILIB="gnome/*.lo" dnl FRONTEND_GUILIB="gnome/*.lo"
FRONTEND_LDFLAGS="${GNOME_FRONTEND_LIBS}" dnl FRONTEND_LDFLAGS="${GNOME_FRONTEND_LIBS}"
FRONTEND_INCLUDES="-I\${srcdir}/gnome -I\${srcdir}/xforms ${GNOME_FRONTEND_CFLAGS} " dnl FRONTEND_INCLUDES="-I\${srcdir}/gnome -I\${srcdir}/xforms ${GNOME_FRONTEND_CFLAGS} "
FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}" dnl FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}"
;; dnl ;;
qt) qt)
QT_DO_IT_ALL QT_DO_IT_ALL
FRONTEND="qt2" FRONTEND="qt2"

32
config/configure.in
View File

@ -60,8 +60,6 @@ AC_EXEEXT
### check which frontend we want to use ### check which frontend we want to use
LYX_USE_FRONTEND LYX_USE_FRONTEND
#old gnome stuff removed by Michael Koziarski 25-05-2002
### Check for a C++ compiler ### Check for a C++ compiler
LYX_PROG_CXX LYX_PROG_CXX
### Some checks on what the C++ compiler can(not) do ### Some checks on what the C++ compiler can(not) do
@ -174,22 +172,22 @@ case "$lyx_use_frontend" in
FRONTEND_INFO=" libXpm version: ${XPM_VERSION}\n\ FRONTEND_INFO=" libXpm version: ${XPM_VERSION}\n\
libforms version: ${XFORMS_VERSION}\n" libforms version: ${XFORMS_VERSION}\n"
;; ;;
gnome) dnl gnome)
# Leaving these tests in means that they are performed twice for the dnl # Leaving these tests in means that they are performed twice for the
# xforms frontend. No, I don't understand why :-( dnl # xforms frontend. No, I don't understand why :-(
# Angus 16 Dec 2002. dnl # Angus 16 Dec 2002.
# LYX_PATH_XPM dnl # LYX_PATH_XPM
# LYX_PATH_XFORMS dnl # LYX_PATH_XFORMS
# LYX_CHECK_XFORMS_IMAGE_LOADER dnl # LYX_CHECK_XFORMS_IMAGE_LOADER
PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0) dnl PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0)
AC_SUBST(GNOME_FRONTEND_CFLAGS) dnl AC_SUBST(GNOME_FRONTEND_CFLAGS)
AC_SUBST(GNOME_FRONTEND_LIBS) dnl AC_SUBST(GNOME_FRONTEND_LIBS)
FRONTEND="xforms gnome" dnl FRONTEND="xforms gnome"
FRONTEND_GUILIB="gnome/*.lo" dnl FRONTEND_GUILIB="gnome/*.lo"
FRONTEND_LDFLAGS="${GNOME_FRONTEND_LIBS}" dnl FRONTEND_LDFLAGS="${GNOME_FRONTEND_LIBS}"
FRONTEND_INCLUDES="-I\${srcdir}/gnome -I\${srcdir}/xforms ${GNOME_FRONTEND_CFLAGS} " dnl FRONTEND_INCLUDES="-I\${srcdir}/gnome -I\${srcdir}/xforms ${GNOME_FRONTEND_CFLAGS} "
FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}";; dnl FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}";;
qt) qt)
QT_DO_IT_ALL QT_DO_IT_ALL
FRONTEND="qt2" FRONTEND="qt2"

2
config/lyxinclude.m4
View File

@ -654,7 +654,7 @@ AC_DEFUN(LYX_USE_FRONTEND,
[AC_MSG_CHECKING([what frontend should be used as main GUI]) [AC_MSG_CHECKING([what frontend should be used as main GUI])
AC_ARG_WITH(frontend, AC_ARG_WITH(frontend,
[ --with-frontend=THIS Use THIS frontend as main GUI: [ --with-frontend=THIS Use THIS frontend as main GUI:
Possible values: xforms, qt, gnome], Possible values: xforms, qt],
[lyx_use_frontend="$withval"], [lyx_use_frontend="xforms"]) [lyx_use_frontend="$withval"], [lyx_use_frontend="xforms"])
AC_MSG_RESULT($lyx_use_frontend) AC_MSG_RESULT($lyx_use_frontend)
AC_SUBST(FRONTEND) AC_SUBST(FRONTEND)