diff options
| author | jstebbins <[email protected]> | 2010-05-23 15:38:21 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2010-05-23 15:38:21 +0000 |
| commit | 28658486daa5cd3e7a58edb3539885422889c44f (patch) | |
| tree | 22bd3d2a80d5443584ece6d769cd7d41c53cdfaa /make/include | |
| parent | a28717d0b3d41674934d6e0e24ee70344576fb1e (diff) | |
add ability to probe for existance of headers and libraries to configure.py
use this to check for system versions of bz2 z pthreadGC2 iberty and dl when
building with mingw. solves a problem with conflicts when building on fedora with
a full standard install of their mingw packages.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3316 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'make/include')
| -rw-r--r-- | make/include/main.defs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/make/include/main.defs b/make/include/main.defs index 3228593ba..23c176fd9 100644 --- a/make/include/main.defs +++ b/make/include/main.defs @@ -11,8 +11,10 @@ include $(SRC/)make/include/tool.defs MODULES += contrib/a52dec ifneq (,$(filter $(BUILD.system),cygwin mingw)) +ifneq ($(HAS.bz2),1) MODULES += contrib/bzip2 endif +endif MODULES += contrib/faac MODULES += contrib/faad2 @@ -30,15 +32,21 @@ MODULES += contrib/mp4v2 MODULES += contrib/mpeg2dec ifneq (,$(filter $(BUILD.system),mingw)) +ifneq ($(HAS.pthread),1) MODULES += contrib/pthreadw32 endif +endif MODULES += contrib/x264 ifneq (,$(filter $(BUILD.system),cygwin mingw)) +ifneq ($(HAS.iconv),1) MODULES += contrib/libiconv +endif +ifneq ($(HAS.libz),1) MODULES += contrib/zlib endif +endif ifneq (,$(filter $(BUILD.system),solaris)) MODULES += contrib/libiconv |