[xserver-commit] xserver/Xext Makefile.am,3.10,3.11 panoramiXSwap.c,3.11,3.12

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/xserver/Xext
In directory pdx:/tmp/cvs-serv1895/Xext

Modified Files:
	Makefile.am panoramiXSwap.c 
Log Message:
Fix up the PanoramiX build to actually do something halfway useful (ATM,
only useful in the context of the XFree86 DDX, but that's the 'future' anyway,
so there you go).

I get the feeling I should be using 'ifdef PANORAMIX', not XINERAMA, but
PANORAMIX isn't in an AC_CONDITIONAL. autoconf wizards - maybe this test needs
to be combined with the XINERAMA one so it's always defined as yea or nay?


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/Xext/Makefile.am,v
retrieving revision 3.10
retrieving revision 3.11
diff -u -d -r3.10 -r3.11
--- a/Makefile.am	7 Mar 2004 10:34:01 -0000	3.10
+++ b/Makefile.am	7 Mar 2004 11:13:29 -0000	3.11
@@ -1,5 +1,6 @@
 INCLUDES = 					\
 	-I$(top_srcdir)/include			\
+	-I$(top_srcdir)/mi			\
 	@XSERVER_CFLAGS@
 
 noinst_LIBRARIES = libXext.a
@@ -20,8 +21,8 @@
 SCREENSAVER_SRCS = saver.c
 endif
 
-if PANORAMIX
-PANORAMIX_SRCS = panoramiX.c panoramiX.h panoramiXsrv.h
+if XINERAMA
+PANORAMIX_SRCS = panoramiX.c panoramiX.h panoramiXsrv.h panoramiXprocs.c panoramiXSwap.c 
 endif
 
 libXext_a_SOURCES =		\

Index: panoramiXSwap.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/panoramiXSwap.c,v
retrieving revision 3.11
retrieving revision 3.12
diff -u -d -r3.11 -r3.12
--- a/panoramiXSwap.c	18 Feb 2004 03:23:35 -0000	3.11
+++ b/panoramiXSwap.c	7 Mar 2004 11:13:29 -0000	3.12
@@ -42,12 +42,8 @@
 #include "window.h"
 #include "windowstr.h"
 #include "pixmapstr.h"
-#if 0
-#include <sys/workstation.h>
-#include <X11/Xserver/ws.h> 
-#endif
 #include "panoramiX.h"
-#include "panoramiXproto.h"
+#include <X11/extensions/panoramiXproto.h>
 #include "panoramiXsrv.h"
 #include "globals.h"