xserver: Branch 'xorg-server-1.4-apple' - 2 commits

[Ben Byer]

 autogen.sh                |    3 +++
 hw/xquartz/darwinEvents.c |    4 ++++
 2 files changed, 7 insertions(+)

New commits:
commit 82078d05846b579ff22368564afb896931c81640
Author: Ben Byer <bbyer at bushing.apple.com>
Date:   Tue Apr 8 20:37:25 2008 -0700

    add missing dix-config include

diff --git a/hw/xquartz/darwinEvents.c b/hw/xquartz/darwinEvents.c
index 410acdd..78708d2 100644
--- a/hw/xquartz/darwinEvents.c
+++ b/hw/xquartz/darwinEvents.c
@@ -30,6 +30,10 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #define NEED_EVENTS
 #include   <X11/X.h>
 #include   <X11/Xmd.h>
commit 38b0c5263a18cb00631d278f6903a1c488008116
Author: Ben Byer <bbyer at bushing.apple.com>
Date:   Tue Apr 8 20:35:17 2008 -0700

    add correct default ACLOCAL and PKGCONFIG_PATH settings to autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 98d22ea..11864f5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,8 @@
 #! /bin/sh
 
+export PKGCONFIG_PATH=/usr/X11/lib/pkgconfig:$PKGCONFIG_PATH
+export ACLOCAL="aclocal -I /usr/X11/share/aclocal"
+
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.