merge xdm 1.1.6

6 files changed, 384 insertions, 79 deletions

diff --git a/app/xdm/ChangeLog b/app/xdm/ChangeLog
index b26eed81b..e28fb5ec1 100644
--- a/app/xdm/ChangeLog
+++ b/app/xdm/ChangeLog
@@ -1,4 +1,127 @@
-2006-04-27  Alan Coopersmith  <alan.coopersmith@sun.com>
+commit e775ab1778850663a755279470d3ad6a2c9c0054
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Thu Aug 16 14:47:17 2007 -0700
+
+    Version bump: 1.1.6
+
+commit 298811a10ee1b72c553d18cc40bdfde17afb14e8
+Author: Luca Capello <luca@pca.it>
+Date:   Sun Jul 2 18:57:05 2006 +0200
+
+    Debian Bug #376391: xdm manpage refers to non-existent section 'Typical Usage'
+
+commit 593788896cdba598ceaa5fbf9e4d214583ffb6ed
+Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
+Date:   Wed Aug 15 18:38:53 2007 -0700
+
+    Debian Bug #437961: loading Xresources fails because bindir/xrdb does not exist
+    
+    <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=437961>
+
+commit ef1be3254966018fede7c33dea2f41b9351ef699
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Aug 10 10:43:10 2007 -0700
+
+    Version bump: 1.1.5
+
+commit 3ed70d13a6957c2434753f32d388888eae079d82
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Wed Jul 25 17:07:33 2007 -0700
+
+    Update AC_DEFINE_DIR to autoconf-2.60-compatible version
+
+commit dd05076f290b1995f71627324cc74053c870ac21
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Wed Jul 25 17:03:56 2007 -0700
+
+    Add AM_PROG_CC_C_O to clear automake-1.10 warning
+    
+    Makefile.am:149: compiling `chooser.c' with per-target flags requires `AM_PROG_CC_C_O' in `configure.ac'
+
+commit 29dc5825782adf929bce41a18e6a6881ef975d22
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Wed Jul 25 17:00:39 2007 -0700
+
+    Bug #10530: xdm's path to xrdb could be configurable at compile time
+    
+    Add --with-xrdb=path & --with-default-session=command configure options
+    X.Org Bug #10530: <https://bugs.freedesktop.org/show_bug.cgi?id=10530>
+
+commit 2719e18c3782c5b21f712711b4198a5bb55f5473
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Jun 15 20:14:21 2007 -0700
+
+    Set default cursor for entire root window, not just greeter
+
+commit d0d4581be22aba9021c5a672bd9e5ba719961e29
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Jun 15 19:43:46 2007 -0700
+
+    Make #ifdef XPM only control whether XPM pixmap logo is shown
+    
+    Make 3D look-and-feel independent of XPM
+
+commit 188415ebf07ff8a25ac663c37615269cd1a741a4
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Jun 15 19:23:05 2007 -0700
+
+    Set Xcursor theme to whiteglass in default login screen resources
+
+commit f8585c60831a8e5ddebce18bdd7e78d217a822c5
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Jun 15 18:36:15 2007 -0700
+
+    X.Org Bug #10992: xlogin crashes if window size is too small
+    
+    X.Org Bugzilla #10992 <https://bugs.freedesktop.org/show_bug.cgi?id=10992>
+
+commit 0ce4128e19f9fac9a565cce42a6a575486d371a5
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Jun 15 14:24:59 2007 -0700
+
+    Add --enable-xdm-auth/--disable-xdm-auth to configure options
+
+commit 8e0b23e24556fb6c6b9943bf3747e70b245fc7aa
+Author: Chip Coldwell <coldwell@physics.harvard.edu>
+Date:   Thu Jun 24 09:56:19 2004 -0700
+
+    X.Org Bug 10632 / Debian Bug 256299: race condition in policy.c:Willing()
+    
+    X.Org Bugzilla #10632 <https://bugs.freedesktop.org/show_bug.cgi?id=10632>
+    Reported upstream from
+    Debian Bug #256299 <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=256299>
+
+commit a8927ee05efba3afe955731bab5d633879c39833
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Thu May 31 17:11:15 2007 -0700
+
+    Document more of the greeter resources in xdm man page
+
+commit 35f563369470139665498640f4cda23d1227073b
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Tue May 29 19:57:29 2007 -0700
+
+    Bug #11096: xdm(1) manpage should document Xft-related properties
+    
+    X.Org Bugzilla #11096 <https://bugs.freedesktop.org/show_bug.cgi?id=11096>
+    
+    Added descriptions of the Xft *face resources and changed the core fonts
+    *font resource descriptions to match.   Also cleaned up various other
+    descriptions to make it easier for users customizing the look of the login
+    screen.
+
+commit e7f1c433dc0bd8e864cec68dbc120f27696bbba6
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Thu May 24 10:32:32 2007 -0700
+
+    Bug #11020: xdm doesn't set SSH_AUTH_SOCK even though using with pam_ssh
+    
+    Wasn't calling pam_setcred()/pam_getenvlist() if setusercontext() was present
+    X.Org Bugzilla #11020: <https://bugs.freedesktop.org/show_bug.cgi?id=11020>
+
+commit 677d028e41e890103679eec92b58044420b9b4c5
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Tue Feb 6 11:45:41 2007 -0800
 
 	* configure.ac: 
 	Version bump: 1.0.4
diff --git a/app/xdm/aclocal.m4 b/app/xdm/aclocal.m4
index 22d09b48f..a7663ddd8 100644
--- a/app/xdm/aclocal.m4
+++ b/app/xdm/aclocal.m4
@@ -7125,6 +7125,34 @@ AC_MSG_RESULT([$_am_result])
 rm -f confinc confmf
 ])
 
+# Copyright (C) 1999, 2000, 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 3
+
+# AM_PROG_CC_C_O
+# --------------
+# Like AC_PROG_CC_C_O, but changed for automake.
+AC_DEFUN([AM_PROG_CC_C_O],
+[AC_REQUIRE([AC_PROG_CC_C_O])dnl
+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
+if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+])
+
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
 # Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
diff --git a/app/xdm/config.h.in b/app/xdm/config.h.in
index 6690344e3..29b50359f 100644
--- a/app/xdm/config.h.in
+++ b/app/xdm/config.h.in
@@ -120,6 +120,9 @@
 /* Support os-specific local connections */
 #undef LOCALCONN
 
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
+
 /* Name of package */
 #undef PACKAGE
 
diff --git a/app/xdm/config/Xresources.cpp b/app/xdm/config/Xresources.cpp
index ab5a63c5f..0e25b9088 100644
--- a/app/xdm/config/Xresources.cpp
+++ b/app/xdm/config/Xresources.cpp
@@ -1,11 +1,12 @@
 ! $Xorg: Xresources,v 1.3 2000/08/17 19:54:17 cpqbld Exp $
-! $OpenBSD: Xresources.cpp,v 1.3 2007/08/05 19:37:40 matthieu Exp $
+! $OpenBSD: Xresources.cpp,v 1.4 2007/09/15 15:22:59 matthieu Exp $
 !
 !
 !
 !
 ! $XFree86: xc/programs/xdm/config/Xres.cpp,v 1.6 2003/01/04 03:11:31 dawes Exp $
 !
+
 #define BS \ /* cpp can be trickier than m4 */
 #define NLBS \n\ /* don't remove these comments */
 xlogin*login.translations: #override BS
@@ -19,15 +20,11 @@ xlogin*login.translations: #override BS
 	<Key>KP_Enter: set-session-argument() finish-field()NLBS
 	Ctrl<Key>Return: set-session-argument(failsafe) finish-field()NLBS
 	<Key>Return: set-session-argument() finish-field()
-#ifndef XPM
-xlogin*greeting: CLIENTHOST
-xlogin*namePrompt: login:\040
-#else
+
 xlogin*greeting: Welcome to CLIENTHOST
 xlogin*namePrompt: \040\040\040\040\040\040\040Login:
-#endif /* XPM */
 xlogin*fail: Login incorrect
-#ifdef XPM
+
 XHASHif WIDTH > 800
 xlogin*greetFont: -adobe-helvetica-bold-o-normal--24-240-75-75-p-138-iso8859-1
 xlogin*font: -adobe-helvetica-medium-r-normal--18-180-75-75-p-98-iso8859-1
@@ -47,7 +44,6 @@ xlogin*face: 		Sans-12
 xlogin*promptFace: 	Sans-12:bold
 xlogin*failFace: 	Sans-12:bold
 XHASHendif
-#endif /* XPM */
 
 XHASHif !(defined(bpp1) || defined(bpp4) || defined(bpp8) || defined(bpp15))
 XHASH if PLANES < 4 || defined(Hp300Architecture)
@@ -74,9 +70,6 @@ XHASH endif
 XHASHendif  //**/* If manual override */**//
 
 XHASHifndef bpp1
-#ifndef XPM
-xlogin*greetColor: CadetBlue
-#else
 xlogin*borderWidth: 2
 xlogin*frameWidth: 5
 xlogin*innerFramesWidth: 2
@@ -89,7 +82,6 @@ xlogin*shdColor: #384c70
 
 ! 'Welcome to..' text color
 xlogin*greetColor: #000000
-#endif /* XPM */
 XHASHif defined(bpp4) || defined(bpp8) || defined(bpp15)
 ! flood fill
 !xlogin*background: #2559a5
@@ -103,7 +95,6 @@ xlogin*failColor: red
 ! border/shadow
 *Background: #000000
 XHASHelse
-#ifdef XPM
 xlogin*borderWidth: 3
 xlogin*frameWidth: 5
 xlogin*innerFramesWidth: 1
@@ -115,13 +106,7 @@ xlogin*failColor: white
 xlogin*promptColor: white
 *Foreground: white
 *Background: black
-#else
-xlogin*borderWidth: 3
-xlogin*Foreground: black
-xlogin*Background: white
-#endif /* XPM */
 XHASHendif
-#if defined(XPM)
 XHASHifdef bpp1
 xlogin*logoFileName: BITMAPDIR/**//OpenBSD_1bpp.xpm
 XHASHendif
@@ -144,7 +129,6 @@ XHASHendif
 xlogin*useShape: true
 xlogin*logoPadding: 10
 #endif /* Hp300Architecture */
-#endif /* XPM */
 
 ! comment out to disable root logins
 xlogin.Login.allowRootLogin:	true
diff --git a/app/xdm/configure b/app/xdm/configure
index 68c0ca206..7000d220d 100644
--- a/app/xdm/configure
+++ b/app/xdm/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for xdm 1.1.4.
+# Generated by GNU Autoconf 2.59 for xdm 1.1.6.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='xdm'
 PACKAGE_TARNAME='xdm'
-PACKAGE_VERSION='1.1.4'
-PACKAGE_STRING='xdm 1.1.4'
+PACKAGE_VERSION='1.1.6'
+PACKAGE_STRING='xdm 1.1.6'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
 # Factoring default headers for most tests.
@@ -1045,7 +1045,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xdm 1.1.4 to adapt to many kinds of systems.
+\`configure' configures xdm 1.1.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1111,7 +1111,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xdm 1.1.4:";;
+     short | recursive ) echo "Configuration of xdm 1.1.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1143,6 +1143,8 @@ Optional Features:
   --enable-xprint         Enable XPrint support
   --enable-dynamic-greeter
                           Build greeter as dynamically loaded shared object
+  --enable-xdm-auth       Support XDM-AUTHENTICATION-1 and XDM-AUTHORIZATION-1
+                          (default: auto)
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1185,6 +1187,10 @@ Optional Packages:
   --with-pixmapdir=<pathname>
                           specify directory for xpm files
                           (default=xdmlibdir/pixmaps)
+  --with-xrdb=path        Use path for xrdb (default: bindir/xrdb)
+  --with-default-session=command
+                          Use command for default session (default:
+                          bindir/xterm -ls)
   --with-lint             Use a lint-style source code checker (default:
                           disabled)
   --with-release-version=STRING
@@ -1334,7 +1340,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-xdm configure 1.1.4
+xdm configure 1.1.6
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1348,7 +1354,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xdm $as_me 1.1.4, which was
+It was created by xdm $as_me 1.1.6, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1991,7 +1997,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xdm'
- VERSION='1.1.4'
+ VERSION='1.1.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3253,6 +3259,109 @@ else
 fi
 
 
+if test "x$CC" != xcc; then
+  echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
+echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6
+else
+  echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
+echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6
+fi
+set dummy $CC; ac_cc=`echo $2 |
+		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+# Make sure it works both with $CC and with simple cc.
+# We do the test twice because some compilers refuse to overwrite an
+# existing .o file with -o, though they will create one.
+ac_try='$CC -c conftest.$ac_ext -o conftest.$ac_objext >&5'
+if { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+   test -f conftest.$ac_objext && { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); };
+then
+  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
+  if test "x$CC" != xcc; then
+    # Test first that cc exists at all.
+    if { ac_try='cc -c conftest.$ac_ext >&5'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+      ac_try='cc -c conftest.$ac_ext -o conftest.$ac_objext >&5'
+      if { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 test -f conftest.$ac_objext && { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); };
+      then
+	# cc works too.
+	:
+      else
+	# cc exists but doesn't like -o.
+	eval ac_cv_prog_cc_${ac_cc}_c_o=no
+      fi
+    fi
+  fi
+else
+  eval ac_cv_prog_cc_${ac_cc}_c_o=no
+fi
+rm -f conftest*
+
+fi
+if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" = yes"; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define NO_MINUS_C_MINUS_O 1
+_ACEOF
+
+fi
+
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+
 
 echo "$as_me:$LINENO: checking for inline" >&5
 echo $ECHO_N "checking for inline... $ECHO_C" >&6
@@ -3946,7 +4055,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 3949 "configure"' > conftest.$ac_ext
+  echo '#line 4058 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5787,7 +5896,7 @@ fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:5790:" \
+echo "$as_me:5899:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6850,11 +6959,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6853: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6962: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6857: \$? = $ac_status" >&5
+   echo "$as_me:6966: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7118,11 +7227,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7121: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7230: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7125: \$? = $ac_status" >&5
+   echo "$as_me:7234: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7222,11 +7331,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7225: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7334: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7229: \$? = $ac_status" >&5
+   echo "$as_me:7338: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9571,7 +9680,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9574 "configure"
+#line 9683 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9671,7 +9780,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9674 "configure"
+#line 9783 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12015,11 +12124,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12018: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12127: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12022: \$? = $ac_status" >&5
+   echo "$as_me:12131: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -12119,11 +12228,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12122: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12231: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12126: \$? = $ac_status" >&5
+   echo "$as_me:12235: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13689,11 +13798,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13692: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13801: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13696: \$? = $ac_status" >&5
+   echo "$as_me:13805: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -13793,11 +13902,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13796: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13905: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13800: \$? = $ac_status" >&5
+   echo "$as_me:13909: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16000,11 +16109,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16003: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16112: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16007: \$? = $ac_status" >&5
+   echo "$as_me:16116: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16268,11 +16377,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16271: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16380: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16275: \$? = $ac_status" >&5
+   echo "$as_me:16384: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16372,11 +16481,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16375: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16484: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16379: \$? = $ac_status" >&5
+   echo "$as_me:16488: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -21927,8 +22036,8 @@ _ACEOF
 
 else
   if test "x$USE_PAM" != "xtry" ; then
-			{ { echo "$as_me:$LINENO: error: \"PAM support requested, but pam_open_session not found.\"" >&5
-echo "$as_me: error: \"PAM support requested, but pam_open_session not found.\"" >&2;}
+			{ { echo "$as_me:$LINENO: error: PAM support requested, but pam_open_session not found." >&5
+echo "$as_me: error: PAM support requested, but pam_open_session not found." >&2;}
    { (exit 1); exit 1; }; }
 		 fi
 fi
@@ -22019,8 +22128,8 @@ fi
 fi
 
 	if test x$RANDOM_DEVICE = xyes ; then
-		{ { echo "$as_me:$LINENO: error: \"random device support requested, but no random device was found.\"" >&5
-echo "$as_me: error: \"random device support requested, but no random device was found.\"" >&2;}
+		{ { echo "$as_me:$LINENO: error: random device support requested, but no random device was found." >&5
+echo "$as_me: error: random device support requested, but no random device was found." >&2;}
    { (exit 1); exit 1; }; }
 	else
 		if test x$RANDOM_DEVICE = xtry ; then
@@ -23639,6 +23748,7 @@ fi
   test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
   test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
   eval ac_define_dir="\"$GREETERLIB\""
+  eval ac_define_dir="\"$ac_define_dir\""
   DEF_GREETER_LIB="$ac_define_dir"
 
 
@@ -23748,6 +23858,31 @@ else
   xdmauth="no"
 fi
 
+
+# Check whether --enable-xdm-auth or --disable-xdm-auth was given.
+if test "${enable_xdm_auth+set}" = set; then
+  enableval="$enable_xdm_auth"
+  xdmauth_enable="$enableval"
+else
+  xdmauth_enable="auto"
+fi;
+if test "x$xdmauth_enable" = "xyes" -a "x$xdmauth" = "xno" ; then
+	{ { echo "$as_me:$LINENO: error: XDM-AUTH support requested, but XdmcpWrap not found in libXdmcp." >&5
+echo "$as_me: error: XDM-AUTH support requested, but XdmcpWrap not found in libXdmcp." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+
+if test x$xdmauth = xyes -a x$xdmauth_enable != xno; then
+  HAS_XDM_AUTH_TRUE=
+  HAS_XDM_AUTH_FALSE='#'
+else
+  HAS_XDM_AUTH_TRUE='#'
+  HAS_XDM_AUTH_FALSE=
+fi
+
+
 echo "$as_me:$LINENO: checking for library containing crypt" >&5
 echo $ECHO_N "checking for library containing crypt... $ECHO_C" >&6
 if test "${ac_cv_search_crypt+set}" = set; then
@@ -23877,17 +24012,6 @@ fi
 
 
 
-if test x$xdmauth = xyes; then
-  HAS_XDM_AUTH_TRUE=
-  HAS_XDM_AUTH_FALSE='#'
-else
-  HAS_XDM_AUTH_TRUE='#'
-  HAS_XDM_AUTH_FALSE=
-fi
-
-
-
-
 
 
 #
@@ -24037,6 +24161,7 @@ fi
   test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
   test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
   eval ac_define_dir="\"$DEF_SERVER_LINE\""
+  eval ac_define_dir="\"$ac_define_dir\""
   DEF_SERVER_LINE="$ac_define_dir"
 
 
@@ -24050,11 +24175,20 @@ _ACEOF
 
 # -DXRDB_PROGRAM="$(BINDIR)/xrdb"
 
+# Check whether --with-xrdb or --without-xrdb was given.
+if test "${with_xrdb+set}" = set; then
+  withval="$with_xrdb"
+  XRDB=$withval
+else
+  XRDB=${bindir}/xrdb
+fi;
+
   prefix_NONE=
   exec_prefix_NONE=
   test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
   test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
-  eval ac_define_dir="\"$bindir/xrdb\""
+  eval ac_define_dir="\"$XRDB\""
+  eval ac_define_dir="\"$ac_define_dir\""
   XRDB_PROGRAM="$ac_define_dir"
 
 
@@ -24068,11 +24202,20 @@ _ACEOF
 
 # -DDEF_SESSION="$(BINDIR)/xterm -ls"
 
+# Check whether --with-default-session or --without-default-session was given.
+if test "${with_default_session+set}" = set; then
+  withval="$with_default_session"
+  DEF_SESSION=$withval
+else
+  DEF_SESSION="${bindir}/xterm -ls"
+fi;
+
   prefix_NONE=
   exec_prefix_NONE=
   test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
   test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
-  eval ac_define_dir="\"$bindir/xterm -ls\""
+  eval ac_define_dir="\"$DEF_SESSION\""
+  eval ac_define_dir="\"$ac_define_dir\""
   DEF_SESSION="$ac_define_dir"
 
 
@@ -24115,6 +24258,7 @@ fi
   test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
   test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
   eval ac_define_dir="\"$DEF_USER_PATH\""
+  eval ac_define_dir="\"$ac_define_dir\""
   DEF_USER_PATH="$ac_define_dir"
 
 
@@ -24151,6 +24295,7 @@ fi
   test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
   test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
   eval ac_define_dir="\"$DEF_SYSTEM_PATH\""
+  eval ac_define_dir="\"$ac_define_dir\""
   DEF_SYSTEM_PATH="$ac_define_dir"
 
 
@@ -24172,6 +24317,7 @@ fi
   test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
   test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
   eval ac_define_dir="\"$BOURNE_SHELL\""
+  eval ac_define_dir="\"$ac_define_dir\""
   DEF_SYSTEM_SHELL="$ac_define_dir"
 
 
@@ -24191,6 +24337,7 @@ _ACEOF
   test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
   test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
   eval ac_define_dir="\"$bindir/xterm\""
+  eval ac_define_dir="\"$ac_define_dir\""
   DEF_FAILSAFE_CLIENT="$ac_define_dir"
 
 
@@ -24210,6 +24357,7 @@ _ACEOF
   test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
   test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
   eval ac_define_dir="\"$XDMCONFIGDIR/xdm-config\""
+  eval ac_define_dir="\"$ac_define_dir\""
   DEF_XDM_CONFIG="$ac_define_dir"
 
 
@@ -24229,6 +24377,7 @@ _ACEOF
   test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
   test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
   eval ac_define_dir="\"$XDMLIBDIR/chooser\""
+  eval ac_define_dir="\"$ac_define_dir\""
   DEF_CHOOSER="$ac_define_dir"
 
 
@@ -24248,6 +24397,7 @@ _ACEOF
   test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
   test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
   eval ac_define_dir="\"$XDMCONFIGDIR\""
+  eval ac_define_dir="\"$ac_define_dir\""
   DEF_AUTH_DIR="$ac_define_dir"
 
 
@@ -24267,6 +24417,7 @@ _ACEOF
   test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
   test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
   eval ac_define_dir="\"$XDMLIBDIR/libXdmGreet.so\""
+  eval ac_define_dir="\"$ac_define_dir\""
   DEF_GREETER_LIB="$ac_define_dir"
 
 
@@ -25000,7 +25151,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by xdm $as_me 1.1.4, which was
+This file was extended by xdm $as_me 1.1.6, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -25063,7 +25214,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-xdm config.status 1.1.4
+xdm config.status 1.1.6
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/app/xdm/configure.ac b/app/xdm/configure.ac
index 14a459664..d5a174172 100644
--- a/app/xdm/configure.ac
+++ b/app/xdm/configure.ac
@@ -24,13 +24,14 @@ dnl Process this file with autoconf to create configure.
 dnl $XdotOrg: app/xdm/configure.ac,v 1.42 2006/06/03 01:01:21 alanc Exp $
 
 AC_PREREQ([2.57])
-AC_INIT(xdm,[1.1.4],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xdm)
+AC_INIT(xdm,[1.1.6],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xdm)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_C_INLINE
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
@@ -112,7 +113,7 @@ if test "x$USE_PAM" != "xno" ; then
 	AC_CHECK_FUNC(pam_open_session, 
 		[AC_DEFINE(USE_PAM,1,[Use PAM for authentication])],
 		[if test "x$USE_PAM" != "xtry" ; then
-			AC_MSG_ERROR(["PAM support requested, but pam_open_session not found."])
+			AC_MSG_ERROR([PAM support requested, but pam_open_session not found.])
 		 fi])
 fi
 
@@ -155,7 +156,7 @@ if test x$RANDOM_DEVICE = xyes -o x$RANDOM_DEVICE = xtry ; then
 	AC_CHECK_FILE([/dev/urandom], [RANDOM_DEVICE=/dev/urandom],
 		AC_CHECK_FILE([/dev/random], [RANDOM_DEVICE=/dev/random]))
 	if test x$RANDOM_DEVICE = xyes ; then
-		AC_MSG_ERROR(["random device support requested, but no random device was found."])		
+		AC_MSG_ERROR([random device support requested, but no random device was found.])		
 	else 
 		if test x$RANDOM_DEVICE = xtry ; then
 			RANDOM_DEVICE="no"
@@ -390,9 +391,18 @@ XDM_CFLAGS="$XDM_CFLAGS $DMCP_CFLAGS $XLIB_CFLAGS $OS_CFLAGS $AUTH_CFLAGS"
 XDM_LIBS="$XDM_LIBS $DMCP_LIBS"
 
 AC_CHECK_LIB(Xdmcp, XdmcpWrap, [xdmauth="yes"], [xdmauth="no"], [$DMCP_LIBS])
-AC_SEARCH_LIBS(crypt, crypt)
 
-AM_CONDITIONAL(HAS_XDM_AUTH, test x$xdmauth = xyes)
+AC_ARG_ENABLE(xdm-auth,
+	AC_HELP_STRING([--enable-xdm-auth],
+       [Support XDM-AUTHENTICATION-1 and XDM-AUTHORIZATION-1 (default: auto)]),
+	[xdmauth_enable="$enableval"], [xdmauth_enable="auto"])
+if test "x$xdmauth_enable" = "xyes" -a "x$xdmauth" = "xno" ; then
+	AC_MSG_ERROR([XDM-AUTH support requested, but XdmcpWrap not found in libXdmcp.])
+fi
+
+AM_CONDITIONAL(HAS_XDM_AUTH, test x$xdmauth = xyes -a x$xdmauth_enable != xno)
+
+AC_SEARCH_LIBS(crypt, crypt)
 
 AC_SUBST(XDM_CFLAGS)
 AC_SUBST(XDM_LIBS)
@@ -433,11 +443,17 @@ AC_DEFINE_DIR(DEF_SERVER_LINE, DEF_SERVER_LINE,
 	[Define to default Xserver file entry for local X server])
 
 # -DXRDB_PROGRAM="$(BINDIR)/xrdb"
-AC_DEFINE_DIR(XRDB_PROGRAM, bindir/xrdb, 
+AC_ARG_WITH(xrdb, AC_HELP_STRING([--with-xrdb=path],
+			[Use path for xrdb (default: bindir/xrdb)]),
+	    [XRDB=$withval], [XRDB=${bindir}/xrdb])
+AC_DEFINE_DIR(XRDB_PROGRAM, XRDB, 
 	[Define to pathname for xrdb program])
 
 # -DDEF_SESSION="$(BINDIR)/xterm -ls"
-AC_DEFINE_DIR(DEF_SESSION, bindir/xterm -ls,
+AC_ARG_WITH(default-session, AC_HELP_STRING([--with-default-session=command],
+		[Use command for default session (default: bindir/xterm -ls)]),
+	    [DEF_SESSION=$withval], [DEF_SESSION="${bindir}/xterm -ls"])
+AC_DEFINE_DIR(DEF_SESSION, DEF_SESSION,
 	[Define to default command to start X session])
 
 # -DDEF_USER_PATH="$(DEF_USER_PATH)"