From 597daea66c3f19ed15a00a0ac31e0f6e03e3f031 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Sun, 9 Feb 2014 02:43:00 +0100
Subject: Fix FTBFS with libcdio >= 0.90

---
 configure.in.in                    | 5 -----
 kaffeine/configure.in.in           | 8 +++++++-
 kaffeine/src/input/disc/paranoia.h | 6 +++++-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 5da2d91..9751e7c 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -10,10 +10,5 @@ if test "$build_arts" = "yes"; then
     AC_SUBST(LIB_ARTS)
 fi
 
-KDE_CHECK_HEADER(cdio/paranoia/cdda.h, [have_libcdio_090="yes"], [have_libcdio_090="no"])
-if test "x$have_libcdio_090" = "xyes"; then
-	AC_DEFINE(HAVE_LIBCDIO_090, 1, [have libcdio >= 0.90])
-fi
-
 KDE_INIT_DOXYGEN([The API Reference], [Version $VERSION])
 
diff --git a/kaffeine/configure.in.in b/kaffeine/configure.in.in
index 9c95ea0..02736cd 100644
--- a/kaffeine/configure.in.in
+++ b/kaffeine/configure.in.in
@@ -220,7 +220,13 @@ dnl --------------------
 dnl check for cdparanoia
 dnl --------------------
 
-KDE_CHECK_HEADER([cdio/cdda.h], [with_cdparanoia=yes], [with_cdparanoia=no])
+KDE_CHECK_HEADER([cdio/paranoia/cdda.h], [have_libcdio_090=yes; with_cdparanoia=yes], [have_libcdio_090=no])
+if test "x$have_libcdio_090" = "xyes"; then
+	AC_DEFINE(HAVE_LIBCDIO_090, 1, [have libcdio >= 0.90])
+else
+	KDE_CHECK_HEADER([cdio/cdda.h], [with_cdparanoia=yes], [with_cdparanoia=no])
+fi
+
 
 if test "$with_cdparanoia" != "yes" ; then
 	echo ""
diff --git a/kaffeine/src/input/disc/paranoia.h b/kaffeine/src/input/disc/paranoia.h
index 3f0eee3..76a4035 100644
--- a/kaffeine/src/input/disc/paranoia.h
+++ b/kaffeine/src/input/disc/paranoia.h
@@ -21,6 +21,10 @@
 #ifndef PARANOIA_H
 #define PARANOIA_H
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <tqstringlist.h>
 #include <tqthread.h>
 #include <tqwidget.h>
@@ -33,7 +37,7 @@
 extern "C"
 {
 #ifdef HAVE_LIBCDIO_090
-#include <cdio/paranoiacdda.h>
+#include <cdio/paranoia/cdda.h>
 #include <cdio/paranoia/paranoia.h>
 #else // HAVE_LIBCDIO_090
 #include <cdio/cdda.h>
-- 
cgit v1.2.1