From f1a77bece895037acc2d700f5364e95100b8f047 Mon Sep 17 00:00:00 2001
From: Alexandre Ratchov <alex@caoua.org>
Date: Mon, 10 Mar 2014 15:56:23 +0100
Subject: [PATCH] comment xvolkey lines conditionnaly

---
 Makefile.in | 42 +++++++++++++++++++++---------------------
 configure   | 10 +++++++++-
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 3237a9a..4dc858b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,33 +1,33 @@
 XVOLKEYS = @xvolkeys@
 
 all:
-	@cd libsndio && ${MAKE}
-	@cd sndiod && ${MAKE}
-	@cd sndioctl && ${MAKE}
-	@cd aucat && ${MAKE}
-	@if test ${XVOLKEYS} = yes; then cd xvolkeys && ${MAKE}; fi
+	cd libsndio && ${MAKE}
+	cd sndiod && ${MAKE}
+	cd sndioctl && ${MAKE}
+	cd aucat && ${MAKE}
+@no_xvolkeys_comment@	cd xvolkeys && ${MAKE}
 
 install:
-	@cd libsndio && ${MAKE} install
-	@cd sndiod && ${MAKE} install
-	@cd sndioctl && ${MAKE} install
-	@cd aucat && ${MAKE} install
-	@if test ${XVOLKEYS} = yes; then cd xvolkeys && ${MAKE} install; fi
+	cd libsndio && ${MAKE} install
+	cd sndiod && ${MAKE} install
+	cd sndioctl && ${MAKE} install
+	cd aucat && ${MAKE} install
+@no_xvolkeys_comment@	cd xvolkeys && ${MAKE} install
 
 uninstall:
-	@cd xvolkeys && ${MAKE} uninstall
-	@cd aucat && ${MAKE} uninstall
-	@cd sndioctl && ${MAKE} uninstall
-	@cd sndiod && ${MAKE} uninstall
-	@cd libsndio && ${MAKE} uninstall
+	cd xvolkeys && ${MAKE} uninstall
+	cd aucat && ${MAKE} uninstall
+	cd sndioctl && ${MAKE} uninstall
+	cd sndiod && ${MAKE} uninstall
+	cd libsndio && ${MAKE} uninstall
 
 clean:
-	@cd aucat && ${MAKE} clean
-	@cd sndioctl && ${MAKE} clean
-	@cd sndiod && ${MAKE} clean
-	@cd libsndio && ${MAKE} clean
-	@cd examples && ${MAKE} clean
-	@cd xvolkeys && ${MAKE} clean
+	cd aucat && ${MAKE} clean
+	cd sndioctl && ${MAKE} clean
+	cd sndiod && ${MAKE} clean
+	cd libsndio && ${MAKE} clean
+	cd examples && ${MAKE} clean
+	cd xvolkeys && ${MAKE} clean
 
 distclean:	clean
 	rm -f \
diff --git a/configure b/configure
index 5f10120..f76113b 100755
--- a/configure
+++ b/configure
@@ -44,6 +44,7 @@ unset includedir			# path where to install header file
 unset libdir				# path where to install library
 unset defs				# no extra #defines
 unset ldadd				# no extra libraries (-l options)
+unset no_xvolkeys_comment		# comment to disable xvolkeys
 
 #
 # guess OS-specific parameters
@@ -168,6 +169,13 @@ if [ $rmidi = yes ]; then
 	defs="$defs -DUSE_RMIDI"
 fi
 
+#
+# if xvolkeys is disabled, comment it in the makefile
+#
+if [ $xvolkeys = no ]; then
+	no_xvolkeys_comment="#"
+fi
+
 for f in Makefile aucat/Makefile sndiod/Makefile \
 libsndio/Makefile sndioctl/Makefile xvolkeys/Makefile \
 examples/Makefile \
@@ -185,7 +193,7 @@ do
 	-e "s:@vars@:${vars}:" \
 	-e "s:@precision@:$precision:" \
 	-e "s:@user@:$user:" \
-	-e "s:@xvolkeys@:$xvolkeys:" \
+	-e "s:@no_xvolkeys_comment@:$no_xvolkeys_comment:" \
 	< $f.in > $f
 done