oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

input/CdioParanoia: detect libcdio version at compile time

Browse Source 
libcdio_paranoia was split from libcdio in version 90, and at the same
time, the header was moved from cdio/paranoia.h to
cdio/paranoia/paranoia.h.  We can easily detect this version at
compile time which is faster than configure time.
This commit is contained in:
Max Kellermann 2019-01-21 11:06:44 +01:00
parent 6a68e1c3f3
commit ca34f3250b
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/input/plugins/CdioParanoiaInputPlugin.cxx
View File

@ -41,7 +41,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
#ifdef HAVE_CDIO_PARANOIA_PARANOIA_H #include <cdio/version.h>
#if LIBCDIO_VERSION_NUM >= 90
#include <cdio/paranoia/paranoia.h> #include <cdio/paranoia/paranoia.h>
#else #else
#include <cdio/paranoia.h> #include <cdio/paranoia.h>

4
src/input/plugins/meson.build
View File

@ -10,10 +10,6 @@ libcdio_paranoia_dep = dependency('libcdio_paranoia', version: '>= 0.4', require
conf.set('ENABLE_CDIO_PARANOIA', libcdio_paranoia_dep.found()) conf.set('ENABLE_CDIO_PARANOIA', libcdio_paranoia_dep.found())
if libcdio_paranoia_dep.found() if libcdio_paranoia_dep.found()
input_plugins_sources += 'CdioParanoiaInputPlugin.cxx' input_plugins_sources += 'CdioParanoiaInputPlugin.cxx'
conf.set('HAVE_CDIO_PARANOIA_PARANOIA_H',
compiler.has_header('cdio/paranoia/paranoia.h',
dependencies: libcdio_paranoia_dep))
endif endif
if curl_dep.found() if curl_dep.found()