Thu May 12 12:24:16 2005 Søren Sandmann <sandmann@redhat.com>XORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_7XORG-6_8_99_13XORG-6_8_99_12XORG-6_8_99_11XORG-6_8_99_10

Conditionally include config.h
add Makefile.am

42 files changed, 187 insertions, 0 deletions

diff --git a/A8Eq.c b/A8Eq.c
index dbb33c8..b986580 100644
--- a/A8Eq.c
+++ b/A8Eq.c
@@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/AA16.c b/AA16.c
index 95978ab..5de5caf 100644
--- a/AA16.c
+++ b/AA16.c
@@ -29,6 +29,9 @@ in this Software without prior written authorization from The Open Group.
 
 /* $XFree86: xc/lib/Xdmcp/AA16.c,v 1.3 2001/01/17 19:42:43 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/AA32.c b/AA32.c
index 21e69a6..fbeded1 100644
--- a/AA32.c
+++ b/AA32.c
@@ -29,6 +29,9 @@ in this Software without prior written authorization from The Open Group.
 
 /* $XFree86: xc/lib/Xdmcp/AA32.c,v 1.3 2001/01/17 19:42:43 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/AA8.c b/AA8.c
index bdd61e4..391e788 100644
--- a/AA8.c
+++ b/AA8.c
@@ -29,6 +29,9 @@ in this Software without prior written authorization from The Open Group.
 
 /* $XFree86: xc/lib/Xdmcp/AA8.c,v 1.3 2001/01/17 19:42:43 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/Alloc.c b/Alloc.c
index 9db8fc5..40cbacf 100644
--- a/Alloc.c
+++ b/Alloc.c
@@ -31,6 +31,9 @@ in this Software without prior written authorization from The Open Group.
 
 /* stubs for use when Xalloc, Xrealloc and Xfree are not defined */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/AofA8.c b/AofA8.c
index 5419934..fe77330 100644
--- a/AofA8.c
+++ b/AofA8.c
@@ -29,6 +29,9 @@ in this Software without prior written authorization from The Open Group.
 
 /* $XFree86: xc/lib/Xdmcp/AofA8.c,v 1.3 2001/01/17 19:42:43 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/CA8.c b/CA8.c
index 627e824..efdd5a1 100644
--- a/CA8.c
+++ b/CA8.c
@@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/CmpKey.c b/CmpKey.c
index bfffd82..112bc20 100644
--- a/CmpKey.c
+++ b/CmpKey.c
@@ -29,6 +29,9 @@ in this Software without prior written authorization from The Open Group.
 
 /* $XFree86: xc/lib/Xdmcp/CmpKey.c,v 1.3 2001/01/17 19:42:43 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/DA16.c b/DA16.c
index 692d1f3..021acce 100644
--- a/DA16.c
+++ b/DA16.c
@@ -29,6 +29,9 @@ in this Software without prior written authorization from The Open Group.
 
 /* $XFree86: xc/lib/Xdmcp/DA16.c,v 1.5 2001/01/17 19:42:43 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/DA32.c b/DA32.c
index e27842b..9d9620b 100644
--- a/DA32.c
+++ b/DA32.c
@@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/DA8.c b/DA8.c
index a808d9a..9c20690 100644
--- a/DA8.c
+++ b/DA8.c
@@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/DAofA8.c b/DAofA8.c
index 5ec156f..73a2e9c 100644
--- a/DAofA8.c
+++ b/DAofA8.c
@@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/DecKey.c b/DecKey.c
index e2893f3..fe08cc3 100644
--- a/DecKey.c
+++ b/DecKey.c
@@ -29,6 +29,9 @@ in this Software without prior written authorization from The Open Group.
 
 /* $XFree86: xc/lib/Xdmcp/DecKey.c,v 1.3 2001/01/17 19:42:43 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/Fill.c b/Fill.c
index 111c386..08f6b35 100644
--- a/Fill.c
+++ b/Fill.c
@@ -32,6 +32,9 @@ in this Software without prior written authorization from The Open Group.
 #ifdef WIN32
 #define _WILLWINSOCK_
 #endif
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/Flush.c b/Flush.c
index 8be9790..d04cdb3 100644
--- a/Flush.c
+++ b/Flush.c
@@ -32,6 +32,9 @@ in this Software without prior written authorization from The Open Group.
 #ifdef WIN32
 #define _WILLWINSOCK_
 #endif
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/GenKey.c b/GenKey.c
index 9643c3e..0d70256 100644
--- a/GenKey.c
+++ b/GenKey.c
@@ -29,6 +29,9 @@ in this Software without prior written authorization from The Open Group.
 
 /* $XFree86: xc/lib/Xdmcp/GenKey.c,v 3.7 2001/07/25 15:04:50 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/IncKey.c b/IncKey.c
index cdd08dc..292413a 100644
--- a/IncKey.c
+++ b/IncKey.c
@@ -29,6 +29,9 @@ in this Software without prior written authorization from The Open Group.
 
 /* $XFree86: xc/lib/Xdmcp/IncKey.c,v 1.3 2001/01/17 19:42:43 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..07cb046
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,64 @@
+lib_LTLIBRARIES = libXdmcp.la
+
+libXdmcp_la_CFLAGS=-I${top_srcdir}/include $(XDMCP_CFLAGS)
+libXdmcp_la_LDFLAGS = -version-info 6:0:0
+libXdmcp_la_LIBADD = $(XDMCP_LIBS)
+libXdmcp_la_SOURCES = \
+	A8Eq.c \
+	AA16.c \
+	AA32.c \
+	AA8.c \
+	Alloc.c \
+	AofA8.c \
+	CA8.c \
+	CmpKey.c \
+	DA16.c \
+	DA32.c \
+	DA8.c \
+	DAofA8.c \
+	DecKey.c \
+	Fill.c \
+	Flush.c \
+	GenKey.c \
+	IncKey.c \
+	RA16.c \
+	RA32.c \
+	RA8.c \
+	RAofA8.c \
+	RC16.c \
+	RC32.c \
+	RC8.c \
+	RHead.c \
+	RR.c \
+	RaA16.c \
+	RaA32.c \
+	RaA8.c \
+	RaAoA8.c \
+	Unwrap.c \
+	WA16.c \
+	WA32.c \
+	WA8.c \
+	WAofA8.c \
+	WC16.c \
+	WC32.c \
+	WC8.c \
+	Whead.c \
+	Wrap.c \
+	Wrap.h
+
+if HASXDMAUTH
+nodist_libXdmcp_la_SOURCES = Wraphelp.c
+endif HASXDMAUTH
+
+xdmcpincludedir=$(includedir)/X11
+
+INCLUDES = \
+	-I${top_builddir}/include
+
+xdmcpinclude_HEADERS = \
+	Xdmcp.h
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = xdmcp.pc
+
+EXTRA_DIST = xdmcp.pc.in autogen.sh
diff --git a/RA16.c b/RA16.c
index 3453ce4..cdaaa22 100644
--- a/RA16.c
+++ b/RA16.c
@@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/RA32.c b/RA32.c
index 21c078c..09f72da 100644
--- a/RA32.c
+++ b/RA32.c
@@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/RA8.c b/RA8.c
index 50a6d23..eee3c6b 100644
--- a/RA8.c
+++ b/RA8.c
@@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/RAofA8.c b/RAofA8.c
index b4b2cea..568236c 100644
--- a/RAofA8.c
+++ b/RAofA8.c
@@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/RC16.c b/RC16.c
index ff2604d..1af69a6 100644
--- a/RC16.c
+++ b/RC16.c
@@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/RC32.c b/RC32.c
index a865563..caf19e6 100644
--- a/RC32.c
+++ b/RC32.c
@@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/RC8.c b/RC8.c
index 7c3d11a..a9cd068 100644
--- a/RC8.c
+++ b/RC8.c
@@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/RHead.c b/RHead.c
index b0af982..6b0b837 100644
--- a/RHead.c
+++ b/RHead.c
@@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/RR.c b/RR.c
index 1fa1dca..2d7d2db 100644
--- a/RR.c
+++ b/RR.c
@@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/RaA16.c b/RaA16.c
index 525a2a1..b02fa2f 100644
--- a/RaA16.c
+++ b/RaA16.c
@@ -29,6 +29,9 @@ in this Software without prior written authorization from The Open Group.
 
 /* $XFree86: xc/lib/Xdmcp/RaA16.c,v 1.3 2001/01/17 19:42:44 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/RaA32.c b/RaA32.c
index ef1ab6e..52167d1 100644
--- a/RaA32.c
+++ b/RaA32.c
@@ -29,6 +29,9 @@ in this Software without prior written authorization from The Open Group.
 
 /* $XFree86: xc/lib/Xdmcp/RaA32.c,v 1.3 2001/01/17 19:42:44 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/RaA8.c b/RaA8.c
index 7d671d8..3e7bc08 100644
--- a/RaA8.c
+++ b/RaA8.c
@@ -29,6 +29,9 @@ in this Software without prior written authorization from The Open Group.
 
 /* $XFree86: xc/lib/Xdmcp/RaA8.c,v 1.3 2001/01/17 19:42:44 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/RaAoA8.c b/RaAoA8.c
index 0dd5243..8b4806c 100644
--- a/RaAoA8.c
+++ b/RaAoA8.c
@@ -29,6 +29,9 @@ in this Software without prior written authorization from The Open Group.
 
 /* $XFree86: xc/lib/Xdmcp/RaAoA8.c,v 1.3 2001/01/17 19:42:44 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/Unwrap.c b/Unwrap.c
index 8a5c9eb..0d60c2b 100644
--- a/Unwrap.c
+++ b/Unwrap.c
@@ -29,6 +29,9 @@ in this Software without prior written authorization from The Open Group.
 
 /* $XFree86: xc/lib/Xdmcp/Unwrap.c,v 1.3 2001/01/17 19:42:44 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/WA16.c b/WA16.c
index 4f625b7..4551161 100644
--- a/WA16.c
+++ b/WA16.c
@@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/WA32.c b/WA32.c
index 140c750..8d61b1e 100644
--- a/WA32.c
+++ b/WA32.c
@@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/WA8.c b/WA8.c
index 3bd738a..43443c9 100644
--- a/WA8.c
+++ b/WA8.c
@@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/WAofA8.c b/WAofA8.c
index 84ba454..69f7bd0 100644
--- a/WAofA8.c
+++ b/WAofA8.c
@@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/WC16.c b/WC16.c
index 1c86c90..945171d 100644
--- a/WC16.c
+++ b/WC16.c
@@ -29,6 +29,9 @@ in this Software without prior written authorization from The Open Group.
 
 /* $XFree86: xc/lib/Xdmcp/WC16.c,v 1.4 2001/01/17 19:42:44 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/WC32.c b/WC32.c
index 9634567..2d5df83 100644
--- a/WC32.c
+++ b/WC32.c
@@ -28,6 +28,9 @@ in this Software without prior written authorization from The Open Group.
  */
 /* $XFree86: xc/lib/Xdmcp/WC32.c,v 1.4 2001/01/17 19:42:44 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/WC8.c b/WC8.c
index c7f7012..2cbd6f1 100644
--- a/WC8.c
+++ b/WC8.c
@@ -29,6 +29,9 @@ in this Software without prior written authorization from The Open Group.
 
 /* $XFree86: xc/lib/Xdmcp/WC8.c,v 1.4 2001/01/17 19:42:44 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/Whead.c b/Whead.c
index 4b991d8..82c55c9 100644
--- a/Whead.c
+++ b/Whead.c
@@ -29,6 +29,9 @@ in this Software without prior written authorization from The Open Group.
 
 /* $XFree86: xc/lib/Xdmcp/Whead.c,v 1.3 2001/01/17 19:42:44 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/Wrap.c b/Wrap.c
index 2811cbd..d8a032a 100644
--- a/Wrap.c
+++ b/Wrap.c
@@ -29,6 +29,9 @@ in this Software without prior written authorization from The Open Group.
 
 /* $XFree86: xc/lib/Xdmcp/Wrap.c,v 1.3 2001/01/17 19:42:44 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/Wraphelp.c b/Wraphelp.c
index 1971d62..8e50ee2 100644
--- a/Wraphelp.c
+++ b/Wraphelp.c
@@ -3,6 +3,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <sys/types.h>
 #include <X11/Xmd.h>
 #include "Wrap.h"