From 4e43bd06146941548c894321a34619e199f1d2f0 Mon Sep 17 00:00:00 2001
From: jstebbins <jstebbins.hb@gmail.com>
Date: Tue, 25 Oct 2011 02:18:15 +0000
Subject: Add optional yasm contrib

To enable, "configure --enable-local-yasm"

Ubuntu 10.04 LTS (lucid) has yasm 0.8 which is no longer compatible with
x264.  This change allows us to build yasm as a contrib and use it for
building both Libav and x264 which require yasm.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4314 b64f7644-9d1e-0410-96f1-a4d463321fa5
---
 make/include/contrib.defs | 6 ++++--
 make/include/main.defs    | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'make/include')

diff --git a/make/include/contrib.defs b/make/include/contrib.defs
index 003152b85..4c813c7fb 100644
--- a/make/include/contrib.defs
+++ b/make/include/contrib.defs
@@ -82,6 +82,7 @@ define import.CONTRIB.defs
 
     $(1).CONFIGURE.args = !sete @dir !bootstrap !env !exe @host @prefix !deps !shared !static !extra
 
+    $(1).CONFIGURE.env.LOCAL_PATH =
     $(1).CONFIGURE.env.CC       = CC=$$($(1).GCC.gcc)
     $(1).CONFIGURE.env.CXX      = CXX=$$($(1).GCC.gxx)
     ##
@@ -103,7 +104,7 @@ define import.CONTRIB.defs
     $(1).CONFIGURE.env.LDFLAGS  = LDFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver)"
     $(1).CONFIGURE.env.PKG_CONFIG_PATH  = PKG_CONFIG_PATH="$$(call fn.ABSOLUTE,$$(CONTRIB.build/))lib/pkgconfig"
 
-    $(1).CONFIGURE.env.args = !CC !CFLAGS !CXX !CXXFLAGS !CPPFLAGS !LDFLAGS !PKG_CONFIG_PATH
+    $(1).CONFIGURE.env.args = !CC !CFLAGS !CXX !CXXFLAGS !CPPFLAGS !LDFLAGS !PKG_CONFIG_PATH !LOCAL_PATH
     $(1).CONFIGURE.env = $$(call fn.ARGS,$(1).CONFIGURE.env,$$($(1).CONFIGURE.env.args))
 
     $(1).CONFIGURE.target = $$($(1).build/).stamp.configure
@@ -115,12 +116,13 @@ define import.CONTRIB.defs
     ##
     ## target: build
     ##
+    $(1).BUILD.env      =
     $(1).BUILD.make     = $$(MAKE)
     $(1).BUILD.dir      = $$($(1).EXTRACT.dir/)
     $(1).BUILD.extra    =
     $(1).BUILD.ntargets =
 
-    $(1).BUILD.args = !make @dir !extra !ntargets
+    $(1).BUILD.args = !env !make @dir !extra !ntargets
     $(1).BUILD.args.dir = -C $$(1)
 
     $(1).BUILD.target = $$($(1).build/).stamp.build
diff --git a/make/include/main.defs b/make/include/main.defs
index 63b7aa38c..e68f679f7 100644
--- a/make/include/main.defs
+++ b/make/include/main.defs
@@ -83,6 +83,10 @@ ifeq (1-linux,$(FEATURE.gtk)-$(BUILD.system))
     MODULES += gtk
 endif
 
+ifeq (1,$(FEATURE.local_yasm))
+    MODULES += contrib/yasm
+endif
+
 ###############################################################################
 
 MODULES += doc
-- 
cgit v1.2.3