Better library detection for configure checks.
authorCarl Hetherington <cth@carlh.net>
Sun, 28 Oct 2018 22:54:12 +0000 (22:54 +0000)
committerCarl Hetherington <cth@carlh.net>
Sun, 28 Oct 2018 23:10:35 +0000 (23:10 +0000)
wscript

diff --git a/wscript b/wscript
index 4972445..de9c82d 100644 (file)
--- a/wscript
+++ b/wscript
@@ -381,9 +381,7 @@ def configure(conf):
                             int main () { av_ebur128_get_true_peaks (0); }\n
                             """,
                    msg='Checking for EBUR128-patched FFmpeg',
-                   libpath=conf.env['LIBPATH_AVFORMAT'],
-                   lib='avfilter avutil swresample avcodec avformat swscale postproc',
-                   includes=conf.env['INCLUDES_AVFORMAT'],
+                   uselib='AVCODEC AVFILTER',
                    define_name='DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG',
                    mandatory=False)
 
@@ -397,9 +395,7 @@ def configure(conf):
                             """,
                    msg='Checking for AVSubtitleRect::pict',
                    cxxflags='-Wno-unused-result -Wno-unused-value -Wdeprecated-declarations -Werror',
-                   libpath=conf.env['LIBPATH_AVCODEC'],
-                   lib='avcodec',
-                   includes=conf.env['INCLUDES_AVCODEC'],
+                   uselib='AVCODEC',
                    define_name='DCPOMATIC_HAVE_AVSUBTITLERECT_PICT',
                    mandatory=False)
 
@@ -413,9 +409,7 @@ def configure(conf):
                             """,
                    msg='Checking for AVComponentDescriptor::depth_minus1',
                    cxxflags='-Wno-unused-result -Wno-unused-value -Wdeprecated-declarations -Werror',
-                   libpath=conf.env['LIBPATH_AVUTIL'],
-                   lib='avutil',
-                   includes=conf.env['INCLUDES_AVUTIL'],
+                   uselib='AVUTIL',
                    define_name='DCPOMATIC_HAVE_AVCOMPONENTDESCRIPTOR_DEPTH_MINUS1',
                    mandatory=False)