pixman: Branch 'master'

[Matt Turner]

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2beabd9fed76de0023eb36b0c938b8803aa8d129
Author: Matt Turner <mattst88 at gmail.com>
Date:   Thu May 10 16:15:34 2012 -0400

    configure.ac: make -march=loongson2f come before CFLAGS
    
    Otherwise we'd have -march=loongson2f being overridden by automake's
    CFLAGS ordering which causes build failures when -march=<not loongson2f>
    is specified by the user.

diff --git a/configure.ac b/configure.ac
index 5478734..345bc33 100644
--- a/configure.ac
+++ b/configure.ac
@@ -281,7 +281,7 @@ have_loongson_mmi=no
 AC_MSG_CHECKING(whether to use Loongson MMI)
 
 xserver_save_CFLAGS=$CFLAGS
-CFLAGS=" $CFLAGS $LS_CFLAGS"
+CFLAGS=" $LS_CFLAGS $CFLAGS"
 AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
 #ifndef __mips_loongson_vector_rev
 #error "Loongson Multimedia Instructions are only available on Loongson"