xserver: Branch 'master'

[Alan Coopersmith]

 configure.ac |    2 ++
 1 files changed, 2 insertions(+)

New commits:
diff-tree b8df961843a95b29258ae9c5d46ccfc620d8de1c (from 720f302d241e88e6e9f2962207da1aa9a79728b7)
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Mon Mar 19 18:03:26 2007 -0700

    Define XF86PM on Solaris x86 builds now that we have sun_apm.c

diff --git a/configure.ac b/configure.ac
index fe77709..14c4ccb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1413,6 +1413,8 @@ return 0;}
 			fi
 			if test "${OS_MINOR}" -lt 8 ; then
 				solaris_usl_console="yes"
+			else
+				XORG_CFLAGS="$XORG_CFLAGS -DXF86PM"
 			fi
 			;;
 		  *)