update to xdm-1.1.7 (No changes on OpenBSD).

4 files changed, 51 insertions, 20 deletions

diff --git a/app/xdm/ChangeLog b/app/xdm/ChangeLog
index e28fb5ec1..5f9edd9d7 100644
--- a/app/xdm/ChangeLog
+++ b/app/xdm/ChangeLog
@@ -1,3 +1,31 @@
+commit 996fea2fb1ae1e419e673b89cc3778e371a29324
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Mar 7 17:10:30 2008 -0500
+
+    Fix distcheck.
+
+commit 87a8f18c334b3e5819f92d0f8f37cc41987486d4
+Author: Jeremy Huddleston <jeremy@yuffie.local>
+Date:   Thu Dec 20 19:11:53 2007 -0800
+
+    Darwin doesn't need __DARWIN__ anymore.
+
+commit 28f4ded22488ce8542ff8b9871f6b4e04614058d
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Sep 21 11:03:54 2007 -0700
+
+    Debian bug #440389: 800x600 settings got lost, screen now too wide
+    
+    Debian bug #440389 <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440389>
+    When deleting the XPM #ifdefs, a set of #if WIDTH < 800 resources
+    got accidentally deleted as well.  (Cause & fix found by Brice Goglin)
+
+commit 923176024d3d6b7f5b392b4f9a07cce8c6ed3823
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Aug 27 14:17:13 2007 -0700
+
+    Restore #endif accidentally removed in d0d4581be22aba9021c5a672bd9e5ba719961e29
+
 commit e775ab1778850663a755279470d3ad6a2c9c0054
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Thu Aug 16 14:47:17 2007 -0700
diff --git a/app/xdm/aclocal.m4 b/app/xdm/aclocal.m4
index c532cd5be..24fbb0ae0 100644
--- a/app/xdm/aclocal.m4
+++ b/app/xdm/aclocal.m4
@@ -7521,7 +7521,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
 	XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
 	XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
 	AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
-	[XORG_MACROS_version=1.1.5
+	[XORG_MACROS_version=1.1.6
 	XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
 	XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
 	if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@@ -7670,7 +7670,11 @@ AC_DEFUN([XORG_CHECK_LINUXDOC],[
 XORG_SGML_PATH=$prefix/share/sgml
 HAVE_DEFS_ENT=
 
-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+if test x"$cross_compiling" = x"yes" ; then
+  HAVE_DEFS_ENT=no
+else
+  AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+fi
 
 AC_PATH_PROG(LINUXDOC, linuxdoc)
 AC_PATH_PROG(PS2PDF, ps2pdf)
@@ -7942,14 +7946,14 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
 	AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
 		[`echo $PACKAGE_VERSION | cut -d . -f 1`],
 		[Major version of this package])
-	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
 	if test "x$PVM" = "x"; then
 		PVM="0"
 	fi
 	AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
 		[$PVM],
 		[Minor version of this package])
-	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
 	if test "x$PVP" = "x"; then
 		PVP="0"
 	fi
diff --git a/app/xdm/configure b/app/xdm/configure
index 96bb1ba1f..f72026bb2 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.6.
+# Generated by GNU Autoconf 2.59 for xdm 1.1.7.
 #
 # 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.6'
-PACKAGE_STRING='xdm 1.1.6'
+PACKAGE_VERSION='1.1.7'
+PACKAGE_STRING='xdm 1.1.7'
 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.6 to adapt to many kinds of systems.
+\`configure' configures xdm 1.1.7 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.6:";;
+     short | recursive ) echo "Configuration of xdm 1.1.7:";;
    esac
   cat <<\_ACEOF
 
@@ -1340,7 +1340,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-xdm configure 1.1.6
+xdm configure 1.1.7
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1354,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.6, which was
+It was created by xdm $as_me 1.1.7, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1952,7 +1952,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xdm'
- VERSION='1.1.6'
+ VERSION='1.1.7'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -22010,7 +22010,7 @@ case $host_os in
 	SU="su"
         ;;
     darwin*)
-        OS_CFLAGS="-D__DARWIN__ -DNO_LASTLOG"
+        OS_CFLAGS="-DNO_LASTLOG"
 	SU="su -m"
         ;;
     *bsd*|dragonfly*)
@@ -24632,7 +24632,7 @@ cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
 _ACEOF
 
-	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
 	if test "x$PVM" = "x"; then
 		PVM="0"
 	fi
@@ -24641,7 +24641,7 @@ cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION_MINOR $PVM
 _ACEOF
 
-	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
 	if test "x$PVP" = "x"; then
 		PVP="0"
 	fi
@@ -25106,7 +25106,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by xdm $as_me 1.1.6, which was
+This file was extended by xdm $as_me 1.1.7, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -25169,7 +25169,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-xdm config.status 1.1.6
+xdm config.status 1.1.7
 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 d5a174172..856d3cf2e 100644
--- a/app/xdm/configure.ac
+++ b/app/xdm/configure.ac
@@ -1,4 +1,3 @@
-
 dnl  Copyright 2005 Red Hat, Inc.
 dnl 
 dnl  Permission to use, copy, modify, distribute, and sell this software and its
@@ -24,7 +23,7 @@ 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.6],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xdm)
+AC_INIT(xdm,[1.1.7],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xdm)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 
@@ -128,7 +127,7 @@ case $host_os in
 	SU="su"
         ;;
     darwin*)
-        OS_CFLAGS="-D__DARWIN__ -DNO_LASTLOG"
+        OS_CFLAGS="-DNO_LASTLOG"
 	SU="su -m"
         ;;
     *bsd*|dragonfly*)