--- configure.orig	2013-09-18 20:06:08.000000000 +0000
+++ configure	2013-10-16 15:21:39.000000000 +0000
@@ -227,6 +227,10 @@
     append ECXXFLAGS "$@"
 }
 
+add_cppflags(){
+    append CPPFLAGS "$@"
+}
+
 check_cxx(){
     log check_cxx "$@"
     cat > $TMPCXX
@@ -561,6 +565,10 @@
 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_qmake5 $qmake ; then
   if ! is_qmake4 $qmake; then
       is_qmake4 qmake-qt4 && qmake=qmake-qt4 || die "qmake for Qt4.8 or newer not found.\nPlease specify the correct qmake with --qmake="
@@ -653,6 +661,7 @@
         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