build: make sndio part of the autodetected libraries

sndio is already autodetected, this commit makes sure
--disable-autodetect actually disable it unless --enable-sndio is
specified.
pull/269/head
Clément Bœsch 7 years ago committed by Clément Bœsch
parent b7fbb3516a
commit e090e750ba
  1. 5
      configure
  2. 2
      libavdevice/Makefile

5
configure vendored

@ -288,6 +288,7 @@ External library support:
--enable-opengl enable OpenGL rendering [no] --enable-opengl enable OpenGL rendering [no]
--enable-openssl enable openssl, needed for https support --enable-openssl enable openssl, needed for https support
if gnutls is not used [no] if gnutls is not used [no]
--disable-sndio disable sndio support [autodetect]
--disable-schannel disable SChannel SSP, needed for TLS support on --disable-schannel disable SChannel SSP, needed for TLS support on
Windows if openssl and gnutls are not used [autodetect] Windows if openssl and gnutls are not used [autodetect]
--disable-sdl2 disable sdl2 [autodetect] --disable-sdl2 disable sdl2 [autodetect]
@ -1495,6 +1496,7 @@ EXTERNAL_AUTODETECT_LIBRARY_LIST="
schannel schannel
sdl2 sdl2
securetransport securetransport
sndio
xlib xlib
zlib zlib
" "
@ -2073,7 +2075,6 @@ HAVE_LIST="
perl perl
pod2man pod2man
section_data_rel_ro section_data_rel_ro
sndio
texi2html texi2html
threads threads
uwp uwp
@ -6119,7 +6120,7 @@ enabled alsa && check_lib alsa alsa/asoundlib.h snd_pcm_htimestamp -lasound
enabled jack && check_lib jack jack/jack.h jack_client_open -ljack && enabled jack && check_lib jack jack/jack.h jack_client_open -ljack &&
check_func jack_port_get_latency_range -ljack check_func jack_port_get_latency_range -ljack
enabled_any sndio_indev sndio_outdev && check_lib sndio sndio.h sio_open -lsndio enabled sndio && check_lib sndio sndio.h sio_open -lsndio
if enabled libcdio; then if enabled libcdio; then
check_lib libcdio "cdio/cdda.h cdio/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio || check_lib libcdio "cdio/cdda.h cdio/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio ||

@ -71,6 +71,6 @@ SKIPHEADERS-$(CONFIG_LIBPULSE) += pulse_audio_common.h
SKIPHEADERS-$(CONFIG_V4L2_INDEV) += v4l2-common.h SKIPHEADERS-$(CONFIG_V4L2_INDEV) += v4l2-common.h
SKIPHEADERS-$(CONFIG_V4L2_OUTDEV) += v4l2-common.h SKIPHEADERS-$(CONFIG_V4L2_OUTDEV) += v4l2-common.h
SKIPHEADERS-$(CONFIG_ALSA) += alsa.h SKIPHEADERS-$(CONFIG_ALSA) += alsa.h
SKIPHEADERS-$(HAVE_SNDIO) += sndio.h SKIPHEADERS-$(CONFIG_SNDIO) += sndio.h
TESTPROGS-$(CONFIG_JACK_INDEV) += timefilter TESTPROGS-$(CONFIG_JACK_INDEV) += timefilter

Loading…
Cancel
Save