add ability to probe for existance of headers and libraries to configure.py

[handbrake-jp/handbrake-jp-git.git] / make / include / main.defs

diff --git a/make/include/main.defs b/make/include/main.defs
index 3228593..23c176f 100644 (file)
--- 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