diff options
| author | bradleys <[email protected]> | 2015-04-24 16:16:14 +0000 |
|---|---|---|
| committer | bradleys <[email protected]> | 2015-04-24 16:16:14 +0000 |
| commit | 5eb127da904759380a7bd9d1d3f1b2d9137bdeba (patch) | |
| tree | 3aef8348ead96ecea6507362e77573f5d698f84d | |
| parent | 57b674a1b38c655362bf694f60bd2b9927d58ddb (diff) | |
libhb: Build local pkgconfig when building local autotools.
Prevents missing pkgconfig macros causing build failures on some systems when using local autotools with system pkgconfig.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7123 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | contrib/libtool/module.defs | 2 | ||||
| -rw-r--r-- | make/include/main.defs | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/contrib/libtool/module.defs b/contrib/libtool/module.defs index 492a36e70..803fb726a 100644 --- a/contrib/libtool/module.defs +++ b/contrib/libtool/module.defs @@ -1,4 +1,4 @@ -$(eval $(call import.MODULE.defs,LIBTOOL,libtool,AUTOCONF AUTOMAKE)) +$(eval $(call import.MODULE.defs,LIBTOOL,libtool,AUTOCONF AUTOMAKE PKGCONFIG)) $(eval $(call import.CONTRIB.defs,LIBTOOL)) LIBTOOL.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libtool-2.4.2.tar.bz2 diff --git a/make/include/main.defs b/make/include/main.defs index 88de5933f..1781fb41e 100644 --- a/make/include/main.defs +++ b/make/include/main.defs @@ -23,7 +23,8 @@ ifeq (1,$(FEATURE.local_autotools)) MODULES += contrib/automake MODULES += contrib/libtool MODULES += contrib/m4 - AUTOTOOL_MODULES = AUTOCONF AUTOMAKE LIBTOOL M4 + MODULES += contrib/pkgconfig + AUTOTOOL_MODULES = AUTOCONF AUTOMAKE LIBTOOL M4 PKGCONFIG HB_TOOLS_PATH = $(call fn.ABSOLUTE,$(CONTRIB.build/)bin) else AUTOTOOL_MODULES = |