input/CdioParanoia: detect libcdio version at compile time

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.

input/CdioParanoia: detect libcdio version at compile time
ca34f325 · Max Kellermann · 6a68e1c3 · ca34f325 · ca34f325
Commit ca34f325 authored Jan 21, 2019 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

CdioParanoiaInputPlugin.cxx src/input/plugins/CdioParanoiaInputPlugin.cxx +2 -1

meson.build src/input/plugins/meson.build +0 -4

No files found.
--- a/src/input/plugins/CdioParanoiaInputPlugin.cxx
+++ b/src/input/plugins/CdioParanoiaInputPlugin.cxx
@@ -41,7 +41,8 @@
 #include <stdlib.h>
 #include <assert.h>

-#ifdef HAVE_CDIO_PARANOIA_PARANOIA_H
+#include <cdio/version.h>
+#if LIBCDIO_VERSION_NUM >= 90
 #include <cdio/paranoia/paranoia.h>
 #else
 #include <cdio/paranoia.h>

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

 if curl_dep.found()