X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=make%2Finclude%2Fmain.defs;h=23c176fd9f8c44c6bab7ed437fa073372d61303e;hb=4f0019f03c2e85e8634150ff0c9a31bee6d35ce5;hp=3228593bafa2aaa7b7bfc4749f4c12fa114296f9;hpb=e94708133a0cfefaa095fdbb6b321a2314f77b02;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/make/include/main.defs b/make/include/main.defs
index 3228593b..23c176fd 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