library clean-up: Don't build libNX_Xtst anymore. Use system's libXtst shared library. (Fixes ArcticaProject/nx-libs#32).

3 files changed, 73 insertions, 2 deletions

diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in
index 7614d55b9..f3b68b45a 100644
--- a/nxcompshad/Makefile.in
+++ b/nxcompshad/Makefile.in
@@ -151,7 +151,7 @@ all: depend $(LIBARCHIVE) $(LIBDLL)
 
 else
 
-EXTRALIBS = -lNX_Xext -lNX_Xtst -lXrandr -lXdamage
+EXTRALIBS = -lNX_Xext -lXtst -lXrandr -lXdamage
 
 all: depend $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE)
 
diff --git a/nxcompshad/X11.cpp b/nxcompshad/X11.cpp
index 5a18e0a69..b5383816a 100644
--- a/nxcompshad/X11.cpp
+++ b/nxcompshad/X11.cpp
@@ -25,7 +25,7 @@
 #include <nx-X11/Xlibint.h>
 #include <nx-X11/Xproto.h>
 #include <nx-X11/keysym.h>
-#include <nx-X11/extensions/XTest.h>
+#include "X11/include/XTest_nxcompshad.h"
 #include <string.h>
 #include <sys/ipc.h>
 #include <sys/shm.h>
diff --git a/nxcompshad/X11/include/XTest_nxcompshad.h b/nxcompshad/X11/include/XTest_nxcompshad.h
new file mode 100644
index 000000000..91a2ba40b
--- /dev/null
+++ b/nxcompshad/X11/include/XTest_nxcompshad.h
@@ -0,0 +1,71 @@
+/*
+
+Copyright 1992, 1998  The Open Group
+
+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.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+*/
+
+#ifndef _XTEST_H_
+#define _XTEST_H_
+
+#include <nx-X11/Xfuncproto.h>
+
+_XFUNCPROTOBEGIN
+
+Bool XTestQueryExtension(
+    Display*		/* dpy */,
+    int*		/* event_basep */,
+    int*		/* error_basep */,
+    int*		/* majorp */,
+    int*		/* minorp */
+);
+
+extern int XTestFakeKeyEvent(
+    Display*		/* dpy */,
+    unsigned int	/* keycode */,
+    Bool		/* is_press */,
+    unsigned long	/* delay */
+);
+
+extern int XTestFakeButtonEvent(
+    Display*		/* dpy */,
+    unsigned int	/* button */,
+    Bool		/* is_press */,
+    unsigned long	/* delay */
+);
+
+extern int XTestFakeMotionEvent(
+    Display*		/* dpy */,
+    int			/* screen */,
+    int			/* x */,
+    int			/* y */,
+    unsigned long	/* delay */
+);
+
+extern int XTestGrabControl(
+    Display*		/* dpy */,
+    Bool		/* impervious */
+);
+
+_XFUNCPROTOEND
+
+#endif