Fix FTBFS with libcdio >= 0.90

pull/1/head
Slávek Banko 10 years ago
parent aa821e987c
commit 597daea66c

@ -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])

@ -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 ""

@ -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>

Loading…
Cancel
Save