xserver: Branch 'master' - 2 commits

[Keith Packard]

 configure.ac           |    2 +-
 hw/xfree86/Makefile.am |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit f7b375bd141d0cf1e3add5443a5838dd8f554ef6
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Thu Nov 5 11:42:34 2009 -0800

    Enable XF86PM on all Solaris platforms, not just x86/x64
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index 8e1edba..de58f21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1575,6 +1575,7 @@ if test "x$XORG" = xyes; then
 	  solaris*)
 	  	XORG_OS="solaris"
 		XORG_OS_SUBDIR="solaris"
+		XORG_CFLAGS="$XORG_CFLAGS -DXF86PM"
 		# Use the same stubs as BSD for old functions, since we now
 		# use libpciaccess for PCI
 		xorg_bus_bsdpci="yes"
@@ -1607,7 +1608,6 @@ if test "x$XORG" = xyes; then
 			else
 				SOLARIS_INOUT_ARCH="ia32"
 			fi
-			XORG_CFLAGS="$XORG_CFLAGS -DXF86PM"
 			;;
 		  *)
 			AC_MSG_ERROR([Unsupported Solaris platform. Only SPARC & x86 \
commit f77262513ea17401092479e17ad20fc0eb91ffb5
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Thu Nov 5 11:42:33 2009 -0800

    Use $(MAKE) instead of "make" to build Solaris inline assembly
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 159b935..914e11f 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -92,7 +92,8 @@ if SOLARIS_ASM_INLINE
 BUILT_SOURCES += os-support/solaris/solaris- at SOLARIS_INOUT_ARCH@.il
 
 os-support/solaris/solaris- at SOLARIS_INOUT_ARCH@.il:
-	cd os-support/solaris ; make solaris- at SOLARIS_INOUT_ARCH@.il
+	cd os-support/solaris ; \
+	 $(MAKE) $(AM_MAKEFLAGS) solaris- at SOLARIS_INOUT_ARCH@.il
 endif
 
 # do not use $(mkdir_p) if you want automake 1.7 to work