From ac09cd0fec3a9fe5e60b5f5efd00910fb7f8633a Mon Sep 17 00:00:00 2001
From: John Bowler <jbowler@acm.org>
Date: Thu, 25 Apr 2013 23:13:08 -0500
Subject: [PATCH] [libpng16] Test for 'arm*' not just 'arm' in the host_cpu
 configure variable.

Rebuilt the configure scripts.
---
 ANNOUNCE     |  2 ++
 CHANGES      |  2 ++
 configure.ac | 12 +++++++-----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 07dceb8da..9c02c28bd 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -32,6 +32,8 @@ Version 1.6.3beta01 [April 25, 2013]
     was switched 'off' as opposed to being explicitly disabled.
 
 Version 1.6.3beta02 [April 26, 2013]
+  Test for 'arm*' not just 'arm' in the host_cpu configure variable.
+  Rebuilt the configure scripts.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 2b9621c70..ab3138a23 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4514,6 +4514,8 @@ Version 1.6.3beta01 [April 25, 2013]
     was switched 'off' as opposed to being explicitly disabled.
 
 Version 1.6.3beta02 [April 26, 2013]
+  Test for 'arm*' not just 'arm' in the host_cpu configure variable.
+  Rebuilt the configure scripts.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/configure.ac b/configure.ac
index d03601b6b..e03f5dc37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -260,14 +260,16 @@ AC_ARG_ENABLE([arm-neon],
          AC_MSG_ERROR([--enable-arm-neon=${enable_arm_neon}: invalid value])
    esac])
 
-# If enable/disable was not specified default to using the optimizations if the
-# host CPU is ARM and the compiler is targeting a NEON host.  The latter test
-# is done in scripts/pnglibconf.dfa by checking for __ARM_NEON__.  The
-# AM_CONDITIONAL below controls whether the ARM NEON source files are built.
+# Add ARM specific files to all builds where the host_cpu is arm ('arm*') or
+# where ARM optimizations were explicitly requested (this allows a fallback if a
+# future host CPU does not match 'arm*')
 
 AM_CONDITIONAL([PNG_ARM_NEON],
    [test "$enable_arm_neon" != 'no' &&
-    test "$host_cpu" = 'arm' -o "$enable_arm_neon" != ''])
+    case "$host_cpu" in
+      arm*) :;;
+      *)    test "$enable_arm_neon" != '';;
+    esac])
 
 AC_MSG_NOTICE([[Extra options for compiler: $PNG_COPTS]])