From 2bc1e8fbf2c5be55e1f186d956121bc26eee40c5 Mon Sep 17 00:00:00 2001
From: Stefan Krah <skrah@bytereef.org>
Date: Thu, 8 Dec 2011 22:26:06 +0100
Subject: [PATCH] Backport second fix for issue #11149.

---
 configure    | 7 ++++---
 configure.in | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index 72a758e1cff..3948080e13e 100755
--- a/configure
+++ b/configure
@@ -5413,9 +5413,10 @@ then
         fi
 
         # Clang also needs -fwrapv
-        if test "$CC" = "clang" ; then
-            WRAP="-fwrapv"
-        fi
+        case $CC in
+            *clang*) WRAP="-fwrapv"
+            ;;
+        esac
 
 	case $ac_cv_prog_cc_g in
 	yes)
diff --git a/configure.in b/configure.in
index 454e4681da2..3f5b3b948ff 100644
--- a/configure.in
+++ b/configure.in
@@ -934,9 +934,10 @@ then
         fi
 
         # Clang also needs -fwrapv
-        if test "$CC" = "clang" ; then
-            WRAP="-fwrapv"
-        fi
+        case $CC in
+            *clang*) WRAP="-fwrapv"
+            ;;
+        esac
 
 	case $ac_cv_prog_cc_g in
 	yes)