Fix logic error from r1037

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@1062 632fc199-4ca6-4c93-a231-07263d6284db

diff --git a/configure.ac b/configure.ac
index d307456dea54a32bfef2f8a597d869325378818b..c327db58f2905accfac266898388c4d312601635 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -425,10 +425,12 @@ if test "x${with_simd}" != "xno"; then
          simd_arch=arm],
         [AC_MSG_RESULT([no])
          with_simd=no])
-      if test "x${require_simd}" = "xyes" -a "x${with_simd}" = "xno"; then
-        AC_MSG_ERROR([SIMD support can't be enabled.])
-      else
-        AC_MSG_WARN([SIMD support can't be enabled.  Performance will suffer.])
+      if test "x${with_simd}" = "xno"; then
+        if test "x${require_simd}" = "xyes"; then
+          AC_MSG_ERROR([SIMD support can't be enabled.])
+        else
+          AC_MSG_WARN([SIMD support can't be enabled.  Performance will suffer.])
+      fi
       fi
       ;;
     mipsel*)
@@ -439,16 +441,18 @@ if test "x${with_simd}" != "xno"; then
          simd_arch=mipsel],
         [AC_MSG_RESULT([no])
          with_simd=no])
-      if test "x${require_simd}" = "xyes" -a "x${with_simd}" = "xno"; then
-        AC_MSG_ERROR([SIMD support can't be enabled.])
-      else
-        AC_MSG_WARN([SIMD support can't be enabled.  Performance will suffer.])
+      if test "x${with_simd}" = "xno"; then
+        if test "x${require_simd}" = "xyes"; then
+          AC_MSG_ERROR([SIMD support can't be enabled.])
+        else
+          AC_MSG_WARN([SIMD support can't be enabled.  Performance will suffer.])
+        fi
       fi
       ;;
     *)
       AC_MSG_RESULT([no ("$host_cpu")])
       with_simd=no;
-      if test "x${require_simd}" = "xyes" -a "x${with_simd}" = "xno"; then
+      if test "x${require_simd}" = "xyes"; then
         AC_MSG_ERROR([SIMD support not available for this CPU.])
       else
         AC_MSG_WARN([SIMD support not available for this CPU.  Performance will suffer.])