From fa333fe2dc2e77ce69d0e212f65106df25b0c07d Mon Sep 17 00:00:00 2001
From: Matt Messier <mmessier@grapetv.org>
Date: Wed, 2 May 2007 14:58:55 -0400
Subject: Mac OS X Universal Binary support

---
 m4/optimizations.m4 | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'm4')

diff --git a/m4/optimizations.m4 b/m4/optimizations.m4
index a1f2f2f00..cc5e7c524 100644
--- a/m4/optimizations.m4
+++ b/m4/optimizations.m4
@@ -74,7 +74,13 @@ AC_DEFUN([AC_OPTIMIZATIONS], [
     CFLAGS="$wall ${CFLAGS}"
     DEBUG_CFLAGS="$wall ${DEBUG_CFLAGS}"
 
-    case "$host_or_hostalias" in
+    if test "$enable_macosx_universal"; then
+        optimize_for_host="universal-darwin"
+    else
+        optimize_for_host="$host_or_hostalias"
+    fi
+
+    case "$optimize_for_host" in
       i?86-* | k?-* | athlon-* | pentium*)
         if test "$GCC" = yes -o "${CC##*/}x" = "iccx" ; then
 
@@ -182,6 +188,7 @@ AC_DEFUN([AC_OPTIMIZATIONS], [
         ;;
       *darwin*)
         CFLAGS="-O3 -pipe -fomit-frame-pointer $m_wm $m_psb -fexpensive-optimizations $f_si -ffast-math $INLINE_FUNCTIONS -no-cpp-precomp -D_INTL_REDIRECT_MACROS $CFLAGS"
+        OBJCFLAGS="-O3 -pipe -fomit-frame-pointer $m_wm $m_psb -fexpensive-optimizations $f_si -ffast-math $INLINE_FUNCTIONS -no-cpp-precomp -D_INTL_REDIRECT_MACROS $CFLAGS"
         DEBUG_CFLAGS="-O3 $DEBUG_CFLAGS"
         ;;
       ppc-*-linux* | powerpc-*)
-- 
cgit v1.2.3