Use daemon:other for SunOS

Fix sed command to disable pam checks to avoid an empy for loop in configure
Add configure check for setlogin(), and use it in daemon/slave.c
Need to define BSD_COMP before including sys/ioctl.h on SunOS to get BSD ioctls.

8 files changed, 943 insertions, 31 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 92aad8abf81..be6197e6759 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2002/10/21 15:43:28 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2002/10/26 19:51:07 bouyer Exp $
 
 DISTNAME=	gdm-2.2.0
 PKGREVISION=	2
@@ -30,8 +30,6 @@ MAKE_ENV+=	GDMOWN=${GDMOWN} GDMGRP=${GDMGRP}
 PLIST_SUBST+=	GDMOWN=${GDMOWN} GDMGRP=${GDMGRP} \
 		INSTALL="${INSTALL}" LOCALSTATEDIR="${LOCALSTATEDIR}"
 
-GDMOWN=		daemon
-GDMGRP=		daemon
 GDMCFGDIR=	${PREFIX}/etc/gdm
 GDMCFGFILES=	Default:Init.default/Default \
 		PostSession:PostSession.default/Default \
@@ -45,6 +43,15 @@ GDMCFGFILES=	Default:Init.default/Default \
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${OPSYS} == "SunOS"
+CFLAGS+= -DSunOS
+GDMOWN=		daemon
+GDMGRP=		other
+.else
+GDMOWN=		daemon
+GDMGRP=		daemon
+.endif
+
 .if defined(USE_PAM)
 DEPENDS+=	PAM-[0-9]*:../../security/PAM
 .else
@@ -52,7 +59,7 @@ DEPENDS+=	PAM-[0-9]*:../../security/PAM
 post-patch:
 	cd ${WRKSRC} &&					\
 	${CP} configure configure.old &&		\
-	${SED} -e 's:security/pam_appl.h::g'		\
+	${SED} -e 's:security/pam_appl.h:nopam:g'	\
 		< configure.old > configure
 .endif
 
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 83700ecba01..47609c8d925 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/07/27 15:20:05 jschauma Exp $
+$NetBSD: distinfo,v 1.4 2002/10/26 19:51:07 bouyer Exp $
 
 SHA1 (gdm-2.2.0.tar.gz) = 135b424cc1493f92b500c4fe7d85e9ada57313e1
 Size (gdm-2.2.0.tar.gz) = 810976 bytes
@@ -6,12 +6,15 @@ SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 Size (Daemon.README) = 2191 bytes
 SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
 Size (Daemon.png) = 15725 bytes
-SHA1 (patch-aa) = 98299b243415299452e8e30b7edb20a9d333fa1e
+SHA1 (patch-aa) = 53fed25b228d9c021b8134d4257ad86efbcd9055
 SHA1 (patch-ab) = 944f67fd37460172b7b434ec5f3cc4ad31d3eff1
 SHA1 (patch-ac) = 32361628caef6cd0f1f50318a0b3f76249f6b76c
 SHA1 (patch-ae) = 1af3691044028dcf75b7eac9aa20563b7cc152d5
-SHA1 (patch-af) = a3c796e78f198e6d45aa6f1e2827e6788b10ce0f
+SHA1 (patch-af) = b1e863e414de026e77eb0f24810d7aa811011c15
+SHA1 (patch-ag) = 8f3c68f79f6bbea798c6dbbd045ffd64a6abb720
+SHA1 (patch-ah) = c5f5d5456945a8a2e27c12a811e257195b67b93a
+SHA1 (patch-ai) = ae0181bc4b6f4c554b564744f410b7899dc8b7e6
 SHA1 (patch-ba) = 35e1ac11945b2e72270fcf2fb5be60e3168a48d9
 SHA1 (patch-bb) = 0a3b2d0013e6abee732e4f66677f2c916691f49f
-SHA1 (patch-bc) = 1049325306e13cf1c90e08e36d0e918ab106cb3e
+SHA1 (patch-bc) = fa9155621b7e76ebf124e03eef6ca22bd18651a2
 SHA1 (patch-bd) = 9bee6d79104058ab4bb67892c72f846bd270d2ce
diff --git a/x11/gdm/patches/patch-aa b/x11/gdm/patches/patch-aa
index 3c0b89711bd..0a969ddf881 100644
--- a/x11/gdm/patches/patch-aa
+++ b/x11/gdm/patches/patch-aa
@@ -1,24 +1,867 @@
-$NetBSD: patch-aa,v 1.2 2001/03/20 02:42:14 mjl Exp $
+$NetBSD: patch-aa,v 1.3 2002/10/26 19:51:08 bouyer Exp $
 
 --- configure.orig	Tue Mar 13 01:23:59 2001
-+++ configure	Tue Mar 20 02:51:23 2001
-@@ -4781,7 +4781,7 @@
++++ configure	Tue Oct 22 21:25:03 2002
+@@ -3008,14 +3008,18 @@
  
- have_pam=no
- VRFY="verify-crypt"
--for ac_hdr in security/pam_appl.h
-+for ac_hdr in 
+ 
+ 
++
++
++
++
+ ALL_LINGUAS="az ca cs da de el es et fi fr ga gl hu it ja ko lt nl nn no pl pt_BR ro ru sk sl sv tr uk zh_CN.GB2312 zh_TW.Big5"
+ echo $ac_n "checking for working const""... $ac_c" 1>&6
+-echo "configure:3014: checking for working const" >&5
++echo "configure:3018: checking for working const" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3019 "configure"
++#line 3023 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -3064,7 +3068,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3068: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_const=yes
+ else
+@@ -3085,7 +3089,7 @@
+ fi
+ 
+ echo $ac_n "checking for inline""... $ac_c" 1>&6
+-echo "configure:3089: checking for inline" >&5
++echo "configure:3093: checking for inline" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3092,7 +3096,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat > conftest.$ac_ext <<EOF
+-#line 3096 "configure"
++#line 3100 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -3099,7 +3103,7 @@
+ } $ac_kw foo() {
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3103: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3107: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -3125,12 +3129,12 @@
+ esac
+ 
+ echo $ac_n "checking for off_t""... $ac_c" 1>&6
+-echo "configure:3129: checking for off_t" >&5
++echo "configure:3133: checking for off_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3134 "configure"
++#line 3138 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -3158,12 +3162,12 @@
+ fi
+ 
+ echo $ac_n "checking for size_t""... $ac_c" 1>&6
+-echo "configure:3162: checking for size_t" >&5
++echo "configure:3166: checking for size_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3167 "configure"
++#line 3171 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -3193,12 +3197,12 @@
+ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+ # for constant arguments.  Useless!
+ echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
+-echo "configure:3197: checking for working alloca.h" >&5
++echo "configure:3201: checking for working alloca.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3202 "configure"
++#line 3206 "configure"
+ #include "confdefs.h"
+ #include <alloca.h>
+ int main() {
+@@ -3205,7 +3209,7 @@
+ char *p = alloca(2 * sizeof(int));
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_header_alloca_h=yes
+ else
+@@ -3226,12 +3230,12 @@
+ fi
+ 
+ echo $ac_n "checking for alloca""... $ac_c" 1>&6
+-echo "configure:3230: checking for alloca" >&5
++echo "configure:3234: checking for alloca" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3235 "configure"
++#line 3239 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef __GNUC__
+@@ -3259,7 +3263,7 @@
+ char *p = (char *) alloca(1);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_func_alloca_works=yes
+ else
+@@ -3291,12 +3295,12 @@
+ 
+ 
+ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
+-echo "configure:3295: checking whether alloca needs Cray hooks" >&5
++echo "configure:3299: checking whether alloca needs Cray hooks" >&5
+ if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3300 "configure"
++#line 3304 "configure"
+ #include "confdefs.h"
+ #if defined(CRAY) && ! defined(CRAY2)
+ webecray
+@@ -3321,12 +3325,12 @@
+ if test $ac_cv_os_cray = yes; then
+ for ac_func in _getb67 GETB67 getb67; do
+   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:3325: checking for $ac_func" >&5
++echo "configure:3329: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3330 "configure"
++#line 3334 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -3349,7 +3353,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -3376,7 +3380,7 @@
+ fi
+ 
+ echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
+-echo "configure:3380: checking stack direction for C alloca" >&5
++echo "configure:3384: checking stack direction for C alloca" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3384,7 +3388,7 @@
+   ac_cv_c_stack_direction=0
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3388 "configure"
++#line 3392 "configure"
+ #include "confdefs.h"
+ find_stack_direction ()
+ {
+@@ -3403,7 +3407,7 @@
+   exit (find_stack_direction() < 0);
+ }
+ EOF
+-if { (eval echo configure:3407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_c_stack_direction=1
+ else
+@@ -3428,17 +3432,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -5204,6 +5204,10 @@
-  s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
- $ac_vpsub
- $extrasub
+-echo "configure:3432: checking for $ac_hdr" >&5
++echo "configure:3436: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3437 "configure"
++#line 3441 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3442: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3446: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -3467,12 +3471,12 @@
+ for ac_func in getpagesize
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:3471: checking for $ac_func" >&5
++echo "configure:3475: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3476 "configure"
++#line 3480 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -3495,7 +3499,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -3520,7 +3524,7 @@
+ done
+ 
+ echo $ac_n "checking for working mmap""... $ac_c" 1>&6
+-echo "configure:3524: checking for working mmap" >&5
++echo "configure:3528: checking for working mmap" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3528,7 +3532,7 @@
+   ac_cv_func_mmap_fixed_mapped=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3532 "configure"
++#line 3536 "configure"
+ #include "confdefs.h"
+ 
+ /* Thanks to Mike Haertel and Jim Avera for this test.
+@@ -3668,7 +3672,7 @@
+ }
+ 
+ EOF
+-if { (eval echo configure:3672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_func_mmap_fixed_mapped=yes
+ else
+@@ -3696,17 +3700,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:3700: checking for $ac_hdr" >&5
++echo "configure:3704: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3705 "configure"
++#line 3709 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3710: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3714: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -3736,12 +3740,12 @@
+ strdup __argz_count __argz_stringify __argz_next
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:3740: checking for $ac_func" >&5
++echo "configure:3744: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3745 "configure"
++#line 3749 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -3764,7 +3768,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -3793,12 +3797,12 @@
+      for ac_func in stpcpy
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:3797: checking for $ac_func" >&5
++echo "configure:3801: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3802 "configure"
++#line 3806 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -3821,7 +3825,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -3855,12 +3859,12 @@
+ 
+    if test $ac_cv_header_locale_h = yes; then
+     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
+-echo "configure:3859: checking for LC_MESSAGES" >&5
++echo "configure:3863: checking for LC_MESSAGES" >&5
+ if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3864 "configure"
++#line 3868 "configure"
+ #include "confdefs.h"
+ #include <locale.h>
+ int main() {
+@@ -3867,7 +3871,7 @@
+ return LC_MESSAGES
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   am_cv_val_LC_MESSAGES=yes
+ else
+@@ -3888,7 +3892,7 @@
+     fi
+   fi
+    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
+-echo "configure:3892: checking whether NLS is requested" >&5
++echo "configure:3896: checking whether NLS is requested" >&5
+         # Check whether --enable-nls or --disable-nls was given.
+ if test "${enable_nls+set}" = set; then
+   enableval="$enable_nls"
+@@ -3920,17 +3924,17 @@
+ 
+ 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
+-echo "configure:3924: checking for libintl.h" >&5
++echo "configure:3928: checking for libintl.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3929 "configure"
++#line 3933 "configure"
+ #include "confdefs.h"
+ #include <libintl.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3934: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -3947,12 +3951,12 @@
+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6
+-echo "configure:3951: checking for gettext in libc" >&5
++echo "configure:3955: checking for gettext in libc" >&5
+ if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3956 "configure"
++#line 3960 "configure"
+ #include "confdefs.h"
+ #include <libintl.h>
+ int main() {
+@@ -3959,7 +3963,7 @@
+ return (int) gettext ("")
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   gt_cv_func_gettext_libc=yes
+ else
+@@ -3975,7 +3979,7 @@
+ 
+ 	   if test "$gt_cv_func_gettext_libc" != "yes"; then
+ 	     echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
+-echo "configure:3979: checking for bindtextdomain in -lintl" >&5
++echo "configure:3983: checking for bindtextdomain in -lintl" >&5
+ ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3983,7 +3987,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lintl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3987 "configure"
++#line 3991 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -3994,7 +3998,7 @@
+ bindtextdomain()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4010,12 +4014,12 @@
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6
+-echo "configure:4014: checking for gettext in libintl" >&5
++echo "configure:4018: checking for gettext in libintl" >&5
+ if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
+-echo "configure:4019: checking for gettext in -lintl" >&5
++echo "configure:4023: checking for gettext in -lintl" >&5
+ ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4023,7 +4027,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lintl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4027 "configure"
++#line 4031 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -4034,7 +4038,7 @@
+ gettext()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4073,7 +4077,7 @@
+ 	      # Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4077: checking for $ac_word" >&5
++echo "configure:4081: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4107,12 +4111,12 @@
+ 		for ac_func in dcgettext
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:4111: checking for $ac_func" >&5
++echo "configure:4115: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4116 "configure"
++#line 4120 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -4135,7 +4139,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -4162,7 +4166,7 @@
+ 		# Extract the first word of "gmsgfmt", so it can be a program name with args.
+ set dummy gmsgfmt; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4166: checking for $ac_word" >&5
++echo "configure:4170: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4198,7 +4202,7 @@
+ 		# Extract the first word of "xgettext", so it can be a program name with args.
+ set dummy xgettext; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4202: checking for $ac_word" >&5
++echo "configure:4206: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4230,7 +4234,7 @@
+ fi
+ 
+ 		cat > conftest.$ac_ext <<EOF
+-#line 4234 "configure"
++#line 4238 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -4238,7 +4242,7 @@
+ 			       return _nl_msg_cat_cntr
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   CATOBJEXT=.gmo
+ 		   DATADIRNAME=share
+@@ -4268,7 +4272,7 @@
+ 
+         if test "$CATOBJEXT" = "NONE"; then
+ 	  echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6
+-echo "configure:4272: checking whether catgets can be used" >&5
++echo "configure:4276: checking whether catgets can be used" >&5
+ 	  # Check whether --with-catgets or --without-catgets was given.
+ if test "${with_catgets+set}" = set; then
+   withval="$with_catgets"
+@@ -4281,7 +4285,7 @@
+ 
+ 	  if test "$nls_cv_use_catgets" = "yes"; then
+ 	    	    echo $ac_n "checking for main in -li""... $ac_c" 1>&6
+-echo "configure:4285: checking for main in -li" >&5
++echo "configure:4289: checking for main in -li" >&5
+ ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4289,7 +4293,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-li  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4293 "configure"
++#line 4297 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -4296,7 +4300,7 @@
+ main()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4324,12 +4328,12 @@
+ fi
+ 
+ 	    echo $ac_n "checking for catgets""... $ac_c" 1>&6
+-echo "configure:4328: checking for catgets" >&5
++echo "configure:4332: checking for catgets" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4333 "configure"
++#line 4337 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char catgets(); below.  */
+@@ -4352,7 +4356,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_catgets=yes"
+ else
+@@ -4374,7 +4378,7 @@
+ 	       # Extract the first word of "gencat", so it can be a program name with args.
+ set dummy gencat; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4378: checking for $ac_word" >&5
++echo "configure:4382: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4514,7 +4518,7 @@
+        LINGUAS=
+      else
+        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
+-echo "configure:4518: checking for catalogs to be installed" >&5
++echo "configure:4522: checking for catalogs to be installed" >&5
+        NEW_LINGUAS=
+        if test "x$LINGUAS" = "x"; then
+            LINGUAS=$ALL_LINGUAS
+@@ -4545,17 +4549,17 @@
+    if test "$CATOBJEXT" = ".cat"; then
+      ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
+-echo "configure:4549: checking for linux/version.h" >&5
++echo "configure:4553: checking for linux/version.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4554 "configure"
++#line 4558 "configure"
+ #include "confdefs.h"
+ #include <linux/version.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4559: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4563: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -4620,15 +4624,15 @@
+ 	< $srcdir/po/POTFILES.in > po/POTFILES
+   
+ 
+-for ac_func in setenv unsetenv
++for ac_func in setenv unsetenv setlogin
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:4627: checking for $ac_func" >&5
++echo "configure:4631: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4632 "configure"
++#line 4636 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -4651,7 +4655,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -4678,7 +4682,7 @@
+ 
+ # TCP Wrappers for XDMCP access control
+ echo $ac_n "checking "whether to use TCP wrappers"""... $ac_c" 1>&6
+-echo "configure:4682: checking "whether to use TCP wrappers"" >&5
++echo "configure:4686: checking "whether to use TCP wrappers"" >&5
+ LIBWRAP_PATH=""
+ for I in $LDFLAGS $LIBS -L/usr/lib; do
+ 	case "$I" in
+@@ -4722,11 +4726,11 @@
+ LIB_NSL=
+ if test -n "$LIBWRAP_PATH"; then
+         echo $ac_n "checking whether -lwrap requires -lnsl""... $ac_c" 1>&6
+-echo "configure:4726: checking whether -lwrap requires -lnsl" >&5
++echo "configure:4730: checking whether -lwrap requires -lnsl" >&5
+         ORIG_LIBS="$LIBS"
+         LIBS="$LIBWRAP_PATH $LIBS"
+         cat > conftest.$ac_ext <<EOF
+-#line 4730 "configure"
++#line 4734 "configure"
+ #include "confdefs.h"
+ 
+ #include <tcpd.h>
+@@ -4736,7 +4740,7 @@
+ return hosts_access;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+@@ -4746,7 +4750,7 @@
+ OLD_LIBS="$LIBS"
+ LIBS="$LIBS -lnsl"
+ cat > conftest.$ac_ext <<EOF
+-#line 4750 "configure"
++#line 4754 "configure"
+ #include "confdefs.h"
+ 
+ #include <tcpd.h>
+@@ -4756,7 +4760,7 @@
+ return hosts_access;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   LIB_NSL="-lnsl"
+ else
+@@ -4785,17 +4789,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:4789: checking for $ac_hdr" >&5
++echo "configure:4793: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4794 "configure"
++#line 4798 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4803: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -4833,7 +4837,7 @@
+ 
+   # Check if -lcrypt is necessary
+   echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
+-echo "configure:4837: checking for crypt in -lcrypt" >&5
++echo "configure:4841: checking for crypt in -lcrypt" >&5
+ ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4841,7 +4845,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lcrypt  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4845 "configure"
++#line 4849 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -4852,7 +4856,7 @@
+ crypt()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4879,17 +4883,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:4883: checking for $ac_hdr" >&5
++echo "configure:4887: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4888 "configure"
++#line 4892 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4897: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -4922,7 +4926,7 @@
+ 
+   # Check for shadow passwords (hack)
+   echo $ac_n "checking "for /etc/shadow"""... $ac_c" 1>&6
+-echo "configure:4926: checking "for /etc/shadow"" >&5
++echo "configure:4930: checking "for /etc/shadow"" >&5
+ 
+   if test -f /etc/shadow; then
+ 	VRFY="verify-shadow"
+@@ -4942,17 +4946,17 @@
+ # X11 Xinerama extension
+ ac_safe=`echo "X11/extensions/Xinerama.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for X11/extensions/Xinerama.h""... $ac_c" 1>&6
+-echo "configure:4946: checking for X11/extensions/Xinerama.h" >&5
++echo "configure:4950: checking for X11/extensions/Xinerama.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4951 "configure"
++#line 4955 "configure"
+ #include "confdefs.h"
+ #include <X11/extensions/Xinerama.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4956: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4960: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -4970,7 +4974,7 @@
+   echo "$ac_t""yes" 1>&6
+   
+ 	echo $ac_n "checking for XineramaQueryScreens in -lXinerama""... $ac_c" 1>&6
+-echo "configure:4974: checking for XineramaQueryScreens in -lXinerama" >&5
++echo "configure:4978: checking for XineramaQueryScreens in -lXinerama" >&5
+ ac_lib_var=`echo Xinerama'_'XineramaQueryScreens | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4978,7 +4982,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lXinerama $GTK_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4982 "configure"
++#line 4986 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -4989,7 +4993,7 @@
+ XineramaQueryScreens()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5289,6 +5293,10 @@
+ s%@LIBGLADE_LIBS@%$LIBGLADE_LIBS%g
+ s%@CONSOLE_HELPER_TRUE@%$CONSOLE_HELPER_TRUE%g
+ s%@CONSOLE_HELPER_FALSE@%$CONSOLE_HELPER_FALSE%g
 +s%@GDMOWN@%$GDMOWN%g
 +s%@GDMGRP@%$GDMGRP%g
 +s%@X11BASE@%$X11BASE%g
 +s%@LOCALBASE@%$LOCALBASE%g
- s%@SHELL@%$SHELL%g
- s%@CFLAGS@%$CFLAGS%g
- s%@CPPFLAGS@%$CPPFLAGS%g
+ s%@ALLOCA@%$ALLOCA%g
+ s%@USE_NLS@%$USE_NLS%g
+ s%@MSGFMT@%$MSGFMT%g
diff --git a/x11/gdm/patches/patch-af b/x11/gdm/patches/patch-af
index 67e7fae7765..b28065795f0 100644
--- a/x11/gdm/patches/patch-af
+++ b/x11/gdm/patches/patch-af
@@ -1,12 +1,14 @@
-$NetBSD: patch-af,v 1.6 2001/03/28 22:32:03 wennmach Exp $
+$NetBSD: patch-af,v 1.7 2002/10/26 19:51:08 bouyer Exp $
 
 --- daemon/slave.c.orig	Mon Mar  5 01:29:54 2001
-+++ daemon/slave.c	Tue Mar 20 02:59:34 2001
-@@ -457,11 +457,11 @@
++++ daemon/slave.c	Tue Oct 22 20:28:04 2002
+@@ -457,11 +457,14 @@
      gdm_setenv ("DISPLAY", d->name);
      gdm_setenv ("LOGNAME", login);
      gdm_setenv ("USER", login);
--    gdm_setenv ("USERNAME", login);
++#ifndef HAVE_SETLOGIN
+     gdm_setenv ("USERNAME", login);
++#endif
      gdm_setenv ("HOME", pwent->pw_dir);
      gdm_setenv ("GDMSESSION", session);
      gdm_setenv ("SHELL", pwent->pw_shell);
@@ -15,14 +17,16 @@ $NetBSD: patch-af,v 1.6 2001/03/28 22:32:03 wennmach Exp $
  
      /* Special PATH for root */
      if (pwent->pw_uid == 0)
-@@ -518,6 +518,10 @@
+@@ -517,7 +520,11 @@
+ 	if (setgid (pwent->pw_gid) < 0) 
  	    gdm_slave_exit (DISPLAY_REMANAGE,
  			    _("gdm_slave_session_start: Could not setgid %d. Aborting."), pwent->pw_gid);
- 	
+-	
++#ifdef HAVE_SETLOGIN
 +	if (setlogin (login) < 0) 
 +		gdm_slave_exit (DISPLAY_REMANAGE,
 +			    _("gdm_slave_session_start: Could not set login name %s. Aborting."), login);
-+
++#endif
  	if (initgroups (login, pwent->pw_gid) < 0)
  	    gdm_slave_exit (DISPLAY_REMANAGE,
  			    _("gdm_slave_session_start: initgroups() failed for %s. Aborting."), login);
diff --git a/x11/gdm/patches/patch-ag b/x11/gdm/patches/patch-ag
new file mode 100644
index 00000000000..8d2cc4cc770
--- /dev/null
+++ b/x11/gdm/patches/patch-ag
@@ -0,0 +1,22 @@
+$NetBSD: patch-ag,v 1.1 2002/10/26 19:51:08 bouyer Exp $
+
+--- configure.in.orig	Thu Mar  8 07:51:46 2001
++++ configure.in	Tue Oct 22 21:23:40 2002
+@@ -32,12 +32,16 @@
+ AC_SUBST(CFLAGS)
+ AC_SUBST(CPPFLAGS)
+ AC_SUBST(LDFLAGS)
++AC_SUBST(GDMOWN)
++AC_SUBST(GDMGRP)
++AC_SUBST(X11BASE)
++AC_SUBST(LOCALBASE)
+ 
+ dnl ## internationalization support
+ ALL_LINGUAS="az ca cs da de el es et fi fr ga gl hu it ja ko lt nl nn no pl pt_BR ro ru sk sl sv tr uk zh_CN.GB2312 zh_TW.Big5"
+ AM_GNOME_GETTEXT
+ 
+-AC_CHECK_FUNCS([setenv unsetenv])
++AC_CHECK_FUNCS([setenv unsetenv setlogin])
+ 
+ # TCP Wrappers for XDMCP access control
+ AC_MSG_CHECKING("whether to use TCP wrappers")
diff --git a/x11/gdm/patches/patch-ah b/x11/gdm/patches/patch-ah
new file mode 100644
index 00000000000..2dd819721db
--- /dev/null
+++ b/x11/gdm/patches/patch-ah
@@ -0,0 +1,14 @@
+$NetBSD: patch-ah,v 1.1 2002/10/26 19:51:08 bouyer Exp $
+
+--- config.h.in.orig	Tue Oct 22 20:34:02 2002
++++ config.h.in	Tue Oct 22 20:34:28 2002
+@@ -102,6 +102,9 @@
+ /* Define if you have the unsetenv function.  */
+ #undef HAVE_UNSETENV
+ 
++/* Define if you have the setlogin function.  */
++#undef HAVE_SETLOGIN
++
+ /* Define if you have the <X11/SM/SMlib.h> header file.  */
+ #undef HAVE_X11_SM_SMLIB_H
+ 
diff --git a/x11/gdm/patches/patch-ai b/x11/gdm/patches/patch-ai
new file mode 100644
index 00000000000..94320cd73a4
--- /dev/null
+++ b/x11/gdm/patches/patch-ai
@@ -0,0 +1,19 @@
+$NetBSD: patch-ai,v 1.1 2002/10/26 19:51:08 bouyer Exp $
+
+--- gui/gdmchooser.c	Tue Oct 22 20:48:21 2002
++++ gui/gdmchooser.c.orig	Tue Oct 22 20:47:33 2002
+@@ -47,7 +47,14 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#ifdef SunOS
++#define BSD_COMP
+ #include <sys/ioctl.h>
++#undef BSD_COMP
++#else
++#include <sys/ioctl.h>
++#endif
++
+ #include <net/if.h>
+ 
+ #include "gdmchooser.h"
diff --git a/x11/gdm/patches/patch-bc b/x11/gdm/patches/patch-bc
index cc1c1bb8c5f..d0b20bb5f17 100644
--- a/x11/gdm/patches/patch-bc
+++ b/x11/gdm/patches/patch-bc
@@ -1,4 +1,4 @@
-$NetBSD: patch-bc,v 1.2 2001/03/28 22:30:43 wennmach Exp $
+$NetBSD: patch-bc,v 1.3 2002/10/26 19:51:08 bouyer Exp $
 
 --- config/Makefile.in.orig	Tue Mar 20 03:07:31 2001
 +++ config/Makefile.in	Tue Mar 20 03:08:13 2001
@@ -7,7 +7,7 @@ $NetBSD: patch-bc,v 1.2 2001/03/28 22:30:43 wennmach Exp $
  	if test '!' -d $(authdir); then \
  		$(mkinstalldirs) $(authdir); \
 -		chown gdm.gdm $(authdir); \
-+		chown ${GDMOWN}.${GDMGRP} $(authdir); \
++		chown ${GDMOWN}:${GDMGRP} $(authdir); \
  		chmod 750 $(authdir); \
  	fi