--- configure.orig	2015-06-16 16:03:30 UTC
+++ configure
@@ -227,6 +227,10 @@ add_cxxflags(){
     append ECXXFLAGS "$@"
 }
 
+add_cppflags(){
+    append CPPFLAGS "$@"
+}
+
 check_cxx(){
     log check_cxx "$@"
     cat > $TMPCXX
@@ -561,6 +565,10 @@ OPENGLV=$(cat mythconfig.mak | grep -e "
 EXTRALIBS=$(cat mythconfig.mak | grep -e "^EXTRALIBS=")
 EXTRALIBS=${EXTRALIBS#EXTRALIBS=}
 
+add_cppflags "-I${prefix}/include"
+add_cxxflags "-I${prefix}/include"
+add_ldflags "-L${prefix}/lib"
+
 if is_qmake4 $qmake || is_qmake4 qmake-qt4; then
     if is_qmake4 qmake-qt4; then
         qmake=qmake-qt4
@@ -657,6 +665,7 @@ if enabled music ; then
         echo "MythMusic requires FLAC."
     fi
 
+    enable cdio
     if ! check_lib cdio/cdio.h cdio_open -lcdio || ! check_lib cdio/cdda.h cdio_cddap_open -lcdio_cdda || ! check_lib cdio/paranoia.h cdio_paranoia_init -lcdio_paranoia ; then
         disable cdio
     fi