[pulseaudio-commits] 6 commits - configure.ac man/default.pa.5.xml.in man/Makefile.am man/pax11publish.1.xml.in man/pulseaudio.1.xml.in man/pulse-client.conf.5.xml.in man/pulse-daemon.conf.5.xml.in src/daemon src/Makefile.am
Colin Guthrie
colin at kemper.freedesktop.org
Thu Jun 30 04:14:32 PDT 2011
configure.ac | 185 ++++++++++++++++++++++++-----------------
man/Makefile.am | 11 --
man/default.pa.5.xml.in | 4
man/pax11publish.1.xml.in | 2
man/pulse-client.conf.5.xml.in | 4
man/pulse-daemon.conf.5.xml.in | 8 -
man/pulseaudio.1.xml.in | 6 -
src/Makefile.am | 63 +------------
src/daemon/daemon.conf.in | 7 +
src/daemon/default.pa.in | 48 +++++++++-
src/daemon/default.pa.win32 | 43 ---------
11 files changed, 178 insertions(+), 203 deletions(-)
New commits:
commit 6addadc57494f30efd608ef6bb7980033bd0f0db
Author: Colin Guthrie <colin at mageia.org>
Date: Thu Jun 30 11:58:30 2011 +0100
build-sys: equalizer-sink needs DBus aswell as FFTW
diff --git a/src/Makefile.am b/src/Makefile.am
index 0a249f0..9117004 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1199,11 +1199,13 @@ modlibexec_LTLIBRARIES += \
endif
endif
+if HAVE_DBUS
if HAVE_FFTW
modlibexec_LTLIBRARIES += \
module-equalizer-sink.la
bin_SCRIPTS += utils/qpaeq
endif
+endif
# These are generated by an M4 script
SYMDEF_FILES = \
@@ -1461,15 +1463,10 @@ module_ladspa_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
module_ladspa_sink_la_LIBADD = $(MODULE_LIBADD) $(LIBLTDL)
module_equalizer_sink_la_SOURCES = modules/module-equalizer-sink.c
-module_equalizer_sink_la_CFLAGS = $(AM_CFLAGS) $(FFTW_CFLAGS)
+module_equalizer_sink_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) $(FFTW_CFLAGS)
module_equalizer_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
module_equalizer_sink_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) $(FFTW_LIBS)
-if HAVE_DBUS
-module_equalizer_sink_la_CFLAGS += $(DBUS_CFLAGS)
-module_equalizer_sink_la_LIBADD += $(DBUS_LIBS)
-endif
-
module_match_la_SOURCES = modules/module-match.c
module_match_la_LDFLAGS = $(MODULE_LDFLAGS)
module_match_la_LIBADD = $(MODULE_LIBADD)
commit be95938674d1c1f89c1f0ec5a9075e22b2b0db51
Author: Maarten Bosmans <mkbosmans at gmail.com>
Date: Wed Jun 29 15:16:12 2011 +0200
build-sys: Fix handling of Bluez, Hal dependency on D-Bus
diff --git a/configure.ac b/configure.ac
index 2a4e656..66dc9ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -902,7 +902,37 @@ AC_SUBST(LIRC_CFLAGS)
AC_SUBST(LIRC_LIBS)
AM_CONDITIONAL([HAVE_LIRC], [test "x$HAVE_LIRC" = x1])
-#### HAL support (optional) ####
+#### D-Bus support (optional) ####
+
+AC_ARG_ENABLE([dbus],
+ AS_HELP_STRING([--disable-dbus],[Disable optional D-Bus support]))
+
+AS_IF([test "x$enable_dbus" != "xno"],
+ [PKG_CHECK_MODULES(DBUS, [ dbus-1 >= 1.0.0 ], HAVE_DBUS=1, HAVE_DBUS=0)],
+ HAVE_DBUS=0)
+
+AS_IF([test "x$enable_dbus" = "xyes" && test "x$HAVE_DBUS" = "x0"],
+ [AC_MSG_ERROR([*** D-Bus support not found])])
+
+AS_IF([test "x$HAVE_DBUS" = "x1"],
+ [
+ save_CFLAGS="$CFLAGS"; CFLAGS="$CFLAGS $DBUS_CFLAGS"
+ save_LIBS="$LIBS"; LIBS="$LIBS $DBUS_LIBS"
+ AC_CHECK_FUNCS(dbus_watch_get_unix_fd)
+ CFLAGS="$save_CFLAGS"
+ LIBS="$save_LIBS"
+ ])
+
+AC_SUBST(DBUS_CFLAGS)
+AC_SUBST(DBUS_LIBS)
+AC_SUBST(HAVE_DBUS)
+AM_CONDITIONAL([HAVE_DBUS], [test "x$HAVE_DBUS" = x1])
+AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DEFINE([HAVE_DBUS], 1, [Have D-Bus.]))
+
+PA_MACHINE_ID="${localstatedir}/lib/dbus/machine-id"
+AX_DEFINE_DIR(PA_MACHINE_ID, PA_MACHINE_ID, [D-Bus machine-id file])
+
+#### HAL support (optional), dependant on D-Bus ####
AC_ARG_ENABLE([hal],
AS_HELP_STRING([--disable-hal],[Disable optional HAL support]))
@@ -910,9 +940,10 @@ AC_ARG_ENABLE([hal],
AS_IF([test "x$enable_hal" != "xno" -a \( "x$HAVE_OSS" = "x1" -o "x$HAVE_ALSA" = "x1" \)],
[PKG_CHECK_MODULES(HAL, [ hal >= 0.5.11 ], HAVE_HAL=1, HAVE_HAL=0)],
HAVE_HAL=0)
+AS_IF([test "x$HAVE_DBUS" != "x1"], HAVE_HAL=0)
AS_IF([test "x$enable_hal" = "xyes" && test "x$HAVE_HAL" = "x0"],
- [AC_MSG_ERROR([*** HAL support not found])])
+ [AC_MSG_ERROR([*** HAL support not found (requires D-Bus)])])
AC_SUBST(HAL_CFLAGS)
AC_SUBST(HAL_LIBS)
@@ -920,25 +951,7 @@ AC_SUBST(HAVE_HAL)
AM_CONDITIONAL([HAVE_HAL], [test "x$HAVE_HAL" = x1])
AS_IF([test "x$HAVE_HAL" = "x1"], AC_DEFINE([HAVE_HAL], 1, [Have HAL.]))
-#### UDEV support (optional) ####
-
-AC_ARG_ENABLE([udev],
- AS_HELP_STRING([--disable-udev],[Disable optional UDEV support]))
-
-AS_IF([test "x$enable_udev" != "xno" -a \( "x$HAVE_OSS" = "x1" -o "x$HAVE_ALSA" = "x1" \)],
- [PKG_CHECK_MODULES(UDEV, [ libudev >= 143 ], HAVE_UDEV=1, HAVE_UDEV=0)],
- HAVE_UDEV=0)
-
-AS_IF([test "x$enable_udev" = "xyes" && test "x$HAVE_UDEV" = "x0"],
- [AC_MSG_ERROR([*** UDEV support not found])])
-
-AC_SUBST(UDEV_CFLAGS)
-AC_SUBST(UDEV_LIBS)
-AC_SUBST(HAVE_UDEV)
-AM_CONDITIONAL([HAVE_UDEV], [test "x$HAVE_UDEV" = x1])
-AS_IF([test "x$HAVE_UDEV" = "x1"], AC_DEFINE([HAVE_UDEV], 1, [Have UDEV.]))
-
-#### BlueZ support (optional) ####
+#### BlueZ support (optional, dependant on D-Bus) ####
AC_ARG_ENABLE([bluez],
AS_HELP_STRING([--disable-bluez],[Disable optional BlueZ support]))
@@ -946,83 +959,57 @@ AC_ARG_ENABLE([bluez],
AS_IF([test "x$enable_bluez" != "xno"],
[PKG_CHECK_MODULES(BLUEZ, [ bluez >= 3.0 ], HAVE_BLUEZ=1, HAVE_BLUEZ=0)],
HAVE_BLUEZ=0)
+AS_IF([test "x$HAVE_DBUS" != "x1"], HAVE_BLUEZ=0)
AS_IF([test "x$enable_bluez" = "xyes" && test "x$HAVE_BLUEZ" = "x0"],
- [AC_MSG_ERROR([*** BLUEZ support not found])])
+ [AC_MSG_ERROR([*** BLUEZ support not found (requires D-Bus)])])
AC_SUBST(BLUEZ_CFLAGS)
AC_SUBST(BLUEZ_LIBS)
AC_SUBST(HAVE_BLUEZ)
AM_CONDITIONAL([HAVE_BLUEZ], [test "x$HAVE_BLUEZ" = x1])
-#### D-Bus support (optional) ####
-
-AC_ARG_ENABLE([dbus],
- AS_HELP_STRING([--disable-dbus],[Disable optional D-Bus support]))
-
-AS_IF([test "x$enable_dbus" != "xno"],
- [PKG_CHECK_MODULES(DBUS, [ dbus-1 >= 1.0.0 ], HAVE_DBUS=1, HAVE_DBUS=0)],
- HAVE_DBUS=0)
-
-AS_IF([test "x$enable_dbus" = "xyes" && test "x$HAVE_DBUS" = "x0"],
- [AC_MSG_ERROR([*** D-Bus support not found])])
-
-AS_IF([test "x$HAVE_DBUS" = "x1"],
- [
- save_CFLAGS="$CFLAGS"; CFLAGS="$CFLAGS $DBUS_CFLAGS"
- save_LIBS="$LIBS"; LIBS="$LIBS $DBUS_LIBS"
- AC_CHECK_FUNCS(dbus_watch_get_unix_fd)
- CFLAGS="$save_CFLAGS"
- LIBS="$save_LIBS"
- ])
+#### UDEV support (optional) ####
-AC_SUBST(DBUS_CFLAGS)
-AC_SUBST(DBUS_LIBS)
-AC_SUBST(HAVE_DBUS)
-AM_CONDITIONAL([HAVE_DBUS], [test "x$HAVE_DBUS" = x1])
-AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DEFINE([HAVE_DBUS], 1, [Have D-Bus.]))
+AC_ARG_ENABLE([udev],
+ AS_HELP_STRING([--disable-udev],[Disable optional UDEV support]))
-PA_MACHINE_ID="${localstatedir}/lib/dbus/machine-id"
-AX_DEFINE_DIR(PA_MACHINE_ID, PA_MACHINE_ID, [D-Bus machine-id file])
+AS_IF([test "x$enable_udev" != "xno" -a \( "x$HAVE_OSS" = "x1" -o "x$HAVE_ALSA" = "x1" \)],
+ [PKG_CHECK_MODULES(UDEV, [ libudev >= 143 ], HAVE_UDEV=1, HAVE_UDEV=0)],
+ HAVE_UDEV=0)
-# HAL and BlueZ depend on D-Bus: So double check if they were explicitly enabled.
-if test "x$HAVE_DBUS" != "x1" ; then
- HAVE_HAL=0
- if test "x$enable_hal" = "xyes"; then
- AC_MSG_ERROR([*** D-Bus support is required by HAL])
- fi
+AS_IF([test "x$enable_udev" = "xyes" && test "x$HAVE_UDEV" = "x0"],
+ [AC_MSG_ERROR([*** UDEV support not found])])
- HAVE_BLUEZ=0
- if test "x$enable_bluez" = "xyes"; then
- AC_MSG_ERROR([*** D-Bus support is required by BLUEZ])
- fi
-fi
+AC_SUBST(UDEV_CFLAGS)
+AC_SUBST(UDEV_LIBS)
+AC_SUBST(HAVE_UDEV)
+AM_CONDITIONAL([HAVE_UDEV], [test "x$HAVE_UDEV" = x1])
+AS_IF([test "x$HAVE_UDEV" = "x1"], AC_DEFINE([HAVE_UDEV], 1, [Have UDEV.]))
-#### HAL compat support (optional) ####
+#### HAL compat support (optional, dependant on UDEV) ####
AC_ARG_ENABLE([hal-compat],
AS_HELP_STRING([--disable-hal-compat],[Disable optional HAL->udev transition compatibility support]))
-if test "x$enable_hal_compat" != "xno" -a "x$HAVE_HAL" = "x0" -a "x$HAVE_UDEV" = "x1"; then
- HAVE_HAL_COMPAT=1
- AC_DEFINE([HAVE_HAL_COMPAT], 1, [Have HAL compatibility.])
-else
- HAVE_HAL_COMPAT=0
-fi
+AS_IF([test "x$enable_hal_compat" != "xno"],
+ [AS_IF([test "x$HAVE_HAL" = "x0" -a "x$HAVE_UDEV" = "x1"], HAVE_HAL_COMPAT=1, HAVE_HAL_COMPAT=0)],
+ HAVE_HAL_COMPAT=0)
+
+AS_IF([test "x$enable_hal_compat" = "xyes" && test "x$HAVE_HAL_COMPAT" = "x0"],
+ [AC_MSG_ERROR([*** HAL-compat support requires UDEV and no HAL])])
AM_CONDITIONAL([HAVE_HAL_COMPAT], [test "x$HAVE_HAL_COMPAT" = x1])
+AS_IF([test "x$HAVE_HAL_COMPAT" = "x1"], AC_DEFINE([HAVE_HAL_COMPAT], 1, [Have HAL compatibility.]))
#### IPv6 connection support (optional) ####
AC_ARG_ENABLE([ipv6],
AS_HELP_STRING([--disable-ipv6],[Disable optional IPv6 support]))
-if test "x$enable_ipv6" != "xno"; then
- AC_DEFINE([HAVE_IPV6], [1], [Define this to enable IPv6 connection support])
- HAVE_IPV6=1
-else
- HAVE_IPV6=0
-fi
+AS_IF([test "x$enable_ipv6" != "xno"], [HAVE_IPV6=1], [HAVE_IPV6=0])
+
+AS_IF([test "x$HAVE_IPV6" = "x1"], AC_DEFINE([HAVE_IPV6], 1, [Define this to enable IPv6 connection support]))
#### OpenSSL support (optional) ####
@@ -1050,6 +1037,9 @@ AS_IF([test "x$with_fftw" != "xno"],
[PKG_CHECK_MODULES(FFTW, [ fftw3f ], HAVE_FFTW=1, HAVE_FFTW=0)],
HAVE_FFTW=0)
+AS_IF([test "x$with_fftw" = "xyes" && test "x$HAVE_FFTW" = "x0"],
+ [AC_MSG_ERROR([*** FFTW support not found])])
+
AM_CONDITIONAL([HAVE_FFTW], [test "x$HAVE_FFTW" = "x1"])
#### ORC (optional) ####
commit ea45ea7cc91ddcf307b08702a6130616ffef3279
Author: Maarten Bosmans <mkbosmans at gmail.com>
Date: Wed Jun 29 15:16:11 2011 +0200
build-sys: Add more build-time conditionals to config files
diff --git a/configure.ac b/configure.ac
index 8b4dbef..2a4e656 100644
--- a/configure.ac
+++ b/configure.ac
@@ -344,7 +344,7 @@ AC_HEADER_STDC
# POSIX
AC_CHECK_HEADERS_ONCE([arpa/inet.h glob.h grp.h netdb.h netinet/in.h \
netinet/in_systm.h netinet/tcp.h poll.h pwd.h sched.h \
- sys/mman.h sys/resource.h sys/select.h sys/socket.h sys/wait.h \
+ sys/mman.h sys/select.h sys/socket.h sys/wait.h \
sys/uio.h syslog.h sys/dl.h dlfcn.h linux/sockios.h])
AC_CHECK_HEADERS([netinet/ip.h], [], [],
[#include <sys/types.h>
@@ -355,8 +355,11 @@ AC_CHECK_HEADERS([netinet/ip.h], [], [],
# include <netinet/in_systm.h>
#endif
])
+AC_CHECK_HEADERS([sys/resource.h], [HAVE_SYS_RESOURCE_H=1], [HAVE_SYS_RESOURCE_H=0])
+AC_SUBST(HAVE_SYS_RESOURCE_H)
AC_CHECK_HEADERS([sys/un.h], [HAVE_AF_UNIX=1], [HAVE_AF_UNIX=0])
AM_CONDITIONAL(HAVE_AF_UNIX, test "x$HAVE_AF_UNIX" = "x1")
+AC_SUBST(HAVE_AF_UNIX)
# Linux
AC_CHECK_HEADERS([linux/input.h], [HAVE_EVDEV=1], [HAVE_EVDEV=0])
@@ -487,7 +490,7 @@ AC_CHECK_FUNCS_ONCE([chmod chown fstat fchown fchmod clock_gettime getaddrinfo g
pipe posix_fadvise posix_madvise posix_memalign setpgid setsid shm_open \
sigaction sleep symlink sysconf uname pthread_setaffinity_np pthread_getname_np pthread_setname_np])
AC_CHECK_FUNCS([mkfifo], [HAVE_MKFIFO=1], [HAVE_MKFIFO=0])
-
+AC_SUBST(HAVE_MKFIFO)
AM_CONDITIONAL(HAVE_MKFIFO, test "x$HAVE_MKFIFO" = "x1")
# X/OPEN
@@ -538,6 +541,7 @@ AS_IF([test "x$enable_x11" = "xyes" && test "x$HAVE_X11" = "x0"],
AC_SUBST(X11_CFLAGS)
AC_SUBST(X11_LIBS)
+AC_SUBST(HAVE_X11)
AM_CONDITIONAL([HAVE_X11], [test "x$HAVE_X11" = x1])
AS_IF([test "x$HAVE_X11" = "x1"], AC_DEFINE([HAVE_X11], 1, [Have X11?]))
@@ -689,6 +693,7 @@ AS_IF([test "x$enable_oss_wrapper" != "xno"],
[AS_IF([test "x$HAVE_OSS" = "x1"], HAVE_OSS_WRAPPER=1, HAVE_OSS_WRAPPER=0)],
HAVE_OSS_WRAPPER=0)
+AC_SUBST(HAVE_OSS_OUTPUT)
AM_CONDITIONAL([HAVE_OSS_OUTPUT], [test "x$HAVE_OSS_OUTPUT" = "x1"])
AM_CONDITIONAL([HAVE_OSS_WRAPPER], [test "x$HAVE_OSS_WRAPPER" = "x1"])
AS_IF([test "x$HAVE_OSS_OUTPUT" = "x1"], AC_DEFINE([HAVE_OSS_OUTPUT], 1, [Have OSS output?]))
@@ -722,6 +727,7 @@ AS_IF([test "x$enable_alsa" = "xyes" && test "x$HAVE_ALSA" = "x0"],
AC_SUBST(ASOUNDLIB_CFLAGS)
AC_SUBST(ASOUNDLIB_LIBS)
+AC_SUBST(HAVE_ALSA)
AM_CONDITIONAL([HAVE_ALSA], [test "x$HAVE_ALSA" = x1])
AS_IF([test "x$HAVE_ALSA" = "x1"], AC_DEFINE([HAVE_ALSA], 1, [Have ALSA?]))
@@ -752,6 +758,7 @@ AS_IF([test "x$enable_waveout" != "xno"],
AS_IF([test "x$enable_waveout" = "xyes" && test "x$HAVE_WAVEOUT" = "x0"],
[AC_MSG_ERROR([*** WaveOut audio support not found])])
+AC_SUBST(HAVE_WAVEOUT)
AM_CONDITIONAL([HAVE_WAVEOUT], [test "x$HAVE_WAVEOUT" = x1])
AS_IF([test "x$HAVE_WAVEOUT" = "x1"], AC_DEFINE([HAVE_WAVEOUT], 1, [Have WaveOut audio?]))
@@ -819,6 +826,7 @@ AS_IF([test "x$enable_avahi" = "xyes" && test "x$HAVE_AVAHI" = "x0"],
AC_SUBST(AVAHI_CFLAGS)
AC_SUBST(AVAHI_LIBS)
+AC_SUBST(HAVE_AVAHI)
AM_CONDITIONAL([HAVE_AVAHI], [test "x$HAVE_AVAHI" = x1])
#### JACK (optional) ####
@@ -908,6 +916,7 @@ AS_IF([test "x$enable_hal" = "xyes" && test "x$HAVE_HAL" = "x0"],
AC_SUBST(HAL_CFLAGS)
AC_SUBST(HAL_LIBS)
+AC_SUBST(HAVE_HAL)
AM_CONDITIONAL([HAVE_HAL], [test "x$HAVE_HAL" = x1])
AS_IF([test "x$HAVE_HAL" = "x1"], AC_DEFINE([HAVE_HAL], 1, [Have HAL.]))
@@ -925,6 +934,7 @@ AS_IF([test "x$enable_udev" = "xyes" && test "x$HAVE_UDEV" = "x0"],
AC_SUBST(UDEV_CFLAGS)
AC_SUBST(UDEV_LIBS)
+AC_SUBST(HAVE_UDEV)
AM_CONDITIONAL([HAVE_UDEV], [test "x$HAVE_UDEV" = x1])
AS_IF([test "x$HAVE_UDEV" = "x1"], AC_DEFINE([HAVE_UDEV], 1, [Have UDEV.]))
@@ -942,6 +952,7 @@ AS_IF([test "x$enable_bluez" = "xyes" && test "x$HAVE_BLUEZ" = "x0"],
AC_SUBST(BLUEZ_CFLAGS)
AC_SUBST(BLUEZ_LIBS)
+AC_SUBST(HAVE_BLUEZ)
AM_CONDITIONAL([HAVE_BLUEZ], [test "x$HAVE_BLUEZ" = x1])
#### D-Bus support (optional) ####
@@ -967,6 +978,7 @@ AS_IF([test "x$HAVE_DBUS" = "x1"],
AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_LIBS)
+AC_SUBST(HAVE_DBUS)
AM_CONDITIONAL([HAVE_DBUS], [test "x$HAVE_DBUS" = x1])
AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DEFINE([HAVE_DBUS], 1, [Have D-Bus.]))
diff --git a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in
index 9eee664..6437f8f 100644
--- a/src/daemon/daemon.conf.in
+++ b/src/daemon/daemon.conf.in
@@ -18,6 +18,7 @@
## Configuration file for the PulseAudio daemon. See pulse-daemon.conf(5) for
## more information. Default values are commented out. Use either ; or # for
## commenting.
+changequote(`[', `]')dnl Set up m4 quoting
; daemonize = no
; fail = yes
@@ -25,7 +26,9 @@
; allow-exit = yes
; use-pid-file = yes
; system-instance = no
+ifelse(@HAVE_DBUS@, 1, [dnl
; local-server-type = user
+])dnl
; enable-shm = yes
; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB
; lock-memory = no
@@ -57,6 +60,7 @@
; flat-volumes = yes
+ifelse(@HAVE_SYS_RESOURCE_H@, 1, [dnl
; rlimit-fsize = -1
; rlimit-data = -1
; rlimit-stack = -1
@@ -72,6 +76,7 @@
; rlimit-nice = 31
; rlimit-rtprio = 9
; rlimit-rttime = 1000000
+])dnl
; default-sample-format = s16le
; default-sample-rate = 44100
diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index 3442b21..605f42c 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -44,47 +44,68 @@ load-module module-card-restore
### stored in /usr/share/application
load-module module-augment-properties
-### Load audio drivers statically (it's probably better to not load
-### these drivers manually, but instead use module-udev-detect --
-### see below -- for doing this automatically)
+### Load audio drivers statically
+### (it's probably better to not load these drivers manually, but instead
+### use module-udev-detect -- see below -- for doing this automatically)
+ifelse(@HAVE_ALSA@, 1, [dnl
#load-module module-alsa-sink
#load-module module-alsa-source device=hw:1,0
+])dnl
+ifelse(@HAVE_OSS_OUTPUT@, 1, [dnl
#load-module module-oss device="/dev/dsp" sink_name=output source_name=input
#load-module module-oss-mmap device="/dev/dsp" sink_name=output source_name=input
+])dnl
ifelse(@HAVE_WAVEOUT@, 1, [dnl
load-module module-waveout sink_name=output source_name=input
])dnl
#load-module module-null-sink
+ifelse(@HAVE_MKFIFO@, 1, [dnl
#load-module module-pipe-sink
+])dnl
### Automatically load driver modules depending on the hardware available
+ifelse(1, @HAVE_UDEV@, [dnl
.ifexists module-udev-detect at PA_SOEXT@
load-module module-udev-detect
.else
-### Alternatively use the static hardware detection module (for systems that
-### lack udev support)
+], @HAVE_HAL@, [dnl
+.ifexists module-hal-detect at PA_SOEXT@
+load-module module-hal-detect
+.else
+], [dnl
+.ifexists module-detect at PA_SOEXT@
+])dnl
+### Use the static hardware detection module (for systems that lack udev support)
load-module module-detect
.endif
+ifelse(@HAVE_BLUEZ@, 1, [dnl
### Automatically load driver modules for Bluetooth hardware
.ifexists module-bluetooth-discover at PA_SOEXT@
load-module module-bluetooth-discover
.endif
+])dnl
+ifelse(@HAVE_AF_UNIX@, 1, [dnl
### Load several protocols
.ifexists module-esound-protocol-unix at PA_SOEXT@
load-module module-esound-protocol-unix
.endif
+load-module module-native-protocol-unix
+])dnl
+ifelse(@HAVE_DBUS@, 1, [dnl
.ifexists module-dbus-protocol at PA_SOEXT@
load-module module-dbus-protocol
.endif
-load-module module-native-protocol-unix
+])dnl
### Network access (may be configured with paprefs, so leave this commented
### here if you plan to use paprefs)
#load-module module-esound-protocol-tcp
#load-module module-native-protocol-tcp
+ifelse(@HAVE_AVAHI@, 1, [dnl
#load-module module-zeroconf-publish
+])dnl
ifelse(@OS_IS_WIN32@, 0, [dnl
### Load the RTP receiver module (also configured via paprefs, see above)
@@ -130,7 +151,9 @@ load-module module-position-event-sounds
### Cork music streams when a phone stream is active
load-module module-cork-music-on-phone
+])dnl
+ifelse(@HAVE_X11@, 1, [dnl
# X11 modules should not be started from default.pa so that one daemon
# can be shared by multiple sessions.
commit 107106afd4e6f93d495f75c224cde6817319d662
Author: Maarten Bosmans <mkbosmans at gmail.com>
Date: Wed Jun 29 15:16:10 2011 +0200
build-sys: Process configuration files with m4
This allows for build-time conditionals to be processed,
eliminating the need for a separate default.pa.win32.
diff --git a/configure.ac b/configure.ac
index 06cce8f..8b4dbef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -131,6 +131,7 @@ esac
AM_CONDITIONAL(OS_IS_DARWIN, test "x$os_is_darwin" = "x1")
AM_CONDITIONAL(OS_IS_WIN32, test "x$os_is_win32" = "x1")
+AC_SUBST([OS_IS_WIN32], [$os_is_win32])
# Platform specific hacks
case "$host_os" in
@@ -1234,10 +1235,12 @@ AC_CONFIG_FILES([src/esdcompat:src/daemon/esdcompat.in], [chmod +x src/esdcompat
AC_CONFIG_FILES([src/start-pulseaudio-x11:src/daemon/start-pulseaudio-x11.in], [chmod +x src/start-pulseaudio-x11])
AC_CONFIG_FILES([src/start-pulseaudio-kde:src/daemon/start-pulseaudio-kde.in], [chmod +x src/start-pulseaudio-kde])
AC_CONFIG_FILES([src/client.conf:src/pulse/client.conf.in])
-AC_CONFIG_FILES([src/daemon.conf:src/daemon/daemon.conf.in])
-AS_IF([test "x$os_is_win32" = "x1"], [config_source_ext=win32], [config_source_ext=in])
-AC_CONFIG_FILES([src/default.pa:src/daemon/default.pa.$config_source_ext])
-AC_CONFIG_FILES([src/system.pa:src/daemon/system.pa.$config_source_ext])
+AC_CONFIG_FILES([src/daemon.conf:src/daemon/daemon.conf.in],
+ [m4 src/daemon.conf > src/daemon.conf.gen && mv src/daemon.conf.gen src/daemon.conf])
+AC_CONFIG_FILES([src/default.pa:src/daemon/default.pa.in],
+ [m4 src/default.pa > src/default.pa.gen && mv src/default.pa.gen src/default.pa])
+AC_CONFIG_FILES([src/system.pa:src/daemon/system.pa.in],
+ [m4 src/system.pa > src/system.pa.gen && mv src/system.pa.gen src/system.pa])
AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index c2b8224..0a249f0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -81,7 +81,6 @@ EXTRA_DIST = \
daemon/daemon.conf.in \
daemon/default.pa.in \
daemon/system.pa.in \
- daemon/default.pa.win32 \
depmod.py \
daemon/esdcompat.in \
daemon/start-pulseaudio-x11.in \
diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index 32ba582..3442b21 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -18,14 +18,20 @@
# This startup script is used only if PulseAudio is started per-user
# (i.e. not in system mode)
+changequote(`[', `]')dnl Set up m4 quoting
.nofail
### Load something into the sample cache
+ifelse(@OS_IS_WIN32@, 1, [dnl
+load-sample x11-bell %WINDIR%\Media\ding.wav
+load-sample-dir-lazy %WINDIR%\Media\*.wav
+], [dnl
#load-sample-lazy x11-bell /usr/share/sounds/gtk-events/activate.wav
#load-sample-lazy pulse-hotplug /usr/share/sounds/startup3.wav
#load-sample-lazy pulse-coldplug /usr/share/sounds/startup3.wav
#load-sample-lazy pulse-access /usr/share/sounds/generic.wav
+])dnl
.fail
@@ -45,6 +51,9 @@ load-module module-augment-properties
#load-module module-alsa-source device=hw:1,0
#load-module module-oss device="/dev/dsp" sink_name=output source_name=input
#load-module module-oss-mmap device="/dev/dsp" sink_name=output source_name=input
+ifelse(@HAVE_WAVEOUT@, 1, [dnl
+load-module module-waveout sink_name=output source_name=input
+])dnl
#load-module module-null-sink
#load-module module-pipe-sink
@@ -77,7 +86,8 @@ load-module module-native-protocol-unix
#load-module module-native-protocol-tcp
#load-module module-zeroconf-publish
-### Load the RTP reciever module (also configured via paprefs, see above)
+ifelse(@OS_IS_WIN32@, 0, [dnl
+### Load the RTP receiver module (also configured via paprefs, see above)
#load-module module-rtp-recv
### Load the RTP sender module (also configured via paprefs, see above)
@@ -136,6 +146,7 @@ load-module module-cork-music-on-phone
#load-module module-x11-publish
#.fail
#.endif
+])dnl
### Make some devices default
#set-default-sink output
diff --git a/src/daemon/default.pa.win32 b/src/daemon/default.pa.win32
deleted file mode 100644
index d5a1e18..0000000
--- a/src/daemon/default.pa.win32
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-
-# Load audio drivers statically
-
-load-module module-waveout sink_name=output source_name=input
-load-module module-null-sink
-
-# Load audio drivers automatically on access
-
-#add-autoload-sink output module-waveout sink_name=output source_name=input
-#add-autoload-source input module-waveout sink_name=output source_name=input
-
-# Load several protocols
-#load-module module-esound-protocol-tcp
-#load-module module-native-protocol-tcp
-#load-module module-simple-protocol-tcp
-#load-module module-cli-protocol-tcp
-
-# Make some devices default
-set-default-sink output
-set-default-source input
-
-.nofail
-
-# Load something to the sample cache
-load-sample x11-bell %WINDIR%\Media\ding.wav
-load-sample-dir-lazy %WINDIR%\Media\*.wav
commit 3722dbbcb3bbe889ca9e5ae061aa01f2e9cb29a0
Author: Maarten Bosmans <mkbosmans at gmail.com>
Date: Wed Jun 29 15:16:09 2011 +0200
build-sys: Use configure AC_OUTPUT to process config files
Don't use sed to replace @variable@ in file.in.
diff --git a/configure.ac b/configure.ac
index ab88bb7..06cce8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1216,8 +1216,29 @@ doxygen/Makefile
doxygen/doxygen.conf
src/pulse/version.h
po/Makefile.in
+man/pulseaudio.1.xml
+man/esdcompat.1.xml
+man/pax11publish.1.xml
+man/paplay.1.xml
+man/pacat.1.xml
+man/pacmd.1.xml
+man/pactl.1.xml
+man/pasuspender.1.xml
+man/padsp.1.xml
+man/pulse-daemon.conf.5.xml
+man/pulse-client.conf.5.xml
+man/default.pa.5.xml
])
+AC_CONFIG_FILES([src/esdcompat:src/daemon/esdcompat.in], [chmod +x src/esdcompat])
+AC_CONFIG_FILES([src/start-pulseaudio-x11:src/daemon/start-pulseaudio-x11.in], [chmod +x src/start-pulseaudio-x11])
+AC_CONFIG_FILES([src/start-pulseaudio-kde:src/daemon/start-pulseaudio-kde.in], [chmod +x src/start-pulseaudio-kde])
+AC_CONFIG_FILES([src/client.conf:src/pulse/client.conf.in])
+AC_CONFIG_FILES([src/daemon.conf:src/daemon/daemon.conf.in])
+AS_IF([test "x$os_is_win32" = "x1"], [config_source_ext=win32], [config_source_ext=in])
+AC_CONFIG_FILES([src/default.pa:src/daemon/default.pa.$config_source_ext])
+AC_CONFIG_FILES([src/system.pa:src/daemon/system.pa.$config_source_ext])
+
AC_OUTPUT
# ==========================================================================
diff --git a/man/Makefile.am b/man/Makefile.am
index dd228f7..4f42fe2 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -15,7 +15,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA.
-CLEANFILES = \
+DISTCLEANFILES = \
$(noinst_DATA)
noinst_DATA = \
@@ -32,11 +32,6 @@ noinst_DATA = \
pulse-client.conf.5.xml \
default.pa.5.xml
-%.xml: %.xml.in Makefile
- $(AM_V_GEN) sed -e 's, at PA_DEFAULT_CONFIG_DIR\@,$(PA_DEFAULT_CONFIG_DIR),g' \
- -e 's, at PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \
- -e 's, at PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@
-
xmllint: $(noinst_DATA)
for f in $(noinst_DATA) ; do \
xmllint --noout --valid "$$f" || exit 1 ; \
@@ -58,7 +53,7 @@ dist_man_MANS = \
pulse-client.conf.5 \
default.pa.5
-CLEANFILES += \
+CLEANFILES = \
$(dist_man_MANS)
%: %.xml Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 98a7385..c2b8224 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1875,46 +1875,8 @@ module_rygel_media_server_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
# Some minor stuff #
###################################
-CLEANFILES += esdcompat client.conf default.pa system.pa daemon.conf start-pulseaudio-x11 start-pulseaudio-kde daemon/pulseaudio.desktop daemon/pulseaudio-kde.desktop
-
-esdcompat: daemon/esdcompat.in Makefile
- $(AM_V_GEN) sed -e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
- -e 's, at PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
- -e 's, at PA_BINARY\@,$(PA_BINARY),g' < $< > $@
- $(AM_V_at) chmod +x esdcompat
-
-start-pulseaudio-x11: daemon/start-pulseaudio-x11.in Makefile
- $(AM_V_GEN) sed -e 's, at PA_BINARY\@,$(PA_BINARY),g' \
- -e 's, at PACTL_BINARY\@,$(PACTL_BINARY),g' < $< > $@
- $(AM_V_at) chmod +x start-pulseaudio-x11
-
-start-pulseaudio-kde: daemon/start-pulseaudio-kde.in Makefile
- $(AM_V_GEN) sed -e 's, at PA_BINARY\@,$(PA_BINARY),g' \
- -e 's, at PACTL_BINARY\@,$(PACTL_BINARY),g' < $< > $@
- $(AM_V_at) chmod +x start-pulseaudio-kde
-
-client.conf: pulse/client.conf.in Makefile
- $(AM_V_GEN) sed -e 's, at PA_BINARY\@,$(PA_BINARY),g' < $< > $@
-
-if OS_IS_WIN32
-default.pa: daemon/default.pa.win32
- cp $< $@
-system.pa: daemon/default.pa.win32
- cp $< $@
-else
-default.pa: daemon/default.pa.in Makefile
- $(AM_V_GEN) sed -e 's, at PA_BINARY\@,$(PA_BINARY),g' \
- -e 's, at PA_DLSEARCHPATH\@,$(modlibexecdir),g' \
- -e 's, at PA_SOEXT\@,$(PA_SOEXT),g' < $< > $@
-system.pa: daemon/system.pa.in Makefile
- $(AM_V_GEN) sed -e 's, at PA_BINARY\@,$(PA_BINARY),g' \
- -e 's, at PA_DLSEARCHPATH\@,$(modlibexecdir),g' \
- -e 's, at PA_SOEXT\@,$(PA_SOEXT),g' < $< > $@
-endif
-
-daemon.conf: daemon/daemon.conf.in Makefile
- $(AM_V_GEN) sed -e 's, at PA_DLSEARCHPATH\@,$(modlibexecdir),g' \
- -e 's, at PA_DEFAULT_CONFIG_DIR\@,$(PA_DEFAULT_CONFIG_DIR),g' < $< > $@
+CLEANFILES += daemon/pulseaudio.desktop daemon/pulseaudio-kde.desktop
+DISTCLEANFILES = esdcompat client.conf default.pa system.pa daemon.conf start-pulseaudio-x11 start-pulseaudio-kde
if OS_IS_WIN32
SYMLINK_PROGRAM=cd $(DESTDIR)$(bindir) && cp
commit e42bc02dc6a521e663f1f0511958ee841618bcc7
Author: Maarten Bosmans <mkbosmans at gmail.com>
Date: Wed Jun 29 15:16:08 2011 +0200
build-sys: Move some more defines to configure.ac
diff --git a/configure.ac b/configure.ac
index 7f7970b..ab88bb7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1098,6 +1098,19 @@ AX_DEFINE_DIR(PA_SYSTEM_CONFIG_PATH, PA_SYSTEM_CONFIG_PATH, [System config dir])
PA_SYSTEM_STATE_PATH="${localstatedir}/lib/pulse"
AX_DEFINE_DIR(PA_SYSTEM_STATE_PATH, PA_SYSTEM_STATE_PATH, [System state dir])
+PA_BINARY=${bindir}/pulseaudio${EXEEXT}
+AX_DEFINE_DIR(PA_BINARY, PA_BINARY, [Location of pulseaudio binary])
+
+PACTL_BINARY=${bindir}/pactl${EXEEXT}
+AX_DEFINE_DIR(PACTL_BINARY, PACTL_BINARY, [Location of pactl binary])
+
+AC_SUBST(PA_SOEXT, [.so])
+
+AC_SUBST(pulseconfdir, ["${sysconfdir}/pulse"])
+AX_DEFINE_DIR(PA_DEFAULT_CONFIG_DIR, pulseconfdir, [Location of configuration files])
+
+AC_DEFINE_UNQUOTED(PA_BUILDDIR, "${ac_pwd}/src", [Location of uninstalled binaries])
+
#### Mac OSX specific stuff #####
AC_ARG_ENABLE(mac-universal,
diff --git a/man/Makefile.am b/man/Makefile.am
index 8457e03..dd228f7 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -15,8 +15,6 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA.
-pulseconfdir=$(sysconfdir)/pulse
-
CLEANFILES = \
$(noinst_DATA)
@@ -35,7 +33,7 @@ noinst_DATA = \
default.pa.5.xml
%.xml: %.xml.in Makefile
- $(AM_V_GEN) sed -e 's, at pulseconfdir\@,$(pulseconfdir),g' \
+ $(AM_V_GEN) sed -e 's, at PA_DEFAULT_CONFIG_DIR\@,$(PA_DEFAULT_CONFIG_DIR),g' \
-e 's, at PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \
-e 's, at PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@
diff --git a/man/default.pa.5.xml.in b/man/default.pa.5.xml.in
index 4caad7c..1ec618d 100644
--- a/man/default.pa.5.xml.in
+++ b/man/default.pa.5.xml.in
@@ -26,13 +26,13 @@ USA.
<synopsis>
<p><file>~/.pulse/default.pa</file></p>
- <p><file>@pulseconfdir@/default.pa</file></p>
+ <p><file>@PA_DEFAULT_CONFIG_DIR@/default.pa</file></p>
</synopsis>
<description>
<p>The PulseAudio sound server interprets the file
<file>~/.pulse/default.pa</file> on startup, and when that file
- doesn't exist <file>@pulseconfdir@/default.pa</file>. It
+ doesn't exist <file>@PA_DEFAULT_CONFIG_DIR@/default.pa</file>. It
should contain directives in the PulseAudio CLI languages, as
documented on <url href="http://pulseaudio.org/wiki/CLI"/>.</p>
diff --git a/man/pax11publish.1.xml.in b/man/pax11publish.1.xml.in
index 3b40b97..be9ce0b 100644
--- a/man/pax11publish.1.xml.in
+++ b/man/pax11publish.1.xml.in
@@ -84,7 +84,7 @@ USA.
the data from the $PULSE_SERVER, $PULSE_SINK, $PULSE_SOURCE
environment variables and combines them with the data from
<file>~/.pulse/client.conf</file> (or
- <file>@pulseconfdir@/client.conf</file> if that file does not
+ <file>@PA_DEFAULT_CONFIG_DIR@/client.conf</file> if that file does not
exist). If specific options are passed on the command line
(<opt>-S</opt>, <opt>-O</opt>, <opt>-I</opt>, <opt>-c</opt>, see
below), they take precedence. Also uploads the local
diff --git a/man/pulse-client.conf.5.xml.in b/man/pulse-client.conf.5.xml.in
index 739fae4..dc9ae0b 100644
--- a/man/pulse-client.conf.5.xml.in
+++ b/man/pulse-client.conf.5.xml.in
@@ -26,14 +26,14 @@ USA.
<synopsis>
<p><file>~/.pulse/client.conf</file></p>
- <p><file>@pulseconfdir@/client.conf</file></p>
+ <p><file>@PA_DEFAULT_CONFIG_DIR@/client.conf</file></p>
</synopsis>
<description>
<p>The PulseAudio client library reads configuration directives from
a file <file>~/.pulse/client.conf</file> on startup and when that
file doesn't exist from
- <file>@pulseconfdir@/client.conf</file>.</p>
+ <file>@PA_DEFAULT_CONFIG_DIR@/client.conf</file>.</p>
<p>The configuration file is a simple collection of variable
declarations. If the configuration file parser encounters either ;
diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in
index ded3cb4..6fcdd0e 100644
--- a/man/pulse-daemon.conf.5.xml.in
+++ b/man/pulse-daemon.conf.5.xml.in
@@ -26,14 +26,14 @@ USA.
<synopsis>
<p><file>~/.pulse/daemon.conf</file></p>
- <p><file>@pulseconfdir@/daemon.conf</file></p>
+ <p><file>@PA_DEFAULT_CONFIG_DIR@/daemon.conf</file></p>
</synopsis>
<description>
<p>The PulseAudio sound server reads configuration directives from
a file <file>~/.pulse/daemon.conf</file> on startup and when that
file doesn't exist from
- <file>@pulseconfdir@/daemon.conf</file>. Please note that the
+ <file>@PA_DEFAULT_CONFIG_DIR@/daemon.conf</file>. Please note that the
server also reads a configuration script on startup
<file>default.pa</file> which also contains runtime configuration
directives.</p>
@@ -262,8 +262,8 @@ USA.
default script file. The default behaviour is to load
<file>~/.pulse/default.pa</file>, and if that file does not
exist fall back to the system wide installed version
- <file>@pulseconfdir@/default.pa</file>. If run in system-wide
- mode the file <file>@pulseconfdir@/system.pa</file> is used
+ <file>@PA_DEFAULT_CONFIG_DIR@/default.pa</file>. If run in system-wide
+ mode the file <file>@PA_DEFAULT_CONFIG_DIR@/system.pa</file> is used
instead. If <opt>-n</opt> is passed on the command line
or <opt>default-script-file=</opt> is disabled the default
configuration script is ignored.</p>
diff --git a/man/pulseaudio.1.xml.in b/man/pulseaudio.1.xml.in
index 8810e90..4e58ffb 100644
--- a/man/pulseaudio.1.xml.in
+++ b/man/pulseaudio.1.xml.in
@@ -314,21 +314,21 @@ USA.
<section name="Files">
<p><file>~/.pulse/daemon.conf</file>,
- <file>@pulseconfdir@/daemon.conf</file>: configuration settings
+ <file>@PA_DEFAULT_CONFIG_DIR@/daemon.conf</file>: configuration settings
for the PulseAudio daemon. If the version in the user's home
directory does not exist the global configuration file is
loaded. See <manref name="pulse-daemon.conf" section="5"/> for
more information.</p>
<p><file>~/.pulse/default.pa</file>,
- <file>@pulseconfdir@/default.pa</file>: the default configuration
+ <file>@PA_DEFAULT_CONFIG_DIR@/default.pa</file>: the default configuration
script to execute when the PulseAudio daemon is started. If the
version in the user's home directory does not exist the global
configuration script is loaded. See <manref name="default.pa"
section="5"/> for more information.</p>
<p><file>~/.pulse/client.conf</file>,
- <file>@pulseconfdir@/client.conf</file>: configuration settings
+ <file>@PA_DEFAULT_CONFIG_DIR@/client.conf</file>: configuration settings
for PulseAudio client applications. If the version in the user's
home directory does not exist the global configuration file is
loaded. See <manref name="pulse-client.conf" section="5"/> for
diff --git a/src/Makefile.am b/src/Makefile.am
index d675273..98a7385 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,7 +25,6 @@
pulseincludedir=$(includedir)/pulse
pulsecoreincludedir=$(includedir)/pulsecore
-pulseconfdir=$(sysconfdir)/pulse
pulselibexecdir=$(libexecdir)/pulse
if HAVE_X11
xdgautostartdir=$(sysconfdir)/xdg/autostart
@@ -39,13 +38,6 @@ dbuspolicydir=$(sysconfdir)/dbus-1/system.d
endif
###################################
-# Defines #
-###################################
-
-PA_BINARY=$(bindir)/pulseaudio$(EXEEXT)
-PA_DEFAULT_CONFIG_DIR=$(pulseconfdir)
-
-###################################
# Compiler/linker flags #
###################################
@@ -54,9 +46,6 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/modules \
-I$(top_builddir)/src/modules \
$(PTHREAD_CFLAGS) \
- -DPA_BUILDDIR=\"$(abs_builddir)\" \
- -DPA_DEFAULT_CONFIG_DIR=\"$(PA_DEFAULT_CONFIG_DIR)\" \
- -DPA_BINARY=\"$(PA_BINARY)\" \
-DPA_ALSA_PATHS_DIR=\"$(alsapathsdir)\" \
-DPA_ALSA_PROFILE_SETS_DIR=\"$(alsaprofilesetsdir)\"
@@ -1896,12 +1885,12 @@ esdcompat: daemon/esdcompat.in Makefile
start-pulseaudio-x11: daemon/start-pulseaudio-x11.in Makefile
$(AM_V_GEN) sed -e 's, at PA_BINARY\@,$(PA_BINARY),g' \
- -e 's, at PACTL_BINARY\@,$(bindir)/pactl,g' < $< > $@
+ -e 's, at PACTL_BINARY\@,$(PACTL_BINARY),g' < $< > $@
$(AM_V_at) chmod +x start-pulseaudio-x11
start-pulseaudio-kde: daemon/start-pulseaudio-kde.in Makefile
$(AM_V_GEN) sed -e 's, at PA_BINARY\@,$(PA_BINARY),g' \
- -e 's, at PACTL_BINARY\@,$(bindir)/pactl,g' < $< > $@
+ -e 's, at PACTL_BINARY\@,$(PACTL_BINARY),g' < $< > $@
$(AM_V_at) chmod +x start-pulseaudio-kde
client.conf: pulse/client.conf.in Makefile
@@ -1916,16 +1905,16 @@ else
default.pa: daemon/default.pa.in Makefile
$(AM_V_GEN) sed -e 's, at PA_BINARY\@,$(PA_BINARY),g' \
-e 's, at PA_DLSEARCHPATH\@,$(modlibexecdir),g' \
- -e 's, at PA_SOEXT\@,.so,g' < $< > $@
+ -e 's, at PA_SOEXT\@,$(PA_SOEXT),g' < $< > $@
system.pa: daemon/system.pa.in Makefile
$(AM_V_GEN) sed -e 's, at PA_BINARY\@,$(PA_BINARY),g' \
-e 's, at PA_DLSEARCHPATH\@,$(modlibexecdir),g' \
- -e 's, at PA_SOEXT\@,.so,g' < $< > $@
+ -e 's, at PA_SOEXT\@,$(PA_SOEXT),g' < $< > $@
endif
daemon.conf: daemon/daemon.conf.in Makefile
$(AM_V_GEN) sed -e 's, at PA_DLSEARCHPATH\@,$(modlibexecdir),g' \
- -e 's, at PA_DEFAULT_CONFIG_FILE\@,$(DEFAULT_CONFIG_DIR),g' < $< > $@
+ -e 's, at PA_DEFAULT_CONFIG_DIR\@,$(PA_DEFAULT_CONFIG_DIR),g' < $< > $@
if OS_IS_WIN32
SYMLINK_PROGRAM=cd $(DESTDIR)$(bindir) && cp
diff --git a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in
index 9beba85..9eee664 100644
--- a/src/daemon/daemon.conf.in
+++ b/src/daemon/daemon.conf.in
@@ -43,7 +43,7 @@
; dl-search-path = (depends on architecture)
; load-default-script-file = yes
-; default-script-file = @PA_DEFAULT_CONFIG_FILE@
+; default-script-file = @PA_DEFAULT_CONFIG_DIR@/default.pa
; log-target = auto
; log-level = notice
More information about the pulseaudio-commits
mailing list