[SCM] snd/master: Allow ALSA+JACK

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 14720305c6e8b4539b9c442a4b714ffa5eb4ae69
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Mon Jan 25 23:35:46 2016 +0100

    Allow ALSA+JACK
    
    Closes: #773176

diff --git a/debian/rules b/debian/rules
index 6fc5bbb..44fd89b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,22 +43,27 @@ DEB_CONFIGURE_EXTRA_FLAGS = \
 	--prefix=/usr
 
 ## per flavor configure options
-
-# nox, use ALSA on linux and OSS non non-linux
-DEB_CONFIGURE_EXTRA_FLAGS_nox       = --without-gui -program-suffix=.nox
+# the code includes inline-asm for atomic ops, but only for i386/amd64/powerpc
+# see https://bugs.debian.org/#555538
+ifneq (,$(findstring :$(DEB_HOST_ARCH_CPU):,:i386:powerpc:amd64:))
+configureflags_audio_jack  = --with-jack
+else
+configureflags_audio_jack  =
+endif
+# use ALSA on linux, and OSS non non-linux
 ifneq (,$(findstring linux,$(DEB_HOST_ARCH_OS)))
-DEB_CONFIGURE_EXTRA_FLAGS_nox += --with-alsa
+configureflags_audio_default  = --with-alsa
 else
-DEB_CONFIGURE_EXTRA_FLAGS_nox += --with-oss
+configureflags_audio_default  = --with-oss
 endif
 
+# nox
+DEB_CONFIGURE_EXTRA_FLAGS_nox       = --without-gui -program-suffix=.nox \
+	$(configureflags_audio_default)
+
 # jack
-DEB_CONFIGURE_EXTRA_FLAGS_gtk-jack  = --with-gtk --program-suffix=.gtk-jack
-# the code includes inline-asm for atomic ops, but only for i386/amd64/powerpc
-# see https://bugs.debian.org/#555538
-ifneq (,$(findstring :$(DEB_HOST_ARCH_CPU):,:i386:powerpc:amd64:))
-DEB_CONFIGURE_EXTRA_FLAGS_gtk-jack  += --with-jack
-endif
+DEB_CONFIGURE_EXTRA_FLAGS_gtk-jack  = --with-gtk --program-suffix=.gtk-jack \
+	$(configureflags_audio_default) $(configureflags_audio_jack)
 
 ## pulse
 DEB_CONFIGURE_EXTRA_FLAGS_gtk-pulse = --with-gtk --with-pulseaudio --program-suffix=.gtk-pulse

-- 
snd packaging