mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-10-29 05:40:23 -04:00
Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work
Conflicts: src/Makefile.am
This commit is contained in:
commit
2f3fc2f1d6
100 changed files with 4986 additions and 2224 deletions
|
|
@ -940,12 +940,6 @@ AC_SUBST(AVAHI_LIBS)
|
|||
AC_SUBST(HAVE_AVAHI)
|
||||
AM_CONDITIONAL([HAVE_AVAHI], [test "x$HAVE_AVAHI" = x1])
|
||||
|
||||
### LIBOIL ####
|
||||
|
||||
PKG_CHECK_MODULES(LIBOIL, [ liboil-0.3 >= 0.3.0 ])
|
||||
AC_SUBST(LIBOIL_CFLAGS)
|
||||
AC_SUBST(LIBOIL_LIBS)
|
||||
|
||||
### JACK (optional) ####
|
||||
|
||||
AC_ARG_ENABLE([jack],
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue