[xserver-commit] xserver/Xext panoramiX.c,3.35,3.36 panoramiX.h,1.7,1.8 Makefile.am,3.8,3.9

[Daniel Stone]

Committed by: daniel

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

Modified Files:
	panoramiX.c panoramiX.h Makefile.am 
Log Message:
My latest (probably misguided) attempt to get XFree86 to build - we're getting ever-closer.

Index: panoramiX.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/panoramiX.c,v
retrieving revision 3.35
retrieving revision 3.36
diff -u -d -r3.35 -r3.36
--- a/panoramiX.c	11 Sep 2003 05:12:50 -0000	3.35
+++ b/panoramiX.c	5 Mar 2004 06:54:29 -0000	3.36
@@ -32,7 +32,7 @@
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include "Xarch.h"
+#include <X11/Xarch.h>
 #include "misc.h"
 #include "cursor.h"
 #include "cursorstr.h"
@@ -45,7 +45,7 @@
 #include "windowstr.h"
 #include "pixmapstr.h"
 #include "panoramiX.h"
-#include "panoramiXproto.h"
+#include <X11/extensions/panoramiXproto.h>
 #include "panoramiXsrv.h"
 #include "globals.h"
 #include "servermd.h"

Index: panoramiX.h
===================================================================
RCS file: /cvs/xserver/xserver/Xext/panoramiX.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- a/panoramiX.h	11 Sep 2003 05:12:50 -0000	1.7
+++ b/panoramiX.h	5 Mar 2004 06:54:29 -0000	1.8
@@ -30,7 +30,7 @@
 #ifndef _PANORAMIX_H_
 #define _PANORAMIX_H_
 
-#include "panoramiXext.h"
+#include <X11/extensions/panoramiXext.h>
 #include "gcstruct.h"
 
 

Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/Xext/Makefile.am,v
retrieving revision 3.8
retrieving revision 3.9
diff -u -d -r3.8 -r3.9
--- a/Makefile.am	9 Jan 2004 03:42:09 -0000	3.8
+++ b/Makefile.am	5 Mar 2004 06:54:29 -0000	3.9
@@ -20,6 +20,10 @@
 SCREENSAVER_SRCS = saver.c
 endif
 
+if XINERAMA
+PANORAMIX_SRCS = panoramiX.c
+endif
+
 libXext_a_SOURCES =		\
 	bigreq.c		\
 	mitmisc.c		\
@@ -40,4 +44,5 @@
 	$(MITSHM_SRCS)		\
 	$(XV_SRCS)		\
 	$(RES_SRCS)		\
-	$(SCREENSAVER_SRCS)
+	$(SCREENSAVER_SRCS)	\
+	$(PANORAMIX_SRCS)