[gdm/gnome-2-30] Don't build xdmcp stuff when not enabled

[William Jon McCann <mccann src gnome org>]

commit cfbd32ada19c829d0a801d10ec2cd85e86da652c
Author: William Jon McCann <jmccann redhat com>
Date:   Fri Jun 4 12:18:44 2010 -0400

    Don't build xdmcp stuff when not enabled

 daemon/Makefile.am |   19 ++++++++++++-------
 gui/Makefile.am    |    9 +++++++++
 2 files changed, 21 insertions(+), 7 deletions(-)
---
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index ee69010..fed212f 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -104,10 +104,15 @@ libexec_PROGRAMS = 			\
 	gdm-simple-slave		\
 	gdm-factory-slave		\
 	gdm-product-slave		\
-	gdm-xdmcp-chooser-slave		\
 	gdm-session-worker		\
 	$(NULL)
 
+if XDMCP_SUPPORT
+libexec_PROGRAMS += 			\
+	gdm-xdmcp-chooser-slave		\
+	$(NULL)
+endif
+
 gdm_simple_slave_SOURCES = 		\
 	simple-slave-main.c 		\
 	gdm-greeter-server.c		\
@@ -282,12 +287,6 @@ gdm_binary_SOURCES = 			\
 	gdm-local-display-factory.h	\
 	gdm-display.c			\
 	gdm-display.h			\
-	gdm-xdmcp-display.c		\
-	gdm-xdmcp-display.h		\
-	gdm-xdmcp-greeter-display.c	\
-	gdm-xdmcp-greeter-display.h	\
-	gdm-xdmcp-chooser-display.c	\
-	gdm-xdmcp-chooser-display.h	\
 	gdm-static-display.c		\
 	gdm-static-display.h		\
 	gdm-transient-display.c		\
@@ -305,6 +304,12 @@ gdm_binary_SOURCES = 			\
 XDMCP_SOURCES =				\
 	gdm-xdmcp-display-factory.c	\
 	gdm-xdmcp-display-factory.h	\
+	gdm-xdmcp-display.c		\
+	gdm-xdmcp-display.h		\
+	gdm-xdmcp-greeter-display.c	\
+	gdm-xdmcp-greeter-display.h	\
+	gdm-xdmcp-chooser-display.c	\
+	gdm-xdmcp-chooser-display.h	\
 	$(NULL)
 
 if XDMCP_SUPPORT
diff --git a/gui/Makefile.am b/gui/Makefile.am
index 2e64337..326239f 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -1,6 +1,15 @@
 NULL =
 
 SUBDIRS =			\
+	simple-greeter		\
+	user-switch-applet	\
+	$(NULL)
+
+if XDMCP_SUPPORT
+SUBDIRS += simple-chooser
+endif
+
+DIST_SUBDIRS =			\
 	simple-chooser		\
 	simple-greeter		\
 	user-switch-applet	\