[Xorg-commit] xc/programs/xdm/config Imakefile,1.1.4.2,1.1.4.3 xdm-conf.cpp,1.1.4.1,1.1.4.2

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/programs/xdm/config
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/programs/xdm/config

Modified Files:
      Tag: XORG-CURRENT
	Imakefile xdm-conf.cpp 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/xdm/config/Imakefile,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/Imakefile	6 Dec 2003 13:24:29 -0000	1.1.4.2
+++ b/Imakefile	23 Feb 2004 21:37:43 -0000	1.1.4.3
@@ -4,7 +4,7 @@
 
 
 
-XCOMM $XFree86: xc/programs/xdm/config/Imakefile,v 1.13 2003/11/24 02:02:30 dawes Exp $
+XCOMM $XFree86: xc/programs/xdm/config/Imakefile,v 1.15 2004/01/09 00:25:25 dawes Exp $
 
 SERVERSTYPE = XdmServersType
 
@@ -23,6 +23,8 @@
 # define XdmbwPixmap XFree86bw.xpm
 #endif
 
+CHOOSERPATH = $(XDMDIR)/chooser
+
 XPM_DEFINES=-DXPM -DBITMAPDIR=$(XDMDIR)/pixmaps -DXDM_PIXMAP=XdmPixmap\ @@\
 	-DXDM_BWPIXMAP=XdmbwPixmap
 
@@ -33,14 +35,14 @@
 XDMPIDDIR = $(XDMDIR)
 #endif
 
-#if defined(OpenBSDArchitecture) || defined(NetBSDArchitecture) || defined(FreeBSDArchitecture)
+#if defined(OpenBSDArchitecture) || defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) || defined(DarwinArchitecture)
 SU = "su -m"
 #else
 SU = su
 #endif
 
 CppFileTarget(Xservers.ws,Xserv.ws.cpp,-DBINDIR=$(BINDIR) -DDEFAULTVT=$(DEFAULTVT),NullParameter)
-CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU),NullParameter)
+CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DCHOOSERPATH=$(CHOOSERPATH),NullParameter)
 CppFileTarget(Xresources,Xres.cpp,$(XPM_DEFINES),NullParameter)
 
 LinkFile(Xservers,Xservers.$(SERVERSTYPE))

Index: xdm-conf.cpp
===================================================================
RCS file: /cvs/xorg/xc/programs/xdm/config/xdm-conf.cpp,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/xdm-conf.cpp	17 Nov 2003 19:03:47 -0000	1.1.4.1
+++ b/xdm-conf.cpp	23 Feb 2004 21:37:43 -0000	1.1.4.2
@@ -3,7 +3,7 @@
 !
 !
 !
-! $XFree86: xc/programs/xdm/config/xdm-conf.cpp,v 1.10 2002/11/30 19:11:32 herrb Exp $
+! $XFree86: xc/programs/xdm/config/xdm-conf.cpp,v 1.11 2004/01/09 00:25:25 dawes Exp $
 !
 DisplayManager.errorLogFile:	XDMLOGDIR/xdm.log
 DisplayManager.pidFile:		XDMPIDDIR/xdm.pid
@@ -20,6 +20,7 @@
 DisplayManager._0.startup:	XDMDIR/GiveConsole
 DisplayManager._0.reset:	XDMDIR/TakeConsole
 !
+DisplayManager*chooser:		CHOOSERPATH
 DisplayManager*resources:	XDMDIR/Xresources
 DisplayManager*session:		XDMDIR/Xsession
 DisplayManager*authComplain:	true