build: use a local version of pkg-config when necessary (Darwin-only).

Automatically enabled when pkg-config detection fails, and can
be forced with the --enable-local-pkgconfig configure option.


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

5 files changed, 26 insertions, 4 deletions

diff --git a/contrib/libbluray/module.defs b/contrib/libbluray/module.defs
index 6c1c0f195..5a7b610e3 100644
--- a/contrib/libbluray/module.defs
+++ b/contrib/libbluray/module.defs
@@ -1,5 +1,4 @@
-__deps__ := LIBXML2 FREETYPE
-$(eval $(call import.MODULE.defs,LIBBLURAY,libbluray,$(__deps__)))
+$(eval $(call import.MODULE.defs,LIBBLURAY,libbluray,PKGCONFIG LIBXML2 FREETYPE))
 $(eval $(call import.CONTRIB.defs,LIBBLURAY))
 
 LIBBLURAY.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libbluray-0.5.0.tar.bz2
@@ -15,3 +14,8 @@ ifeq (none,$(LIBBLURAY.GCC.O))
 endif
 
 LIBBLURAY.CONFIGURE.extra += --disable-examples
+
+ifeq (1,$(FEATURE.local_pkgconfig))
+    LIBBLURAY.CONFIGURE.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
+    LIBBLURAY.BUILD.env     = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
+endif
diff --git a/contrib/libdvdnav/module.defs b/contrib/libdvdnav/module.defs
index 0e22d2919..697e89988 100644
--- a/contrib/libdvdnav/module.defs
+++ b/contrib/libdvdnav/module.defs
@@ -1,4 +1,4 @@
-$(eval $(call import.MODULE.defs,LIBDVDNAV,libdvdnav,LIBDVDREAD))
+$(eval $(call import.MODULE.defs,LIBDVDNAV,libdvdnav,PKGCONFIG LIBDVDREAD))
 $(eval $(call import.CONTRIB.defs,LIBDVDNAV))
 
 LIBDVDNAV.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libdvdnav-a5c1325.tar.bz2
@@ -6,3 +6,8 @@ LIBDVDNAV.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libdvdnav-a
 ifneq (max,$(LIBDVDNAV.GCC.g))
     LIBDVDNAV.GCC.D += NDEBUG
 endif
+
+ifeq (1,$(FEATURE.local_pkgconfig))
+    LIBDVDNAV.CONFIGURE.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
+    LIBDVDNAV.BUILD.env     = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
+endif
diff --git a/contrib/libdvdread/module.defs b/contrib/libdvdread/module.defs
index 3dcfc8892..8efbc31ce 100644
--- a/contrib/libdvdread/module.defs
+++ b/contrib/libdvdread/module.defs
@@ -1,4 +1,4 @@
-$(eval $(call import.MODULE.defs,LIBDVDREAD,libdvdread))
+$(eval $(call import.MODULE.defs,LIBDVDREAD,libdvdread,PKGCONFIG))
 $(eval $(call import.CONTRIB.defs,LIBDVDREAD))
 
 LIBDVDREAD.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libdvdread-a2f211a.tar.bz2
@@ -6,3 +6,8 @@ LIBDVDREAD.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libdvdread
 ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
     LIBDVDREAD.CONFIGURE.extra = --enable-dlfcn
 endif
+
+ifeq (1,$(FEATURE.local_pkgconfig))
+    LIBDVDREAD.CONFIGURE.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
+    LIBDVDREAD.BUILD.env     = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
+endif
diff --git a/contrib/pkgconfig/module.defs b/contrib/pkgconfig/module.defs
new file mode 100644
index 000000000..f87a343f3
--- /dev/null
+++ b/contrib/pkgconfig/module.defs
@@ -0,0 +1,6 @@
+$(eval $(call import.MODULE.defs,PKGCONFIG,pkgconfig))
+$(eval $(call import.CONTRIB.defs,PKGCONFIG))
+
+PKGCONFIG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/pkg-config-0.28.tar.bz2
+
+PKGCONFIG.CONFIGURE.extra = --with-internal-glib --disable-host-tool
diff --git a/contrib/pkgconfig/module.rules b/contrib/pkgconfig/module.rules
new file mode 100644
index 000000000..3d6747c89
--- /dev/null
+++ b/contrib/pkgconfig/module.rules
@@ -0,0 +1,2 @@
+$(eval $(call import.MODULE.rules,PKGCONFIG))
+$(eval $(call import.CONTRIB.rules,PKGCONFIG))