This patch does two kind of things:
1/ remove support for frontend=gnome in configure scripts
2/ avoid distributing the gnome frontend (which is still in cvs, of
course).
Lars, is something like that OK with you?
JMarc
? config.h.in
Index: autogen.sh
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/autogen.sh,v
retrieving revision 1.42
diff -u -p -r1.42 autogen.sh
--- autogen.sh 23 Dec 2002 14:14:12 -0000 1.42
+++ autogen.sh 10 Jan 2003 10:51:22 -0000
@@ -4,7 +4,7 @@ ACLOCAL="aclocal"
AUTOHEADER="autoheader"
AUTOMAKE="automake -a -c --foreign"
AUTOCONF="autoconf"
-ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4 xforms.m4 qt.m4 gtk--.m4 gnome--.m4 gnome.m4 pspell.m4 pkg.m4"
+ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4 xforms.m4 qt.m4 pspell.m4 pkg.m4"
# Discover what version of autoconf we are using.
autoversion=`$AUTOCONF --version | head -n 1`
Index: config/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/ChangeLog,v
retrieving revision 1.84
diff -u -p -r1.84 ChangeLog
--- config/ChangeLog 8 Jan 2003 11:07:03 -0000 1.84
+++ config/ChangeLog 10 Jan 2003 10:51:22 -0000
@@ -1,3 +1,9 @@
+2003-01-09 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
+
+ * lyxinclude.m4:
+ * configure.ac:
+ * configure.in: comment out gnome frontend support
+
2003-01-08 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
* lyxinclude.m4 (LYX_CHECK_ERRORS): do not delete $cache_file if
Index: config/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/Makefile.am,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile.am
--- config/Makefile.am 25 Nov 2002 16:02:21 -0000 1.6
+++ config/Makefile.am 10 Jan 2003 10:51:22 -0000
@@ -3,4 +3,4 @@ include $(top_srcdir)/config/common.am
EXTRA_DIST = common.am codeset.m4 libtool.m4 gettext.m4 \
lyxinclude.m4 lyxinclude25x.m4 lyxinclude213.m4 \
glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4 \
- qt.m4 gtk--.m4 gnome--.m4 gnome.m4 xforms.m4 pspell.m4
+ qt.m4 xforms.m4 pspell.m4
Index: config/configure.ac
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/configure.ac,v
retrieving revision 1.19
diff -u -p -r1.19 configure.ac
--- config/configure.ac 19 Dec 2002 18:38:30 -0000 1.19
+++ config/configure.ac 10 Jan 2003 10:51:22 -0000
@@ -57,8 +57,6 @@ AC_AIX
### check which frontend we want to use
LYX_USE_FRONTEND
-#old gnome stuff removed by Michael Koziarski 25-05-2002
-
### Check for a C++ compiler
LYX_PROG_CXX
### 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\
libforms version: ${XFORMS_VERSION}\n"
;;
- gnome)
- LYX_PATH_XPM
- LYX_PATH_XFORMS
- LYX_CHECK_XFORMS_IMAGE_LOADER
- PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0)
- AC_SUBST(GNOME_FRONTEND_CFLAGS)
- AC_SUBST(GNOME_FRONTEND_LIBS)
-
- FRONTEND="xforms gnome"
- FRONTEND_GUILIB="gnome/*.lo"
- FRONTEND_LDFLAGS="${GNOME_FRONTEND_LIBS}"
- FRONTEND_INCLUDES="-I\${srcdir}/gnome -I\${srcdir}/xforms ${GNOME_FRONTEND_CFLAGS} "
- FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}"
- ;;
+dnl gnome)
+dnl LYX_PATH_XPM
+dnl LYX_PATH_XFORMS
+dnl LYX_CHECK_XFORMS_IMAGE_LOADER
+dnl PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0)
+dnl AC_SUBST(GNOME_FRONTEND_CFLAGS)
+dnl AC_SUBST(GNOME_FRONTEND_LIBS)
+
+dnl FRONTEND="xforms gnome"
+dnl FRONTEND_GUILIB="gnome/*.lo"
+dnl FRONTEND_LDFLAGS="${GNOME_FRONTEND_LIBS}"
+dnl FRONTEND_INCLUDES="-I\${srcdir}/gnome -I\${srcdir}/xforms ${GNOME_FRONTEND_CFLAGS} "
+dnl FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}"
+dnl ;;
qt)
QT_DO_IT_ALL
FRONTEND="qt2"
@@ -382,7 +380,6 @@ AC_CONFIG_FILES([Makefile \
src/frontends/qt2/moc/Makefile \
src/frontends/qt2/ui/Makefile \
src/frontends/qt2/ui/moc/Makefile \
- src/frontends/gnome/Makefile \
])
AC_OUTPUT
# show version information
Index: config/configure.in
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/configure.in,v
retrieving revision 1.13
diff -u -p -r1.13 configure.in
--- config/configure.in 19 Dec 2002 18:38:30 -0000 1.13
+++ config/configure.in 10 Jan 2003 10:51:22 -0000
@@ -60,8 +60,6 @@ AC_EXEEXT
### check which frontend we want to use
LYX_USE_FRONTEND
-#old gnome stuff removed by Michael Koziarski 25-05-2002
-
### Check for a C++ compiler
LYX_PROG_CXX
### 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\
libforms version: ${XFORMS_VERSION}\n"
;;
- gnome)
-# Leaving these tests in means that they are performed twice for the
-# xforms frontend. No, I don't understand why :-(
-# Angus 16 Dec 2002.
-# LYX_PATH_XPM
-# LYX_PATH_XFORMS
-# LYX_CHECK_XFORMS_IMAGE_LOADER
- PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0)
- AC_SUBST(GNOME_FRONTEND_CFLAGS)
- AC_SUBST(GNOME_FRONTEND_LIBS)
-
- FRONTEND="xforms gnome"
- FRONTEND_GUILIB="gnome/*.lo"
- FRONTEND_LDFLAGS="${GNOME_FRONTEND_LIBS}"
- FRONTEND_INCLUDES="-I\${srcdir}/gnome -I\${srcdir}/xforms ${GNOME_FRONTEND_CFLAGS} "
- FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}";;
+dnl gnome)
+dnl # Leaving these tests in means that they are performed twice for the
+dnl # xforms frontend. No, I don't understand why :-(
+dnl # Angus 16 Dec 2002.
+dnl # LYX_PATH_XPM
+dnl # LYX_PATH_XFORMS
+dnl # LYX_CHECK_XFORMS_IMAGE_LOADER
+dnl PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0)
+dnl AC_SUBST(GNOME_FRONTEND_CFLAGS)
+dnl AC_SUBST(GNOME_FRONTEND_LIBS)
+
+dnl FRONTEND="xforms gnome"
+dnl FRONTEND_GUILIB="gnome/*.lo"
+dnl FRONTEND_LDFLAGS="${GNOME_FRONTEND_LIBS}"
+dnl FRONTEND_INCLUDES="-I\${srcdir}/gnome -I\${srcdir}/xforms ${GNOME_FRONTEND_CFLAGS} "
+dnl FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}";;
qt)
QT_DO_IT_ALL
FRONTEND="qt2"
@@ -317,7 +315,6 @@ AC_OUTPUT([Makefile \
src/frontends/qt2/moc/Makefile \
src/frontends/qt2/ui/Makefile \
src/frontends/qt2/ui/moc/Makefile \
- src/frontends/gnome/Makefile \
])
# show version information
Index: config/lyxinclude.m4
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/lyxinclude.m4,v
retrieving revision 1.80
diff -u -p -r1.80 lyxinclude.m4
--- config/lyxinclude.m4 8 Jan 2003 11:07:03 -0000 1.80
+++ config/lyxinclude.m4 10 Jan 2003 10:51:22 -0000
@@ -654,7 +654,7 @@ AC_DEFUN(LYX_USE_FRONTEND,
[AC_MSG_CHECKING([what frontend should be used as main GUI])
AC_ARG_WITH(frontend,
[ --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"])
AC_MSG_RESULT($lyx_use_frontend)
AC_SUBST(FRONTEND)
Index: src/frontends/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/ChangeLog,v
retrieving revision 1.145
diff -u -p -r1.145 ChangeLog
--- src/frontends/ChangeLog 5 Jan 2003 22:38:42 -0000 1.145
+++ src/frontends/ChangeLog 10 Jan 2003 10:51:23 -0000
@@ -1,3 +1,7 @@
+2003-01-09 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
+
+ * Makefile.am (DIST_SUBDIRS): do not distribute gnome frontend
+
2003-01-05 John Levon <[EMAIL PROTECTED]>
* LyXKeySym.h: pass Encoding to getISOEncoded
Index: src/frontends/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/Makefile.am,v
retrieving revision 1.52
diff -u -p -r1.52 Makefile.am
--- src/frontends/Makefile.am 25 Oct 2002 09:16:21 -0000 1.52
+++ src/frontends/Makefile.am 10 Jan 2003 10:51:23 -0000
@@ -2,7 +2,7 @@ include $(top_srcdir)/config/common.am
SUBDIRS = controllers $(FRONTEND)
-DIST_SUBDIRS = controllers xforms qt2 gnome
+DIST_SUBDIRS = controllers xforms qt2
noinst_LTLIBRARIES = libfrontends.la
