diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-04-06 00:28:05 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-04-06 00:28:05 +0100 |
| commit | 317aec21b9ccbbc288eb428e1d74a51723a2b953 (patch) | |
| tree | d984ce931c951d89d9ed4b2cd3ef0dc03cd1a786 /m4 | |
| parent | 699f3239e00a5ff922cf52a22389be0d2fb86bd7 (diff) | |
| parent | a6bc7ed17d202107208bbe637ca92d5886c3d686 (diff) | |
| download | xine-lib-317aec21b9ccbbc288eb428e1d74a51723a2b953.tar.gz xine-lib-317aec21b9ccbbc288eb428e1d74a51723a2b953.tar.bz2 | |
Merge from 1.1.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/audio_out.m4 | 17 | ||||
| -rw-r--r-- | m4/summary.m4 | 1 |
2 files changed, 18 insertions, 0 deletions
diff --git a/m4/audio_out.m4 b/m4/audio_out.m4 index d43aa38e1..4edb4b691 100644 --- a/m4/audio_out.m4 +++ b/m4/audio_out.m4 @@ -227,4 +227,21 @@ AC_DEFUN([XINE_AUDIO_OUT_PLUGINS], [ fi fi AM_CONDITIONAL([ENABLE_SUNAUDIO], [test x"$have_sunaudio" = x"yes"]) + + + dnl sndio support + AC_ARG_ENABLE([sndio], + [AS_HELP_STRING([--without-sndio], [Build without sndio support])], + [test x"$enableval" != x"no" && enable_sndio="yes"], + [test $default_enable_sndio = disable && enable_sndio="no"]) + if test "x$enable_sndio" != "xno"; then + AC_CHECK_LIB([sndio], [sio_open], [SNDIO_LIBS=-lsndio; have_sndio=yes], + [have_sndio=no]) + if test "x$enable_sndio" = "xyes" && test "x$have_sndio" = "xno"; then + AC_MSG_ERROR([sndio support requested, but sndio not found]) + fi + fi + AM_CONDITIONAL([ENABLE_SNDIO], [test "x$have_sndio" = "xyes"]) + AC_SUBST([SNDIO_CFLAGS]) + AC_SUBST([SNDIO_LIBS]) ])dnl XINE_AUDIO_OUT_PLUGINS diff --git a/m4/summary.m4 b/m4/summary.m4 index 94374017a..27ca0f645 100644 --- a/m4/summary.m4 +++ b/m4/summary.m4 @@ -274,6 +274,7 @@ AC_DEFUN([XINE_LIB_SUMMARY], [ test x"$have_oss" = x"yes" && echo " - oss (Open Sound System)" test x"$have_pulseaudio" = x"yes" && echo " - pulseaudio (PulseAudio sound server)" test x"$have_sunaudio" = x"yes" && echo " - sun (Sun audio interface)" + test "x$have_sndio" = "xyes" && echo " - sndio" echo "---" |