Remove extmod from nx-X11/programs/Xserver/Xext/.

This backports (in their essence) these X.org Xserver commits:

 commit a7a2f9f66ddc27df96557093f3dd266e24eb653b
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Tue Jul 10 02:03:13 2012 +0100

    Remove the last remnants of extmod

    extmod was originally a big pointless module.  Now it's an empty,
    pointless module.  This commit makes it unexist.

    Signed-off-by: Daniel Stone <daniel@fooishbar.org>
    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Signed-off-by: Keith Packard <keithp@keithp.com>

 commit 7a11b817e770cd2196814f1ac6264c6d87b76c6a
 Author: Tomas Carnecky <tom@dbservice.com>
 Date:   Tue Jul 10 02:03:06 2012 +0100

    Move Xv and XvMC from extmod to built-in

    Always build these extensions into the core server, rather than letting
    them languish in extmod.

    Signed-off-by: Tomas Carnecky <tom@dbservice.com>
    Reviewed-by: Daniel Stone <daniel@fooishbar.org>
    Reviewed-by: Jamey Sharp <jamey@minilop.net>
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Signed-off-by: Keith Packard <keithp@keithp.com>

 commit 7d859bd87834dd79c7fa3792075496ece698c082
 Author: Tomas Carnecky <tom@dbservice.com>
 Date:   Tue Jul 10 02:03:05 2012 +0100

    Move XRes from extmod to built-in

    Always build XRes support into the core server, rather than letting it
    languish in extmod.

    Signed-off-by: Tomas Carnecky <tom@dbservice.com>
    Reviewed-by: Daniel Stone <daniel@fooishbar.org>
    Reviewed-by: Jamey Sharp <jamey@minilop.net>
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Signed-off-by: Keith Packard <keithp@keithp.com>

 commit ba21fc29587e4f11320b88a70433beb1fe22cdf3
 Author: Tomas Carnecky <tom@dbservice.com>
 Date:   Tue Jul 10 02:03:04 2012 +0100

    Move DPMS from extmod to built-in

    Always build DPMS support into the core server, rather than letting it
    languish in extmod.

    Signed-off-by: Tomas Carnecky <tom@dbservice.com>
    Reviewed-by: Daniel Stone <daniel@fooishbar.org>
    Reviewed-by: Jamey Sharp <jamey@minilop.net>
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Signed-off-by: Keith Packard <keithp@keithp.com>

 commit 3ed2c6e11298c4299042cfe4578f6cc02e441d58
 Author: Tomas Carnecky <tom@dbservice.com>
 Date:   Tue Jul 10 02:03:03 2012 +0100

    Move MIT-SCREEN-SAVER from extmod to built-in

    If we've built MIT-SCREEN-SAVER support, then just build it into the
    main binary, rather than leaving it in extmod.

    Signed-off-by: Tomas Carnecky <tom@dbservice.com>
    Reviewed-by: Daniel Stone <daniel@fooishbar.org>
    Reviewed-by: Jamey Sharp <jamey@minilop.net>
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Signed-off-by: Keith Packard <keithp@keithp.com>

Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

Conflicts:
	nx-X11/programs/Xserver/Xext/extmod/Imakefile

1 files changed, 0 insertions, 91 deletions

diff --git a/nx-X11/programs/Xserver/Xext/extmod/modinit.h b/nx-X11/programs/Xserver/Xext/extmod/modinit.h
deleted file mode 100644
index 96ba2da48..000000000
--- a/nx-X11/programs/Xserver/Xext/extmod/modinit.h
+++ /dev/null
@@ -1,91 +0,0 @@
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#ifdef SHAPE
-extern void ShapeExtensionInit(void);
-#include <X11/extensions/shapeproto.h>
-#endif
-
-#ifdef XTEST
-extern void XTestExtensionInit(void);
-#define _XTEST_SERVER_
-#include <nx-X11/extensions/xtestconst.h>
-#include <nx-X11/extensions/xteststr.h>
-#endif
-
-#if 1
-extern void XTestExtension1Init(void);
-#endif
-
-#ifdef BIGREQS
-extern void BigReqExtensionInit(void);
-#include <nx-X11/extensions/bigreqstr.h>
-#endif
-
-#ifdef XSYNC
-extern void SyncExtensionInit(void);
-#define _SYNC_SERVER
-#include <nx-X11/extensions/sync.h>
-#include <nx-X11/extensions/syncstr.h>
-#endif
-
-#ifdef SCREENSAVER
-extern void ScreenSaverExtensionInit (void);
-#include <nx-X11/extensions/saver.h>
-#endif
-
-#ifdef XCMISC
-extern void XCMiscExtensionInit(void);
-#include <nx-X11/extensions/xcmiscstr.h>
-#endif
-
-#ifdef DPMSExtension
-extern void DPMSExtensionInit(void);
-#include <nx-X11/extensions/dpmsstr.h>
-#endif
-
-#ifdef XV
-extern void XvExtensionInit(void);
-extern void XvMCExtensionInit(void);
-extern void XvRegister(void);
-#include <nx-X11/extensions/Xv.h>
-#include <nx-X11/extensions/XvMC.h>
-#endif
-
-#ifdef RES
-extern void ResExtensionInit(void);
-#include <nx-X11/extensions/XResproto.h>
-#endif
-
-#ifdef SHM
-extern void ShmExtensionInit(void);
-#include <X11/extensions/shmproto.h>
-extern void ShmSetPixmapFormat(
-    ScreenPtr pScreen,
-    int format);
-extern void ShmRegisterFuncs(
-    ScreenPtr pScreen,
-    ShmFuncsPtr funcs);
-#endif
-
-#if 1
-extern void SecurityExtensionInit(void);
-#endif
-
-#if 1
-extern void XagExtensionInit(void);
-#endif
-
-#if 1
-extern void XpExtensionInit(void);
-#endif
-
-#if 1
-extern void PanoramiXExtensionInit(int argc, char *argv[]);
-#endif
-
-#if 1
-extern void XkbExtensionInit(void);
-#endif