From 23599b030c87c64c5c4cdb0e9a96338ef230a18b Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 1 Mar 2009 11:36:39 +0000
Subject: DART audio output driver for OS/2 by KO Myung-Hun, komh chollian net

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28775 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'configure')

diff --git a/configure b/configure
index 41809c65dd..e035652add 100755
--- a/configure
+++ b/configure
@@ -415,6 +415,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-dart         disable DART audio output [autodetect]
   --disable-win32waveout disable Windows waveout audio output [autodetect]
   --disable-select       disable using select() on the audio device [enable]
 
@@ -588,6 +589,7 @@ _arts=auto
 _esd=auto
 _pulse=auto
 _jack=auto
+_dart=auto
 _openal=auto
 _libcdio=auto
 _liblzo=auto
@@ -956,6 +958,8 @@ for ac_option do
   --disable-jack)	_jack=no	;;
   --enable-openal)	_openal=yes	;;
   --disable-openal)	_openal=no	;;
+  --enable-dart)   _dart=yes   ;;
+  --disable-dart)  _dart=no    ;;
   --enable-mad)		_mad=yes	;;
   --disable-mad)	_mad=no		;;
   --enable-mp3lame)	_mp3lame=yes	;;
@@ -5645,6 +5649,29 @@ echores "$_sgiaudio"
 fi #if irix
 
 
+if os2 ; then
+echocheck "DART"
+if test "$_dart" = auto; then
+  cat > $TMPC << EOF
+#include <os2.h>
+#include <dart.h>
+int main( void ) { return 0; }
+EOF
+  _dart=no;
+  cc_check -ldart && _dart=yes
+fi
+if test "$_dart" = yes ; then
+  def_dart='#define CONFIG_DART 1'
+  _libs_mplayer="$_libs_mplayer -ldart"
+  _aomodules="dart $_aomodules"
+else
+  def_dart='#undef CONFIG_DART'
+  _noaomodules="dart $_noaomodules"
+fi
+echores "$_dart"
+fi #if os2
+
+
 # set default CD/DVD devices
 if win32 || os2 ; then
   default_cdrom_device="D:"
@@ -8083,6 +8110,7 @@ CDDA = $_cdda
 CDDB = $_cddb
 COREAUDIO = $_coreaudio
 COREVIDEO = $_corevideo
+DART = $_dart
 DFBMGA = $_dfbmga
 DGA = $_dga
 DIRECT3D = $_direct3d
@@ -8525,6 +8553,7 @@ $def_alsa5
 $def_alsa9
 $def_arts
 $def_coreaudio
+$def_dart
 $def_esd
 $def_esd_latency
 $def_jack
-- 
cgit v1.2.3


From 1005952a8ba43138089d130e74b40f22908911f3 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 5 Mar 2009 22:19:47 +0000
Subject: Only add -Ilibdvdnav to the CFLAGS of the files that require it.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28829 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index e035652add..a0d9013547 100755
--- a/configure
+++ b/configure
@@ -7996,7 +7996,7 @@ if test "$_dvdnav" = yes ; then
   _largefiles=yes
   def_dvdnav='#define CONFIG_DVDNAV 1'
   if test "$dvdnav_internal" = yes ; then
-    _inc_extra="$_inc_extra -Ilibdvdnav"
+    cflags_libdvdnav="-Ilibdvdnav"
     _inputmodules="dvdnav(internal) $_inputmodules"
   else
     _inc_extra="$_inc_extra `$_dvdnavconfig --cflags`"
@@ -8054,6 +8054,7 @@ CFLAGS_DHAHELPER = $cflags_dhahelper
 CFLAGS_FAAD_FIXED = $cflags_faad_fixed
 CFLAGS_LIBDVDCSS = $cflags_libdvdcss
 CFLAGS_LIBDVDCSS_DVDREAD = $cflags_libdvdcss_dvdread
+CFLAGS_LIBDVDNAV = $cflags_libdvdnav
 CFLAGS_NO_OMIT_LEAF_FRAME_POINTER = $cflags_no_omit_leaf_frame_pointer
 CFLAGS_STACKREALIGN = $cflags_stackrealign
 CFLAGS_SVGALIB_HELPER = $cflags_svgalib_helper
-- 
cgit v1.2.3