From e5f8ab3bcacdbaf57827cf2ea238c8bb320857c3 Mon Sep 17 00:00:00 2001
From: Uoti Urpala <uau@mplayer2.org>
Date: Sun, 6 May 2012 18:29:48 +0300
Subject: ao_arts, ao_esd: remove these AOs

Delete ao_arts and ao_esd. Both have been deprecated upstream.
---
 configure | 58 ----------------------------------------------------------
 1 file changed, 58 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 178184f7c4..208a69d897 100755
--- a/configure
+++ b/configure
@@ -438,8 +438,6 @@ Video output:
 Audio output:
   --disable-alsa         disable ALSA audio output [autodetect]
   --disable-ossaudio     disable OSS audio output [autodetect]
-  --disable-arts         disable aRts audio output [autodetect]
-  --disable-esd          disable esd audio output [autodetect]
   --disable-rsound       disable RSound audio output [autodetect]
   --disable-pulse        disable Pulseaudio audio output [autodetect]
   --disable-portaudio    disable PortAudio audio output [autodetect]
@@ -597,8 +595,6 @@ _iconv=auto
 _langinfo=auto
 _rtc=auto
 _ossaudio=auto
-_arts=auto
-_esd=auto
 _rsound=auto
 _pulse=auto
 _portaudio=auto
@@ -915,10 +911,6 @@ for ac_option do
   --disable-libdv)      _libdv=no       ;;
   --enable-ossaudio)    _ossaudio=yes   ;;
   --disable-ossaudio)   _ossaudio=no    ;;
-  --enable-arts)        _arts=yes       ;;
-  --disable-arts)       _arts=no        ;;
-  --enable-esd)         _esd=yes        ;;
-  --disable-esd)        _esd=no         ;;
   --enable-rsound)      _rsound=yes     ;;
   --disable-rsound)     _rsound=no      ;;
   --enable-pulse)       _pulse=yes      ;;
@@ -4772,51 +4764,6 @@ fi
 echores "$_ossaudio"
 
 
-echocheck "aRts"
-if test "$_arts" = auto ; then
-  _arts=no
-  if ( artsc-config --version ) >> "$TMPLOG" 2>&1 ; then
-    statement_check artsc.h 'arts_init()' $(artsc-config --libs) $(artsc-config --cflags) &&
-      _arts=yes
-  fi
-fi
-
-if test "$_arts" = yes ; then
-  def_arts='#define CONFIG_ARTS 1'
-  aomodules="arts $aomodules"
-  libs_mplayer="$libs_mplayer $(artsc-config --libs)"
-  extra_cflags="$extra_cflags $(artsc-config --cflags)"
-else
-  noaomodules="arts $noaomodules"
-fi
-echores "$_arts"
-
-
-echocheck "EsounD"
-if test "$_esd" = auto ; then
-  _esd=no
-  if ( esd-config --version ) >> "$TMPLOG" 2>&1 ; then
-    statement_check esd.h 'esd_open_sound("test")' $(esd-config --libs) $(esd-config --cflags) && _esd=yes
-  fi
-fi
-echores "$_esd"
-
-if test "$_esd" = yes ; then
-  def_esd='#define CONFIG_ESD 1'
-  aomodules="esd $aomodules"
-  libs_mplayer="$libs_mplayer $(esd-config --libs)"
-  extra_cflags="$extra_cflags $(esd-config --cflags)"
-
-  echocheck "esd_get_latency()"
-  statement_check esd.h 'esd_get_latency(0)' $(esd-config --libs) $(esd-config --cflags) &&
-    _esd_latency=yes && def_esd_latency='#define CONFIG_ESD_LATENCY 1'
-  echores "$_esd_latency"
-else
-  def_esd='#undef CONFIG_ESD'
-  def_esd_latency='#undef CONFIG_ESD_LATENCY'
-  noaomodules="esd $noaomodules"
-fi
-
 echocheck "RSound"
 if test "$_rsound" = auto ; then
    _rsound=no
@@ -6335,7 +6282,6 @@ AA = $_aa
 ALSA = $_alsa
 APPLE_IR = $_apple_ir
 APPLE_REMOTE = $_apple_remote
-ARTS = $_arts
 AUDIO_INPUT = $_audio_input
 BITMAP_FONT = $_bitmap_font
 BL = $_bl
@@ -6356,7 +6302,6 @@ DVDNAV_INTERNAL = $dvdnav_internal
 DVDREAD = $_dvdread
 DVDREAD_INTERNAL = $_dvdread_internal
 DXR3 = $_dxr3
-ESD = $_esd
 FAAD = $_faad
 FASTMEMCPY = $_fastmemcpy
 FBDEV = $_fbdev
@@ -6672,10 +6617,7 @@ $def_xmms
 
 /* Audio output drivers */
 $def_alsa
-$def_arts
 $def_coreaudio
-$def_esd
-$def_esd_latency
 $def_jack
 $def_nas
 $def_openal
-- 
cgit v1.2.3