xprint: Changes to 'upstream-unstable'

[Drew Parsons <dparsons@alioth.debian.org>]

 Xext/Makefile.am |    2 --
 Xext/modinit.h   |    8 ++++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit c7164e9c393a7e333063ac5af89b130e179c072e
Author: Drew Parsons <dparsons@debian.org>
Date:   Sun May 18 01:34:40 2008 +1000

    Create dummy modinit.h for Xext.
    
    modinit.h had been part of hw/xfree86/dixmods/extmod, enabling
    initialisation of extension modules.  Xprint does not implement
    extension modules, so the header file is provided as a dummy file
    instead, now that the xprint ddx is separated from the xfree86 ddx..

diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index b03feda..2d5f2e9 100644
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
@@ -10,8 +10,6 @@ else
 noinst_LTLIBRARIES = libXext.la
 endif
 
-INCLUDES = -I$(top_srcdir)/hw/xfree86/dixmods/extmod
-
 AM_CFLAGS = $(DIX_CFLAGS)
 
 if XORG
diff --git a/Xext/modinit.h b/Xext/modinit.h
new file mode 100644
index 0000000..87c9d28
--- /dev/null
+++ b/Xext/modinit.h
@@ -0,0 +1,8 @@
+/* Initialisation of Extension Modules is enabled via modinit.
+
+  This was implemented in the Xorg xserver (xfree86 ddx), 
+  see hw/xfree86/dixmods/extmod, but is not implemented for Xprt (xprint ddx)
+
+  This header file, referenced in the Xext extension files, is therefore given
+  as a dummy header file for xprint.
+*/