[pulseaudio-discuss] [PATCH] build-sys: don't install esdcompat tool if building without esound support
Felipe Sateler
fsateler at debian.org
Tue Jan 16 00:14:45 UTC 2018
---
configure.ac | 8 ++++++--
man/Makefile.am | 9 +++++++--
src/Makefile.am | 6 +++++-
3 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index 013918f1a..2a820b91d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1503,7 +1503,6 @@ doxygen/doxygen.conf
src/pulse/version.h
po/Makefile.in
man/pulseaudio.1.xml
-man/esdcompat.1.xml
man/pax11publish.1.xml
man/pacat.1.xml
man/pacmd.1.xml
@@ -1517,7 +1516,12 @@ man/pulse-cli-syntax.5.xml
man/start-pulseaudio-x11.1.xml
])
-AC_CONFIG_FILES([src/esdcompat:src/daemon/esdcompat.in], [chmod +x src/esdcompat])
+AS_IF([test "x$HAVE_ESOUND" = "x1"],
+ [
+ AC_CONFIG_FILES([man/esdcompat.1.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/client.conf:src/pulse/client.conf.in])
AC_CONFIG_FILES([src/daemon.conf:src/daemon/daemon.conf.in],
diff --git a/man/Makefile.am b/man/Makefile.am
index d4f4edbc9..26829c632 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -18,7 +18,6 @@ DISTCLEANFILES = \
noinst_DATA = \
pulseaudio.1.xml \
- esdcompat.1.xml \
pax11publish.1.xml \
pacat.1.xml \
pacmd.1.xml \
@@ -31,6 +30,10 @@ noinst_DATA = \
pulse-cli-syntax.5.xml \
start-pulseaudio-x11.1.xml
+if HAVE_ESOUND
+noinst_DATA += esdcompat.1.xml
+endif
+
xmllint: $(noinst_DATA)
for f in $(noinst_DATA) ; do \
xmllint --noout --valid "$$f" || exit 1 ; \
@@ -40,7 +43,6 @@ if BUILD_MANPAGES
dist_man_MANS = \
pulseaudio.1 \
- esdcompat.1 \
pax11publish.1 \
pacat.1 \
pacmd.1 \
@@ -53,6 +55,9 @@ dist_man_MANS = \
pulse-cli-syntax.5 \
start-pulseaudio-x11.1
+if HAVE_ESOUND
+dist_man_MANS += esdcompat.1
+endif
CLEANFILES = \
$(dist_man_MANS)
diff --git a/src/Makefile.am b/src/Makefile.am
index d4a649c97..45616c01c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -183,7 +183,11 @@ endif
# Utility programs #
###################################
-bin_SCRIPTS = esdcompat
+bin_SCRIPTS =
+
+if HAVE_ESOUND
+bin_SCRIPTS += esdcompat
+endif
bin_PROGRAMS += \
pacat \
--
2.15.1
More information about the pulseaudio-discuss
mailing list