Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver into mpx

Conflicts:

	dix/events.c

include/dix-config.h.in

@@ -127,6 +127,9 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* Define to 1 if you have version 2.2 (or newer) of the drm library */
+#undef HAVE_LIBDRM_2_2
+
 /* Define to 1 if you have the `m' library (-lm). */
 #undef HAVE_LIBM
 

include/dixevents.h

@@ -102,4 +102,8 @@ extern int ProcUngrabButton(ClientPtr /* client */);
 
 extern int ProcRecolorCursor(ClientPtr /* client */);
 
+#ifdef PANORAMIX
+extern void PostSyntheticMotion(int x, int y, ScreenPtr pScreen, unsigned long time);
+#endif
+
 #endif /* DIXEVENTS_H */

include/input.h

@@ -424,7 +424,7 @@ extern int GetProximityEvents(
 extern void PostSyntheticMotion(
     int x,
     int y,
-    int screenNum,
+    ScreenPtr pScreen,
     unsigned long time);
 
 extern int GetMotionHistorySize(

include/xorg-config.h.in

@@ -45,6 +45,9 @@
 /* Path to loadable modules. */
 #undef DEFAULT_MODULE_PATH
 
+/* Path to installed libraries. */
+#undef DEFAULT_LIBRARY_PATH
+
 /* Path to server log file. */
 #undef DEFAULT_LOGPREFIX