blob: 4f38e634a2dbf745383447f875bf9e9c3ac73d3b (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
--- configure.orig 2018-02-01 11:15:37 UTC
+++ configure
@@ -227,6 +227,10 @@ add_cxxflags(){
append ECXXFLAGS "$@"
}
+add_cppflags(){
+ append CPPFLAGS "$@"
+}
+
check_cxx(){
log check_cxx "$@"
cat > $TMPCXX
@@ -559,6 +563,10 @@ CXXPPFLAGS=${CXXPPFLAGS#CXXPPFLAGS=}
OPENGLV=$(cat mythconfig.mak | grep -e "^CONFIG_OPENGL_VIDEO=yes")
OPENGLES=$(cat mythconfig.mak | grep -e "^HAVE_GLES2_GL2_H=yes")
+add_cppflags "-I${prefix}/include"
+add_cxxflags "-I${prefix}/include"
+add_ldflags "-L${prefix}/lib"
+
EXTRALIBS=$(cat mythconfig.mak | grep -e "^EXTRALIBS=")
EXTRALIBS=${EXTRALIBS#EXTRALIBS=}
@@ -689,8 +697,10 @@ if enabled music ; then
echo "MythMusic requires FLAC."
fi
- 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
+ if enabled cdio; then
+ if ! check_lib cdio/cdio.h cdio_open -lcdio || ! check_lib cdio/paranoia/cdda.h cdio_cddap_open -lcdio_cdda || ! check_lib cdio/paranoia/paranoia.h cdio_paranoia_init -lcdio_paranoia ; then
+ disable cdio
+ fi
fi
if ! check_lib lame/lame.h lame_init -lmp3lame ; then
|
