[gnome-session] Drop gnome-wm script

[Matthias Clasen <matthiasc src gnome org>]

commit 5f114bde4d4c37d2bd895f18df78bc2ba8355c32
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Jan 20 10:07:58 2011 -0500

    Drop gnome-wm script
    
    This doesn't make sense in the GNOME 3 world anymore.
    Also, nuke the --default-wm configure option.

 configure.ac                |   14 ----
 data/Makefile.am            |   10 +---
 data/gnome-wm               |  160 -------------------------------------------
 data/gnome-wm.desktop.in.in |   12 ---
 4 files changed, 1 insertions(+), 195 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7b5453a..8083e46 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,18 +90,6 @@ PKG_CHECK_MODULES(EGG_SMCLIENT, gtk+-$GTK_API_VERSION)
 PKG_CHECK_MODULES(GL_TEST, xcomposite gl)
 
 dnl ====================================================================
-dnl Option to set the default window manager
-dnl ====================================================================
-AC_ARG_WITH(default-wm,
-              [AS_HELP_STRING([--with-default-wm],
-                              [Specify the default window manager @<:@default=metacity@:>@])],,
-              [with_default_wm="metacity"])
-
-DEFAULT_WM=$with_default_wm
-AC_SUBST(DEFAULT_WM)
-AM_CONDITIONAL(USE_GNOME_WM, test x$with_default_wm = xgnome-wm)
-
-dnl ====================================================================
 dnl GConf Checks
 dnl ====================================================================
 AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
@@ -347,7 +335,6 @@ doc/dbus/Makefile
 doc/dbus/gnome-session.xml
 doc/man/Makefile
 data/Makefile
-data/gnome-wm.desktop.in
 data/session-properties.desktop.in
 data/icons/Makefile
 data/icons/16x16/Makefile
@@ -386,7 +373,6 @@ echo "
         Use *_DISABLE_DEPRECATED: ${enable_deprecation_flags}
 
         GTK+ version:             ${with_gtk}
-        Default WM:               ${with_default_wm}
         IPv6 support:             ${have_full_ipv6}
         Backtrace support:        ${have_backtrace}
         XRender support:          ${have_xrender}
diff --git a/data/Makefile.am b/data/Makefile.am
index d04f6ea..eb3b23d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,7 +1,5 @@
 SUBDIRS = icons
 
-bin_SCRIPTS = gnome-wm
-
 uidir = $(pkgdatadir)
 ui_DATA = \
 	session-properties.ui	\
@@ -28,10 +26,6 @@ session_DATA = $(session_in_files:.session.desktop.in=.session)
 
 %.session: %.session.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
 
-if USE_GNOME_WM
-desktop_in_files += gnome-wm.desktop.in
-endif
-
 @INTLTOOL_DESKTOP_RULE@
 
 schemas_in_files = gnome-session.schemas.in
@@ -54,7 +48,6 @@ uninstall-local:
 endif
 
 EXTRA_DIST =					\
-	gnome-wm				\
 	$(xsession_in_files)			\
 	$(session_in_in_files)			\
 	$(schemas_in_files)			\
@@ -65,8 +58,7 @@ CLEANFILES =					\
 	$(schemas_DATA)				\
 	$(xsession_DATA)			\
 	$(desktop_DATA)				\
-	$(session_DATA)				\
-	gnome-wm.desktop
+	$(session_DATA)
 
 DISTCLEANFILES =				\
 	$(desktop_in_files)