disable gnome frontend

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5931 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/config/ChangeLog b/config/ChangeLog
index 70e674b2be7cec95a69ca5acbca5b68b5885f463..c8cf80d4cddef7c64516f7be1d4f5db19c65535f 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -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>
 
        * lyxinclude.m4 (LYX_CHECK_ERRORS): do not delete $cache_file if

diff --git a/config/configure.ac b/config/configure.ac
index 00d75466b4bae72471b6d663706bff3c4b2ab7ec..08fa5f0853121a3a8fbdb1dd5b813746eb062028 100644 (file)
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -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"

diff --git a/config/configure.in b/config/configure.in
index 97ce8c76c2f309727e279bd91eb442a22fe530e0..c683d8d45905a43d03f58f928e0631266fc1efa0 100644 (file)
--- a/config/configure.in
+++ b/config/configure.in
@@ -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"

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 7260a9f6e8503b229358ec88931fa78875031317..b59377af1bb9ec81b43460d9c6a6b73225f31dc8 100644 (file)
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -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)