Debian patch: 050_altivec_detection.diff

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%404070

configure.in

@@ -468,16 +468,13 @@ AC_HELP_STRING([--enable-sse2], [use SSE2 assembly routines [[default=no]]]),
 AC_HELP_STRING([--enable-altivec], [use Altivec assembly routines [[default=yes]]]),
                   , enable_altivec=yes)
     if test x$enable_altivec = xyes; then
-        have_altivec_h_hdr=no
-        AC_CHECK_HEADER(altivec.h, have_altivec_h_hdr=yes)
-
         save_CFLAGS="$CFLAGS"
         have_gcc_altivec=no
-        AC_MSG_CHECKING(for Altivec with GCC -maltivec option)
+        have_altivec_h_hdr=no
         altivec_CFLAGS="-maltivec"
         CFLAGS="$save_CFLAGS $altivec_CFLAGS"
 
-        if test x$have_altivec_h_hdr = xyes; then
+        AC_MSG_CHECKING(for Altivec with GCC altivec.h and -maltivec option)
         AC_TRY_COMPILE([
         #include <altivec.h>
         vector unsigned int vzero() {
@@ -486,9 +483,12 @@ AC_HELP_STRING([--enable-altivec], [use Altivec assembly routines [[default=yes]
         ],[
         ],[
         have_gcc_altivec=yes
+        have_altivec_h_hdr=yes
         ])
         AC_MSG_RESULT($have_gcc_altivec)
-        else
+
+        if test x$have_gcc_altivec = xno; then
+            AC_MSG_CHECKING(for Altivec with GCC -maltivec option)
             AC_TRY_COMPILE([
             vector unsigned int vzero() {
                 return vec_splat_u32(0);
@@ -501,10 +501,9 @@ AC_HELP_STRING([--enable-altivec], [use Altivec assembly routines [[default=yes]
         fi
 
         if test x$have_gcc_altivec = xno; then
-            AC_MSG_CHECKING(for Altivec with GCC -faltivec option)
+            AC_MSG_CHECKING(for Altivec with GCC altivec.h and -faltivec option)
             altivec_CFLAGS="-faltivec"
             CFLAGS="$save_CFLAGS $altivec_CFLAGS"
-            if test x$have_altivec_h_hdr = xyes; then
             AC_TRY_COMPILE([
             #include <altivec.h>
             vector unsigned int vzero() {
@@ -513,9 +512,13 @@ AC_HELP_STRING([--enable-altivec], [use Altivec assembly routines [[default=yes]
             ],[
             ],[
             have_gcc_altivec=yes
+            have_altivec_h_hdr=yes
             ])
             AC_MSG_RESULT($have_gcc_altivec)
-            else
+	fi
+
+        if test x$have_gcc_altivec = xno; then
+            AC_MSG_CHECKING(for Altivec with GCC -faltivec option)
             AC_TRY_COMPILE([
             vector unsigned int vzero() {
                 return vec_splat_u32(0);
@@ -526,7 +529,6 @@ AC_HELP_STRING([--enable-altivec], [use Altivec assembly routines [[default=yes]
             ])
             AC_MSG_RESULT($have_gcc_altivec)
         fi
-        fi
         CFLAGS="$save_CFLAGS"
 
         if test x$have_gcc_altivec = xyes; then