Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: Id20053d261b4fbbcc0ac8ba49dd3ef2253fa4b95

1 files changed, 3 insertions, 0 deletions

diff --git a/configure b/configure
index 95c8ef64d8..ea09857387 100755
--- a/configure
+++ b/configure
@@ -4198,6 +4198,9 @@ if [ "$CFG_NEON" = "auto" ]; then
         *neon*)
             CFG_NEON=yes
             ;;
+        *)
+            CFG_NEON=no
+            ;;
     esac
 fi