summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-09 19:24:47 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-09 19:24:47 +0200
commitf1b6cdbe9de67a0d87c63562dec54617f6d907fc (patch)
tree4afb94f622111863d0e0aa8c999291a97b1e68c9 /configure
parent108e10416b32de361480e9e9bfa972312c1520da (diff)
parent2aa41effad0c9eb8efe5e2b471d4b83314f5e10a (diff)
downloadmpv-f1b6cdbe9de67a0d87c63562dec54617f6d907fc.tar.bz2
mpv-f1b6cdbe9de67a0d87c63562dec54617f6d907fc.tar.xz
Merge svn changes up to r30484
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure26
1 files changed, 26 insertions, 0 deletions
diff --git a/configure b/configure
index 519edaad26..c4bc567f8c 100755
--- a/configure
+++ b/configure
@@ -393,6 +393,7 @@ Audio output:
--disable-nas disable NAS audio output [autodetect]
--disable-sgiaudio disable SGI audio output [autodetect]
--disable-sunaudio disable Sun audio output [autodetect]
+ --disable-kai disable KAI audio output [autodetect]
--disable-dart disable DART audio output [autodetect]
--disable-win32waveout disable Windows waveout audio output [autodetect]
--disable-coreaudio disable CoreAudio audio output [autodetect]
@@ -563,6 +564,7 @@ _arts=auto
_esd=auto
_pulse=auto
_jack=auto
+_kai=auto
_dart=auto
_openal=no
_libcdio=auto
@@ -949,6 +951,8 @@ for ac_option do
--disable-jack) _jack=no ;;
--enable-openal) _openal=yes ;;
--disable-openal) _openal=no ;;
+ --enable-kai) _kai=yes ;;
+ --disable-kai) _kai=no ;;
--enable-dart) _dart=yes ;;
--disable-dart) _dart=no ;;
--enable-mad) _mad=yes ;;
@@ -5803,6 +5807,26 @@ fi #if irix
if os2 ; then
+echocheck "KAI (UNIAUD/DART)"
+if test "$_kai" = auto; then
+ cat > $TMPC << EOF
+#include <os2.h>
+#include <kai.h>
+int main(void) { return 0; }
+EOF
+ _kai=no;
+ cc_check -lkai && _kai=yes
+fi
+if test "$_kai" = yes ; then
+ def_kai='#define CONFIG_KAI 1'
+ libs_mplayer="$libs_mplayer -lkai"
+ _aomodules="kai $_aomodules"
+else
+ def_kai='#undef CONFIG_KAI'
+ _noaomodules="kai $_noaomodules"
+fi
+echores "$_kai"
+
echocheck "DART"
if test "$_dart" = auto; then
cat > $TMPC << EOF
@@ -7963,6 +7987,7 @@ IVTV = $_ivtv
JACK = $_jack
JOYSTICK = $_joystick
JPEG = $_jpeg
+KAI = $_kai
KVA = $_kva
LADSPA = $_ladspa
LIBA52 = $_liba52
@@ -8348,6 +8373,7 @@ $def_dart
$def_esd
$def_esd_latency
$def_jack
+$def_kai
$def_nas
$def_openal
$def_openal_h