From 1b8a9ce2352f4ab41f63d4eb3911e91b3ef77143 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Thu, 27 Sep 2012 01:18:27 +0000 Subject: [PATCH] Fortify the library/header/function/type checks a bit. --- wscript | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/wscript b/wscript index ea5911d..8136066 100644 --- a/wscript +++ b/wscript @@ -152,15 +152,17 @@ def configure(conf): if not conf.env.AVISYNTH in ['true', 'false']: conf.fatal('--avisynth must be either true or false.') - conf.check_cxx(lib = 'QtCore', features = 'cxx cxxprogram') + conf.check_cxx(lib = 'QtCore') + conf.check_cxx(use = ['QTCORE'], header_name = 'QtCore/QtCore') + conf.check_cxx(use = ['QTCORE'], header_name = 'QtCore/QtCore', type_name = 'QAtomicInt') conf.check_cc(lib = 'avutil') - conf.check_cc(header_name = 'libavutil/avutil.h') - conf.check_cc(lib = 'avutil', header_name = 'libavutil/avutil.h', function_name = 'avutil_license') + conf.check_cc(use = ['AVUTIL'], header_name = 'libavutil/avutil.h') + conf.check_cc(use = ['AVUTIL'], header_name = 'libavutil/avutil.h', function_name = 'avutil_license') conf.check_cc(lib = 'swscale') - conf.check_cc(header_name = 'libswscale/swscale.h') - conf.check_cc(lib = 'swscale', header_name = 'libswscale/swscale.h', function_name = 'swscale_license') + conf.check_cc(use = ['SWSCALE'], header_name = 'libswscale/swscale.h') + conf.check_cc(use = ['SWSCALE'], header_name = 'libswscale/swscale.h', function_name = 'swscale_license') def build(bld): def search_paths(paths): -- 2.11.4.GIT