From 5077373c0cc9e90f1bd1d4231fb44686a3c4aa19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 30 Sep 2013 01:11:43 +0200 Subject: [PATCH] Fix search for cdda includes This resolves Bug 1054 --- configure.in.in | 7 +++++++ src/Makefile.am | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/configure.in.in b/configure.in.in index 73db512..4cbaa90 100644 --- a/configure.in.in +++ b/configure.in.in @@ -37,6 +37,13 @@ dnl cdparanoia check dnl ------------------------------------- AC_CHECK_HEADERS(cdda_interface.h, have_paranoia="yes", have_paranoia="no" ) +if test x$have_paranoia != xyes; then + AC_CHECK_HEADERS(cdda/cdda_interface.h, have_paranoia="yes", have_paranoia="no" ) + if test x$have_paranoia = xyes; then + cdda_includes="-I/usr/include/cdda" + fi +fi +AC_SUBST(cdda_includes) dnl ---------------------------------- dnl Can soundkonverter be compiled? diff --git a/src/Makefile.am b/src/Makefile.am index 12a7b92..c37bc95 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ # set the include path for X, qt and KDE INCLUDES = $(all_includes) -I$(top_srcdir)/src/metadata/ \ - -I$(top_srcdir)/src/pluginloader/ + -I$(top_srcdir)/src/pluginloader/ $(cdda_includes) # these are the headers for your project noinst_HEADERS = cdmanager.h cdopener.h combobutton.h config.h \