xserver: Branch 'master'

[Aaron Plattner]

 fb/Makefile.am |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

New commits:
diff-tree 042d4a407d0eca9131d0420b0b9189559aac326d (from 1b94c117e0f294ef2f89bf24d45ba7a8e45efe35)
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Mon Oct 9 16:32:11 2006 -0700

    Bug #8459: Don't forget to include AM_CFLAGS in libfb_la_CFLAGS on non-MMX platforms.
    
    Reported by Edgar Toernig.

diff --git a/fb/Makefile.am b/fb/Makefile.am
index 9a56b93..1649669 100644
--- a/fb/Makefile.am
+++ b/fb/Makefile.am
@@ -10,8 +10,10 @@ if XORG
 sdk_HEADERS = fb.h fbrop.h fbpseudocolor.h fboverlay.h wfbrename.h
 endif
 
+libfb_la_CFLAGS = $(AM_CFLAGS)
+
 if MMX_CAPABLE
-libfb_la_CFLAGS = $(AM_CFLAGS) -DUSE_MMX
+libfb_la_CFLAGS += -DUSE_MMX
 
 libfbmmx_la_CFLAGS =				\
 	$(DIX_CFLAGS)				\