From bc5a1e1c45310514350a542d58bf6015beddfdfa Mon Sep 17 00:00:00 2001
From: Matt Messier <mmessier@grapetv.org>
Date: Tue, 15 May 2007 04:39:58 -0400
Subject: Stupid typo fix when not building universal binaries. Also some
 tweaks for Darwin.

---
 contrib/Makefile.am | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 1ebb7d5d1..6e019ba62 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -67,6 +67,10 @@ if HAVE_MLIB
 configure_options += --enable-sunmlib
 endif
 
+if !HOST_OS_DARWIN
+FFMPEG_EXTRA_CFLAGS = -fPIC -DPIC
+endif
+
 disable_decoders = \
 	--disable-decoder=bmp --disable-decoder=cavs --disable-decoder=cljr --disable-decoder=dsicinvideo \
 	--disable-decoder=ffv1 --disable-decoder=ffvhuff --disable-decoder=gif --disable-decoder=mdec \
@@ -92,8 +96,12 @@ else
 	mkdir -p ffmpeg
 	cd ffmpeg; \
 	$(srcdir)/ffmpeg/configure $(all_configure_options) \
-		--extra-cflags="$(VISIBILITY_FLAG) -fPIC -DPIC" \
+		--extra-cflags="$(VISIBILITY_FLAG) $(FFMPEG_EXTRA_CFLAGS)"; \
 	cd ..
+if HOST_OS_DARWIN
+	cat ffmpeg/config.mak | sed -e '/OPTFLAGS=/s/-mdynamic-no-pic//g' > ffmpeg/config.tmp
+	mv -f ffmpeg/config.tmp ffmpeg/config.mak
+endif
 endif
 
 ffmpeg/libavutil/libavutil.a: ffmpeg/config.mak
-- 
cgit v1.2.3