summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-09-30 01:11:43 +0200
committerSlávek Banko <slavek.banko@axis.cz>2013-09-30 01:11:43 +0200
commit5077373c0cc9e90f1bd1d4231fb44686a3c4aa19 (patch)
tree3b99169ab5561751d89f6647534d08aa238b42de
parent00fe4373185f6730c80ddf66530eca79a215d312 (diff)
downloadsoundkonverter-5077373c0cc9e90f1bd1d4231fb44686a3c4aa19.tar.gz
soundkonverter-5077373c0cc9e90f1bd1d4231fb44686a3c4aa19.zip
Fix search for cdda includes
This resolves Bug 1054
-rw-r--r--configure.in.in7
-rw-r--r--src/Makefile.am2
2 files changed, 8 insertions, 1 deletions
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 \