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 /test | |
| 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 'test')
| -rw-r--r-- | test/module.defs | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/test/module.defs b/test/module.defs index d703d179f..6fb748e12 100644 --- a/test/module.defs +++ b/test/module.defs @@ -16,14 +16,21 @@ TEST.libs = $(LIBHB.a) $(foreach n, \ TEST.install.exe = $(DESTDIR)$(PREFIX/)bin/$(notdir $(TEST.exe)) +ifeq (1,$(PTHREADW32.enabled)) + TEST.libs += $(CONTRIB.build/)lib/libpthreadGC2.a +endif ifeq (1,$(LIBICONV.enabled)) TEST.libs += $(CONTRIB.build/)lib/libiconv.a endif ifeq (1,$(BZIP2.enabled)) TEST.libs += $(CONTRIB.build/)lib/libbz2.a +else + TEST.GCC.l += bz2 endif ifeq (1,$(ZLIB.enabled)) TEST.libs += $(CONTRIB.build/)lib/libz.a +else + TEST.GCC.l += z endif ############################################################################### @@ -40,13 +47,21 @@ TEST.GCC.I += $(LIBHB.GCC.I) ifeq ($(BUILD.system),darwin) TEST.GCC.f += IOKit CoreServices AudioToolbox - TEST.GCC.l += iconv bz2 z + TEST.GCC.l += iconv else ifeq ($(BUILD.system),linux) - TEST.GCC.l += bz2 z pthread dl m + TEST.GCC.l += pthread dl m else ifeq ($(BUILD.system),solaris) - TEST.GCC.l += bz2 z pthread nsl socket + TEST.GCC.l += pthread nsl socket else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) - TEST.libs += $(CONTRIB.build/)lib/libpthreadGC2.a +ifeq ($(HAS.iconv),1) + TEST.GCC.l += iconv +endif +ifeq ($(HAS.pthread),1) + TEST.GCC.l += pthreadGC2 +endif +ifeq ($(HAS.dlfcn),1) + TEST.GCC.l += dl +endif TEST.GCC.D += PTW32_STATIC_LIB TEST.GCC.l += iberty ws2_32 TEST.GCC.args.extra.exe++ += -static |