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

[Ben Byer]

 autogen.sh             |    2 +-
 hw/xquartz/Makefile.am |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 17c0ad3d959f30d06c226fa04aade5579d109c83
Author: Ben Byer <bbyer at bbyer.local>
Date:   Sun Dec 16 04:20:19 2007 -0800

    adding default prefix to autogen script

diff --git a/autogen.sh b/autogen.sh
index 904cd67..98d22ea 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -9,4 +9,4 @@ cd $srcdir
 autoreconf -v --install || exit 1
 cd $ORIGDIR || exit $?
 
-$srcdir/configure --enable-maintainer-mode "$@"
+$srcdir/configure --prefix=/usr/X11 --enable-maintainer-mode "$@"
commit 88f289dd1ca595d2741662b5cd230012e4388abe
Author: Ben Byer <bbyer at bbyer.local>
Date:   Sun Dec 16 04:19:01 2007 -0800

    adding AM_OBJCFLAGS

diff --git a/hw/xquartz/Makefile.am b/hw/xquartz/Makefile.am
index b026ee1..1f19102 100644
--- a/hw/xquartz/Makefile.am
+++ b/hw/xquartz/Makefile.am
@@ -1,5 +1,6 @@
 noinst_LTLIBRARIES = libXquartz.la
 AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
+AM_OBJCFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
 AM_CPPFLAGS = \
 	-DBUILD_DATE=\"$(BUILD_DATE)\" \
 	-DINXQUARTZ \