summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbugmen0t <@>2013-11-23 14:15:26 +0000
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2013-11-25 22:16:11 +0100
commitf26fb0098fdddb03cbb53377416bbd7b0668609d (patch)
tree36190d234e247d816e67ef5d8b091986098ba716
parent2aeeb28dd1e9eba50c61bf16a3aa3d9313d9e4c8 (diff)
downloadmpv-f26fb0098fdddb03cbb53377416bbd7b0668609d.tar.bz2
mpv-f26fb0098fdddb03cbb53377416bbd7b0668609d.tar.xz
build: only check 4Front OSS after passing its CFLAGS
-rw-r--r--waftools/checks/custom.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/waftools/checks/custom.py b/waftools/checks/custom.py
index e8ea9275c8..03f8335279 100644
--- a/waftools/checks/custom.py
+++ b/waftools/checks/custom.py
@@ -88,16 +88,16 @@ def __get_osslibdir__():
def __check_oss_headers__(ctx, dependency_identifier):
import os
- real_oss = ctx.check_cc(fragment=load_fragment('oss_audio_header.c'),
- use='soundcard')
-
- if real_oss:
- if os.path.exists('/etc/oss.conf'):
- osslibdir = __get_osslibdir__()
- ossincdir = os.path.join(osslibdir, 'include')
- soundcard_h = os.path.join(ossincdir, 'sys', 'soundcard.h')
- if os.path.exists(soundcard_h):
- ctx.env.CFLAGS.append('-I{0}'.format(ossincdir))
+ osscflags = ''
+ osslibdir = __get_osslibdir__()
+ if osslibdir:
+ ossincdir = os.path.join(osslibdir, 'include')
+ soundcard_h = os.path.join(ossincdir, 'sys', 'soundcard.h')
+ if os.path.exists(soundcard_h):
+ osscflags = '-I{0}'.format(ossincdir)
+
+ ctx.check_cc(fragment=load_fragment('oss_audio_header.c'), use='soundcard',
+ cflags=osscflags)
return True