*** kdm/resource.c.orig	Mon Nov  3 04:42:33 1997
--- kdm/resource.c	Sat Feb 28 23:20:13 1998
***************
*** 73,90 ****
   */
  #ifndef __EMX__
  #ifndef DEF_SERVER_LINE 
! #define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0"
  #endif
  #ifndef XRDB_PROGRAM
! #define XRDB_PROGRAM "/usr/bin/X11/xrdb"
  #endif
  #ifndef DEF_SESSION
! #define DEF_SESSION "/usr/bin/X11/xterm -ls"
  #endif
  #ifndef DEF_USER_PATH
! #define DEF_USER_PATH ":/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
  #endif
  #ifndef DEF_SYSTEM_PATH
! #define DEF_SYSTEM_PATH "/etc:/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
  #endif
  #ifndef DEF_SYSTEM_SHELL
--- 73,92 ----
   */
  #ifndef __EMX__
+ #define Quote(s) #s
+ #define QUOTE(s) Quote(s)
  #ifndef DEF_SERVER_LINE 
! #define DEF_SERVER_LINE ":0 local " QUOTE(XBINDIR) "/X :0"
  #endif
  #ifndef XRDB_PROGRAM
! #define XRDB_PROGRAM QUOTE(XBINDIR) "/xrdb"
  #endif
  #ifndef DEF_SESSION
! #define DEF_SESSION QUOTE(XBINDIR) "/xterm -ls"
  #endif
  #ifndef DEF_USER_PATH
! #define DEF_USER_PATH "/bin:/usr/bin:" QUOTE(XBINDIR) ":/usr/local/bin"
  #endif
  #ifndef DEF_SYSTEM_PATH
! #define DEF_SYSTEM_PATH "/sbin:/usr/sbin:/bin:/usr/bin:" QUOTE(XBINDIR) ":/usr/local/bin"
  #endif
  #ifndef DEF_SYSTEM_SHELL
***************
*** 92,102 ****
  #endif
  #ifndef DEF_FAILSAFE_CLIENT
! #define DEF_FAILSAFE_CLIENT "/usr/bin/X11/xterm"
  #endif
  #ifndef DEF_XDM_CONFIG
! #define DEF_XDM_CONFIG "/usr/lib/X11/xdm/xdm-config"
  #endif
  #ifndef DEF_CHOOSER
! #define DEF_CHOOSER "/usr/lib/X11/xdm/chooser"
  #endif
  #ifndef DEF_AUTH_NAME
--- 94,104 ----
  #endif
  #ifndef DEF_FAILSAFE_CLIENT
! #define DEF_FAILSAFE_CLIENT QUOTE(XBINDIR) "/xterm"
  #endif
  #ifndef DEF_XDM_CONFIG
! #define DEF_XDM_CONFIG XDMDIR "/xdm-config")
  #endif
  #ifndef DEF_CHOOSER
! #define DEF_CHOOSER XDMDIR "/chooser"
  #endif
  #ifndef DEF_AUTH_NAME
***************
*** 108,112 ****
  #endif
  #ifndef DEF_AUTH_DIR
! #define DEF_AUTH_DIR "/usr/lib/X11/xdm"
  #endif
  #ifndef DEF_USER_AUTH_DIR
--- 110,114 ----
  #endif
  #ifndef DEF_AUTH_DIR
! #define DEF_AUTH_DIR	XDMDIR
  #endif
  #ifndef DEF_USER_AUTH_DIR
***************
*** 123,127 ****
  #endif
  #ifndef DEF_GREETER_LIB
! #define DEF_GREETER_LIB "/X11/lib/X11/xdm/libXdmGreet.so"
  #endif
  #else
--- 125,129 ----
  #endif
  #ifndef DEF_GREETER_LIB
! #define DEF_GREETER_LIB ""
  #endif
  #else
