diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-06-14 15:19:38 +0000 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-02 04:09:17 +0200 |
commit | ab12b8e872effd250ba1e1201171844c78f1efe4 (patch) | |
tree | 6cfb88fed2adc8ab0f999954ddf959c2691e1c5b | |
parent | 713284ea26f641839ad71b52bc799f4f248466fd (diff) | |
download | mpv-ab12b8e872effd250ba1e1201171844c78f1efe4.tar.bz2 mpv-ab12b8e872effd250ba1e1201171844c78f1efe4.tar.xz |
configure: Drop linux-devfs configure option.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31416 b3059339-0415-0410-9bf9-f77b7e298cf2
cosmetics: Reindent after last commit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31417 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-x | configure | 47 |
1 files changed, 19 insertions, 28 deletions
@@ -227,7 +227,6 @@ Optional features: --disable-mencoder disable MEncoder (A/V encoder) compilation [enable] --disable-mplayer disable MPlayer compilation [enable] --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] @@ -657,7 +656,6 @@ _bl=no _largefiles=yes #language=en _shm=auto -_linux_devfs=no _translation=no _charset="UTF-8" _dynamic_plugins=no @@ -1127,8 +1125,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 ;; @@ -5385,11 +5381,7 @@ 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 + cat > $TMPC << EOF #include <sys/ioctl.h> #include <$_soundcard_header> #ifdef OPEN_SOUND_SYSTEM @@ -5398,27 +5390,26 @@ int main(void) { return 0; } #error Not the real thing #endif EOF - _real_ossaudio=no - cc_check && _real_ossaudio=yes - if test "$_real_ossaudio" = yes; then - def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/dsp"' - # Check for OSS4 headers (override default headers) - # Does not apply to systems where OSS4 is native (e.g. FreeBSD) - if test -f /etc/oss.conf; then - . /etc/oss.conf - _ossinc="$OSSLIBDIR/include" - if test -f "$_ossinc/sys/soundcard.h"; then - extra_cflags="-I$_ossinc $extra_cflags" - fi + _real_ossaudio=no + cc_check && _real_ossaudio=yes + if test "$_real_ossaudio" = yes; then + def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/dsp"' + # Check for OSS4 headers (override default headers) + # Does not apply to systems where OSS4 is native (e.g. FreeBSD) + if test -f /etc/oss.conf; then + . /etc/oss.conf + _ossinc="$OSSLIBDIR/include" + if test -f "$_ossinc/sys/soundcard.h"; then + extra_cflags="-I$_ossinc $extra_cflags" fi - elif netbsd || openbsd ; then - def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/sound"' - extra_ldflags="$extra_ldflags -lossaudio" - else - def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/dsp"' fi - def_ossaudio_devmixer='#define PATH_DEV_MIXER "/dev/mixer"' - fi + elif netbsd || openbsd ; then + def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/sound"' + extra_ldflags="$extra_ldflags -lossaudio" + else + def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/dsp"' + fi + def_ossaudio_devmixer='#define PATH_DEV_MIXER "/dev/mixer"' else def_ossaudio='#undef CONFIG_OSS_AUDIO' def_ossaudio_devdsp='#define PATH_DEV_DSP ""' |