From e94e60c3423a900a31c2eb3d679acb32949cc9dc Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Sun, 17 Oct 2021 01:59:35 -0300 Subject: [PATCH] lame:meson: Avoid using fallback when we could use system install Part-of: --- subprojects/gst-plugins-good/ext/lame/meson.build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/subprojects/gst-plugins-good/ext/lame/meson.build b/subprojects/gst-plugins-good/ext/lame/meson.build index 8baa283c31..2169fde6f4 100644 --- a/subprojects/gst-plugins-good/ext/lame/meson.build +++ b/subprojects/gst-plugins-good/ext/lame/meson.build @@ -1,11 +1,9 @@ lame_option = get_option('lame') -lame_dep = dependency('mp3lame', fallback: ['lame', 'lame_dep'], required: false) lame_extra_c_args = [] -have_lame = lame_dep.found() -if not have_lame - lame_dep = cc.find_library('mp3lame', required : lame_option) - have_lame = cc.has_header_symbol('lame/lame.h', 'lame_init', required : lame_option) +lame_dep = cc.find_library('mp3lame', required: false) +have_lame = cc.has_header_symbol('lame/lame.h', 'lame_init') +if have_lame if cc.has_header_symbol('lame/lame.h', 'lame_set_VBR_quality') lame_extra_c_args += ['-DHAVE_LAME_SET_VBR_QUALITY'] endif @@ -13,6 +11,8 @@ if not have_lame lame_extra_c_args += ['-DGSTLAME_PRESET'] endif else + lame_dep = dependency('mp3lame', fallback: ['lame', 'lame_dep'], required: lame_option) + have_lame = lame_dep.found() lame_extra_c_args += ['-DHAVE_LAME_SET_VBR_QUALITY', '-DGSTLAME_PRESET', '-DLAME_SUBPROJECT'] endif