pixman: Branch 'master' - 2 commits

[Matt Turner]

 configure.ac |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 50d3088d7882e1054a35e917becb7752662da6f0
Author: Matt Turner <mattst88 at gmail.com>
Date:   Fri May 11 21:59:13 2012 -0400

    configure.ac: Rename loongson -> loongson-mmi
    
    Make it match with the other fast paths, and the PIXMAN_DISABLE value is
    already loongson-mmi.

diff --git a/configure.ac b/configure.ac
index 57fd060..d949839 100644
--- a/configure.ac
+++ b/configure.ac
@@ -278,7 +278,7 @@ if test "x$LS_CFLAGS" = "x" ; then
 fi
 
 have_loongson_mmi=no
-AC_MSG_CHECKING(whether to use Loongson MMI)
+AC_MSG_CHECKING(whether to use Loongson MMI assembler)
 
 xserver_save_CFLAGS=$CFLAGS
 CFLAGS=" $LS_CFLAGS $CFLAGS -I$srcdir"
@@ -301,12 +301,12 @@ int main () {
 }]])], have_loongson_mmi=yes)
 CFLAGS=$xserver_save_CFLAGS
 
-AC_ARG_ENABLE(loongson,
-   [AC_HELP_STRING([--disable-loongson],
-                   [disable Loongson fast paths])],
-   [enable_loongson=$enableval], [enable_loongson=auto])
+AC_ARG_ENABLE(loongson-mmi,
+   [AC_HELP_STRING([--disable-loongson-mmi],
+                   [disable Loongson MMI fast paths])],
+   [enable_loongson_mmi=$enableval], [enable_loongson_mmi=auto])
 
-if test $enable_loongson = no ; then
+if test $enable_loongson_mmi = no ; then
    have_loongson_mmi=disabled
 fi
 
@@ -317,7 +317,7 @@ else
 fi
 
 AC_MSG_RESULT($have_loongson_mmi)
-if test $enable_loongson = yes && test $have_loongson_mmi = no ; then
+if test $enable_loongson_mmi = yes && test $have_loongson_mmi = no ; then
    AC_MSG_ERROR([Loongson MMI not detected])
 fi
 
commit a0a40cb822bec52494c64e6750be50b734dc29df
Author: Matt Turner <mattst88 at gmail.com>
Date:   Fri May 11 21:49:42 2012 -0400

    configure.ac: Fix loongson-mmi out-of-tree builds
    
    When building out-of-tree, gcc wasn't able to find loongson-mmintrin.h
    to compile the test program. Add -I$srcdir to CFLAGS to point gcc to it.

diff --git a/configure.ac b/configure.ac
index 345bc33..57fd060 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=" $LS_CFLAGS $CFLAGS"
+CFLAGS=" $LS_CFLAGS $CFLAGS -I$srcdir"
 AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
 #ifndef __mips_loongson_vector_rev
 #error "Loongson Multimedia Instructions are only available on Loongson"