From d7c34c7e1f89e0ff12f85eb97b6bf7fab7282c8c Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Wed, 10 Apr 2013 12:44:19 -0400
Subject: [PATCH] FS-5250: --resolve fix mac build

---
 libs/srtp/configure.in | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/libs/srtp/configure.in b/libs/srtp/configure.in
index dc471c5b14..d2a109cc53 100644
--- a/libs/srtp/configure.in
+++ b/libs/srtp/configure.in
@@ -225,8 +225,12 @@ case $host_cpu in
      i*86 | x86_64 )
 	AC_DEFINE(CPU_CISC, 1,
 	   [Define if building for a CISC machine (e.g. Intel).])
-        AC_DEFINE(HAVE_X86, 1,
-	   [Define to use X86 inlined assembly code]);; 
+	# Do not enable use of asm for MACOSX
+        if test "x$new_AM_CFLAGS" != "x-DMACOSX"; then 
+	  AC_DEFINE(HAVE_X86, 1,
+	   [Define to use X86 inlined assembly code]) 
+	fi
+	;;
 	* )
 	# CPU_RISC is only supported for big endian machines.
 	if test "$ac_cv_c_bigendian" = "yes"; then