[MPlayer-cvslog] r31416 - trunk/configure

[diego]

Author: diego
Date: Mon Jun 14 17:19:38 2010
New Revision: 31416

Log:
Drop linux-devfs configure option.

Modified:
   trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure	Mon Jun 14 17:17:48 2010	(r31415)
+++ trunk/configure	Mon Jun 14 17:19:38 2010	(r31416)
@@ -227,7 +227,6 @@ Optional features:
   --enable-gui           enable GMPlayer compilation (GTK+ GUI) [disable]
   --enable-gtk1          force using GTK 1.2 for the GUI  [disable]
   --disable-largefiles   disable support for files > 2GB [enable]
-  --enable-linux-devfs   set default devices to devfs [disable]
   --enable-termcap       use termcap database for key codes [autodetect]
   --enable-termios       use termios database for key codes [autodetect]
   --disable-iconv        disable iconv for encoding conversion [autodetect]
@@ -723,7 +722,6 @@ _bl=no
 _largefiles=yes
 #language=en
 _shm=auto
-_linux_devfs=no
 _charset="UTF-8"
 _dynamic_plugins=no
 _crash_debug=no
@@ -1236,8 +1234,6 @@ for ac_option do
   --disable-shm)        _shm=no         ;;
   --enable-select)      _select=yes     ;;
   --disable-select)     _select=no      ;;
-  --enable-linux-devfs)    _linux_devfs=yes ;;
-  --disable-linux-devfs)   _linux_devfs=no  ;;
   --enable-cdparanoia)  _cdparanoia=yes ;;
   --disable-cdparanoia) _cdparanoia=no  ;;
   --enable-cddb)        _cddb=yes       ;;
@@ -5648,10 +5644,6 @@ fi
 if test "$_ossaudio" = yes ; then
   def_ossaudio='#define CONFIG_OSS_AUDIO 1'
   aomodules="oss $aomodules"
-  if test "$_linux_devfs" = yes; then
-    def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/sound/dsp"'
-    def_ossaudio_devmixer='#define PATH_DEV_MIXER "/dev/sound/mixer"'
-  else
      cat > $TMPC << EOF
 #include <sys/ioctl.h>
 #include <$_soundcard_header>
@@ -5672,7 +5664,6 @@ EOF
        def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/dsp"'
      fi
     def_ossaudio_devmixer='#define PATH_DEV_MIXER "/dev/mixer"'
-  fi
 else
   def_ossaudio='#undef CONFIG_OSS_AUDIO'
   def_ossaudio_devdsp='#define PATH_DEV_DSP ""'