xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/common/Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 58eacf0b7beb8c6f1971570ede0bfd3976a84665
Author: Rémi Cardona <remi at gentoo.org>
Date:   Tue Oct 21 10:07:24 2008 -0400

    Force LC_ALL=C when building xf86DefModeSet.c
    
    Fixes build in not-quite-latin locales.

diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
index 745278b..87913e8 100644
--- a/hw/xfree86/common/Makefile.am
+++ b/hw/xfree86/common/Makefile.am
@@ -19,7 +19,7 @@ BUSSOURCES = xf86isaBus.c xf86pciBus.c xf86fbBus.c xf86noBus.c $(SBUS_SOURCES)
 MODEDEFSOURCES = $(srcdir)/vesamodes $(srcdir)/extramodes
 
 xf86DefModeSet.c: $(srcdir)/modeline2c.awk $(MODEDEFSOURCES)
-	cat $(MODEDEFSOURCES) | $(AWK) -f $(srcdir)/modeline2c.awk > $@
+	cat $(MODEDEFSOURCES) | LC_ALL=C $(AWK) -f $(srcdir)/modeline2c.awk > $@
 	echo >> $@
 
 BUILT_SOURCES = xf86DefModeSet.c