diff --git a/ChangeLog b/ChangeLog
index 33ad27bf0..0a79cb907 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-08-04  Adam Jackson  <ajax@freedesktop.org>
+
+	* configure.ac:
+	* GL/mesa/main/Makefile.am:
+	- Check for vsnprintf
+	- Don't build the Xorg DDX on darwin
+	- Workaround for gcc defining __ppc__ but not __powerpc__
+
 2005-08-02  Keith Packard  <keithp@keithp.com>
 
 	* hw/xwin/Makefile.am:
diff --git a/GL/mesa/main/Makefile.am b/GL/mesa/main/Makefile.am
index a6b23a57e..f7a0af291 100644
--- a/GL/mesa/main/Makefile.am
+++ b/GL/mesa/main/Makefile.am
@@ -12,6 +12,10 @@ INCLUDES = -I@MESA_SOURCE@/include \
            -I$(srcdir)/../tnl \
            -I$(srcdir)/..
 
+if NEED_VSNPRINTF
+VSNPRINTF_SOURCES = vsnprintf.c
+endif
+
 nodist_libmain_la_SOURCES = accum.c \
                     api_arrayelt.c \
                     api_loopback.c \
@@ -67,5 +71,5 @@ nodist_libmain_la_SOURCES = accum.c \
                     texstate.c \
                     texstore.c \
                     varray.c \
-                    vsnprintf.c \
+                    $(VSNPRINTF_SOURCES) \
                     vtxfmt.c
diff --git a/configure.ac b/configure.ac
index 81e24f17a..d1a505598 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,9 +68,11 @@ AC_TYPE_PID_T
 
 # Checks for library functions.
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr strtol getopt getopt_long walkcontext])
+AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr strtol getopt getopt_long vsnprintf walkcontext])
 AC_FUNC_ALLOCA
 
+AM_CONDITIONAL(NEED_VSNPRINTF, [test x$HAVE_VSNPRINTF = xno])
+
 # Find the math libary
 AC_CHECK_LIB(m, sqrt)
 
@@ -248,6 +250,7 @@ if test x$XORG = xauto; then
 	XORG="yes"
 	case $host_os in
 		cygwin*) XORG="no" ;;
+                darwin*) XORG="no" ;;
 	esac
 fi
 AC_MSG_RESULT([$XORG])
@@ -714,8 +717,8 @@ IAM64
   	XORG_OS="unknown"
 	XORG_OS_SUBDIR="unknown"
 	AC_MSG_ERROR([Your OS is unknown. Xorg currently only supports Linux, \
-	Free/Open/NetBSD, and Solaris. If you are interested in porting Xorg \
-	to your platform, please email xorg@lists.freedesktop.org.])
+	Free/Open/NetBSD, Solaris, and OS X. If you are interested in porting \
+        Xorg to your platform, please email xorg@lists.freedesktop.org.])
 	;;
 esac
 if test x$XORG_OS_PCI = x ; then
@@ -785,7 +788,14 @@ dnl _*_SOURCE on Solaris restricts to the standards, and removes non-standard
 dnl functions which X uses
 case $host_os in
 	cygwin*) ;;
-	solaris*);;
+	solaris*) ;;
+        darwin*)
+                echo $host_cpu
+                case $host_cpu in
+                        powerpc*)
+                                CFLAGS="$CFLAGS -D__powerpc__" ;; # eew
+                esac
+                ;;
 	*) 
 		AC_DEFINE(_POSIX_SOURCE,500,[POSIX-compliant source])
 		AC_DEFINE(_XOPEN_SOURCE,1,[X/Open-compliant source])