diff options
| author | Daniel Mack <daniel@caiaq.de> | 2009-10-31 02:16:14 +0100 |
|---|---|---|
| committer | Daniel Mack <daniel@caiaq.de> | 2009-10-31 02:16:14 +0100 |
| commit | c4e276edbd84cbb8c5b594c9f427b0a25a7fb2ab (patch) | |
| tree | 55c0d0f8e378e5e6fe203b250a816ea4d2d75ccb /configure.ac | |
| parent | 9c61465c796f3369c7cc57c094489fb383216a1b (diff) | |
| parent | 2dc37e1214f20aab528ae680e9a85fc8ea143313 (diff) | |
Merge branch 'master' of git://0pointer.de/pulseaudio
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index b34821ad..2bc068e6 100644 --- a/configure.ac +++ b/configure.ac @@ -40,7 +40,7 @@ AC_SUBST(PA_MAJORMINORMICRO, pa_major.pa_minor.pa_micro) AC_SUBST(PACKAGE_URL, [http://pulseaudio.org/]) AC_SUBST(PA_API_VERSION, 12) -AC_SUBST(PA_PROTOCOL_VERSION, 16) +AC_SUBST(PA_PROTOCOL_VERSION, 17) # The stable ABI for client applications, for the version info x:y:z # always will hold y=z @@ -445,7 +445,7 @@ AC_CHECK_FUNCS_ONCE([lstat]) # Non-standard -AC_CHECK_FUNCS_ONCE([setresuid setresgid setreuid setregid seteuid setegid ppoll strsignal sig2str strtof_l]) +AC_CHECK_FUNCS_ONCE([setresuid setresgid setreuid setregid seteuid setegid ppoll strsignal sig2str strtof_l pipe2 accept4]) AC_FUNC_ALLOCA @@ -742,6 +742,28 @@ AC_SUBST(HAVE_OSS) AM_CONDITIONAL([HAVE_OSS_OUTPUT], [test "x$HAVE_OSS" = x1 && test "x${oss_output}" != "xno"]) AM_CONDITIONAL([HAVE_OSS_WRAPPER], [test "x$HAVE_OSS" = x1 && test "x${oss_wrapper}" != "xno"]) +#### CoreAudio support (optional) #### + +AC_ARG_ENABLE([coreaudio-output], + AS_HELP_STRING([--disable-coreaudio-output],[Disable optional CoreAudio output support]), + [ + case "${enableval}" in + yes) coreaudio_enabled=yes ;; + no) coreaudio_enabled=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --disable-coreaudio-output) ;; + esac + ], + [coreaudio_enabled=auto]) + +if test "x${coreaudio_enabled}" != xno ; then + AC_CHECK_HEADERS([CoreAudio/CoreAudio.h], HAVE_COREAUDIO=1) +else + HAVE_COREAUDIO=0 +fi + +AC_SUBST(HAVE_COREAUDIO) +AM_CONDITIONAL([HAVE_COREAUDIO], [test "x$HAVE_COREAUDIO" = x1 && test "x${coreaudio_enabled}" != "xno"]) + #### ALSA support (optional) #### AC_ARG_ENABLE([alsa], @@ -1423,6 +1445,11 @@ if test "x$HAVE_OSS" = "x1" ; then fi fi +ENABLE_COREAUDIO=no +if test "x$HAVE_COREAUDIO" = "x1" ; then + ENABLE_COREAUDIO=yes +fi + ENABLE_ALSA=no if test "x$HAVE_ALSA" = "x1" ; then ENABLE_ALSA=yes @@ -1548,6 +1575,7 @@ echo " Have X11: ${ENABLE_X11} Enable OSS Output: ${ENABLE_OSS_OUTPUT} Enable OSS Wrapper: ${ENABLE_OSS_WRAPPER} + Enable CoreAudio: ${ENABLE_COREAUDIO} Enable Alsa: ${ENABLE_ALSA} Enable Solaris: ${ENABLE_SOLARIS} Enable GLib 2.0: ${ENABLE_GLIB20} |