Prevent Theora and Vorbis from using a system (e.g. fink) pkg-config which

they then allow to override HBs paths for other libs. Thanks to KonaBlend
and saintdev for identying the issue.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2204 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/contrib/libtheora/module.defs b/contrib/libtheora/module.defs
index be40ab5797ccc3371708a41cbaf2e6e1e62a571d..6505c8b649fc657adafb4db38a650f25edd729b2 100644 (file)
--- a/contrib/libtheora/module.defs
+++ b/contrib/libtheora/module.defs
@@ -10,4 +10,5 @@ LIBTHEORA.CONFIGURE.extra = \
     --disable-sdltest \
     --disable-vorbistest \
     --with-ogg=$(call fn.ABSOLUTE,$(CONTRIB.build/)) \
-    --with-vorbis=$(call fn.ABSOLUTE,$(CONTRIB.build/))
+    --with-vorbis=$(call fn.ABSOLUTE,$(CONTRIB.build/)) \
+    HAVE_PKG_CONFIG=no

diff --git a/contrib/libvorbis/module.defs b/contrib/libvorbis/module.defs
index 9946bb53c73b681668fde551d4c86cf939d60046..df7339c7fdea08a38fc6c0cf0f1b35468e64e835 100644 (file)
--- a/contrib/libvorbis/module.defs
+++ b/contrib/libvorbis/module.defs
@@ -4,4 +4,4 @@ $(eval $(call import.CONTRIB.defs,LIBVORBIS))
 LIBVORBIS.FETCH.url = http://download.m0k.org/handbrake/contrib/libvorbis-aotuv_b5.tar.gz
 LIBVORBIS.EXTRACT.tarbase = libvorbis
 
-LIBVORBIS.CONFIGURE.extra = --with-ogg=$(call fn.ABSOLUTE,$(CONTRIB.build/))
+LIBVORBIS.CONFIGURE.extra = --with-ogg=$(call fn.ABSOLUTE,$(CONTRIB.build/)) HAVE_PKG_CONFIG="no"