Tue May 17 10:38:30 2005 Søren Sandmann <sandmann@redhat.com>

Remove Xdmcpconf.h and references to it, since it is not needed.
Delete entries from the xlibs tree since they are not relevant

4 files changed, 6 insertions, 74 deletions

diff --git a/ChangeLog b/ChangeLog
index 1af0bcc..e738540 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,47 +1,7 @@
-2004-11-22  Carl Worth  <cworth@cworth.org>
+Tue May 17 10:38:30 2005  Søren Sandmann  <sandmann@redhat.com>
 
-	* configure.ac: Remove AC_CONFIG_AUX_DIR (it was in the wrong
-	place for automake-1.9, and it was set to the default value
-	anyway).
+	* configure.ac: Remove Xdmcpconf.h and references to it, since it
+	is not needed.
 
-2004-11-13  Daniel Stone  <daniel@freedesktop.org>
-
-	* Release 0.1.3.
-	* Bump soversion to 6:0:0 in line with the monolithic tree.
-
-2004-05-09  Eric Anholt  <anholt@FreeBSD.org>
-
-	* Makefile.am:
-	libtool's versioning is not for package version information.
-	Revert to original 0:0:0 version-info, since this hadn't been
-	released yet.
-
-	* configure.ac:
-	Bump version to 0.1.3
-
-2004-04-23  Carlos Romero  <kidcrash@freedesktop.org>
-	* Makefile.am:
-	use -version-number since $age -gt $current
-
-2004-04-19  Daniel Stone  <daniel@freedesktop.org>
-	
-	* *.h:
-	Merge from X11R6.7.
-
-	* Makefile.am:
-	Adding version info to the .so.
-
-	* Tag version 0.1.2 for xlibs 1.0.1.
-
-2004-02-03  Jim Gettys  <jg@freedesktop.org>
-
-	* AUTHORS: add authors to file
-
-2004-01-17  Daniel Stone  <daniel@fooishbar.org>
-	* Tagging release 0.1.1 for the first freedesktop.org clientside libs
-	  release.
-
-2004-01-16  Eric Anholt  <anholt@FreeBSD.org>
-
-	* Makefile.am:
-	Make Wraphelp.c nodist, so that distcheck succeeds.
+	* ChangeLog: Delete entries from the xlibs tree since they are not
+	relevant
diff --git a/Makefile.am b/Makefile.am
index afc997f..e421e44 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -56,8 +56,7 @@ INCLUDES = \
 	-I${top_builddir}/include
 
 xdmcpinclude_HEADERS = \
-	include/X11/Xdmcp.h \
-	include/X11/Xdmcpconf.h
+	include/X11/Xdmcp.h
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xdmcp.pc
diff --git a/configure.ac b/configure.ac
index c6f57fa..59180dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,6 @@ AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 
 AM_CONFIG_HEADER(config.h)
-AC_CONFIG_HEADERS([include/X11/Xdmcpconf.h])
 
 AC_PROG_CC
 AC_PROG_INSTALL
diff --git a/include/X11/Xdmcpconf.h.in b/include/X11/Xdmcpconf.h.in
deleted file mode 100644
index 8770234..0000000
--- a/include/X11/Xdmcpconf.h.in
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * $Id$
- *
- * Copyright © 2003 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Keith Packard makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* Whether the XDMCP library has code for the XDM AUTH protocols */
-#undef HASXDMAUTH