From eb6fb0dbc9619009630e9dcf8739bea4f2c0c384 Mon Sep 17 00:00:00 2001
From: alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 11 Aug 2003 20:52:53 +0000
Subject: [PATCH] Simplified/fixed altivec/altivec.h detection on Linux and
 Darwin (and others). Patch by Magnus Damm <damm@opensource.se>

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10573 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 Makefile          | 8 --------
 configure         | 6 +++++-
 liba52/Makefile   | 7 -------
 libmpeg2/Makefile | 5 -----
 4 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/Makefile b/Makefile
index 88d70936d0..4380fd19ae 100644
--- a/Makefile
+++ b/Makefile
@@ -40,14 +40,6 @@ COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2
 
 CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(X11_INC) $(FRIBIDI_INC) # -Wall
 
-ifeq ($(TARGET_ALTIVEC),yes)
-ifeq ($(TARGET_OS),Darwin)
-CFLAGS += -faltivec
-else
-CFLAGS += -maltivec -mabi=altivec
-endif
-endif
-
 PARTS = libmpdemux libmpcodecs mp3lib liba52 libmpeg2 libavcodec libao2 drivers osdep postproc input libvo libaf
 ifeq ($(VIDIX),yes)
 PARTS += libdha vidix
diff --git a/configure b/configure
index 0896478c2b..ee643bcf5f 100755
--- a/configure
+++ b/configure
@@ -865,6 +865,7 @@ EOF
     proc=''
     _march=''
     _mcpu=''
+    _altivec_gcc_flags=''
     # XXX: this should be removed imho...
     cpu750=`$_cpuinfo | grep "cpu.*750"`
     if test -n "$cpu750"; then
@@ -875,11 +876,13 @@ EOF
 	proc=`$_cpuinfo | grep 'cpu' | cut -d ':' -f 2 | cut -d ',' -f 1 | cut -b 2- | head -1`
 	if test -n "`$_cpuinfo | grep altivec`"; then
 	    _altivec=yes
+            _altivec_gcc_flags='-maltivec -mabi=altivec'
 	fi
     fi
     if darwin ; then
 	if [ `sysctl -n hw.vectorunit` -eq 1 ]; then
 	    _altivec=yes
+            _altivec_gcc_flags='-faltivec'
  	fi
     fi
     if test -n "$proc"; then
@@ -901,6 +904,7 @@ EOF
     	    esac
 	fi
     fi
+    _mcpu="$_mcpu $_altivec_gcc_flags"
     ;;
 
   alpha)
@@ -2045,7 +2049,7 @@ cat > $TMPC << EOF
 int main(void) { return 0; }
 EOF
 _have_altivec_h=no
-cc_check && _have_altivec_h=yes
+cc_check $_altivec_gcc_flags && _have_altivec_h=yes
 if test "$_have_altivec_h" = yes ; then
   _def_altivec_h='#define HAVE_ALTIVEC_H 1'
 else
diff --git a/liba52/Makefile b/liba52/Makefile
index d09e2e7378..63cb29d3ef 100644
--- a/liba52/Makefile
+++ b/liba52/Makefile
@@ -7,13 +7,6 @@ SRCS    = crc.c resample.c bit_allocate.c bitstream.c downmix.c imdct.c imdct_ml
 OBJS	= $(SRCS:.c=.o)
 
 CFLAGS  = $(MLIB_INC) $(OPTFLAGS) 
-ifeq ($(TARGET_ALTIVEC),yes)
-ifeq ($(TARGET_OS),Darwin)
-    CFLAGS+= -faltivec
-else
-    CFLAGS+= -maltivec -mabi=altivec
-endif
-endif
 
 .SUFFIXES: .c .o
 
diff --git a/libmpeg2/Makefile b/libmpeg2/Makefile
index ac5ccab892..e9bbba3dc3 100644
--- a/libmpeg2/Makefile
+++ b/libmpeg2/Makefile
@@ -10,11 +10,6 @@ INCLUDE = -I. -I../libvo -I.. $(EXTRA_INC) $(MLIB_INC)
 CFLAGS  = $(OPTFLAGS) $(INCLUDE) -DMPG12PLAY
 
 ifeq ($(TARGET_ALTIVEC),yes)
-ifeq ($(TARGET_OS),Darwin)
-CFLAGS += -faltivec
-else
-CFLAGS += -maltivec -mabi=altivec
-endif
 SRCS += motion_comp_altivec.c idct_altivec.c
 endif