From 6d35db277edebb006e5690970f1587424f4a2248 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Thu, 1 May 2008 20:36:53 +0000 Subject: Version bump, add some patches to respect user set cflags/ldflags and not fail with asneeded, plus some useflags that can now do something Package-Manager: portage-2.1.5_rc6 --- media-sound/bristol/ChangeLog | 10 +- media-sound/bristol/Manifest | 18 ++- media-sound/bristol/bristol-0.20.1.ebuild | 24 --- media-sound/bristol/bristol-0.20.5.ebuild | 41 ++++++ .../bristol/files/bristol-0.20.5-asneeded.patch | 36 +++++ .../bristol/files/bristol-0.20.5-cflags.patch | 162 +++++++++++++++++++++ 6 files changed, 263 insertions(+), 28 deletions(-) delete mode 100644 media-sound/bristol/bristol-0.20.1.ebuild create mode 100644 media-sound/bristol/bristol-0.20.5.ebuild create mode 100644 media-sound/bristol/files/bristol-0.20.5-asneeded.patch create mode 100644 media-sound/bristol/files/bristol-0.20.5-cflags.patch (limited to 'media-sound/bristol') diff --git a/media-sound/bristol/ChangeLog b/media-sound/bristol/ChangeLog index 7ea15ba36280..b3b933f78e11 100644 --- a/media-sound/bristol/ChangeLog +++ b/media-sound/bristol/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-sound/bristol # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/bristol/ChangeLog,v 1.1 2008/01/27 09:50:22 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/bristol/ChangeLog,v 1.2 2008/05/01 20:36:53 aballier Exp $ + +*bristol-0.20.5 (01 May 2008) + + 01 May 2008; Alexis Ballier + +files/bristol-0.20.5-asneeded.patch, +files/bristol-0.20.5-cflags.patch, + -bristol-0.20.1.ebuild, +bristol-0.20.5.ebuild: + Version bump, add some patches to respect user set cflags/ldflags and not + fail with asneeded, plus some useflags that can now do something *bristol-0.20.1 (27 Jan 2008) diff --git a/media-sound/bristol/Manifest b/media-sound/bristol/Manifest index 4b7a575ea270..5da656a309ca 100644 --- a/media-sound/bristol/Manifest +++ b/media-sound/bristol/Manifest @@ -1,4 +1,16 @@ -DIST bristol-0.20.1.tar.gz 2654001 RMD160 586abad03b1c9e1ac129455ae26a9c4f373f9a3a SHA1 ab9b38508abc097ed14cc395e1437d146ab5b2c6 SHA256 3dd7a5676e7957533de6f04fcbba18be8140f32e66fff202af344317c94c6fef -EBUILD bristol-0.20.1.ebuild 736 RMD160 3304362b50cb7e976c89672d1e56a038be7d92ff SHA1 9e87b00331225504dc6dc9af4811302a9a62d9b8 SHA256 4092f6011129defff029af7693dc6a2b973a202803fc59166e56ceab3844858d -MISC ChangeLog 417 RMD160 5067d19c033e772d1b12ae251b431736ad15600a SHA1 0fc4866895d4ffa74f1c51edc7e7734fe639fcc3 SHA256 3f5ed7a6bd31ae83eba6dd9460f98db615007727c2802cbbfd81ca695fe61e5f +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX bristol-0.20.5-asneeded.patch 2156 RMD160 4c3ebbfb1cde836ea9c8ec1aa93853316556202d SHA1 9ec6f87c5f2346c714f0b0519f899147e09f573b SHA256 29d52d6f40bc515320ea4c12160ac3381e0227c75d1018e5bbc2b943549aaa91 +AUX bristol-0.20.5-cflags.patch 9601 RMD160 cb00b323feea84162d9d751e9db57500cb0d5089 SHA1 33763dfec0250b9f803be20edd63bdf7f5bd8041 SHA256 b490512ca848aa5599b870c055f79c207793dda0793a75b0fc0c9abe294f1168 +DIST bristol-0.20.5.tar.gz 2819074 RMD160 94238e45dfe6c8ef78900c71b6091f7e7ab7ff9d SHA1 6f9554ef80ba89625d22c7db200819f204b280b8 SHA256 9141da646bd59074751b187c7ec9e2d8451cb8e92e876015556de616f5cabc2e +EBUILD bristol-0.20.5.ebuild 1028 RMD160 49dd4ada7fc202574f0291825334bf3131a6e7cb SHA1 e5c64f00be0e92a6082ac71e0e76beed9650ce42 SHA256 bf68bcc5c80caae8bd88715586449e4d9d83be09643b83bb85cfbe14775d9b31 +MISC ChangeLog 770 RMD160 a7fdf85fc92f52c5081f5bd10280d555cfdaa9e5 SHA1 88b2b0098c14d80da81e06c81828a0783089c059 SHA256 77cfb1491fe23147c54d200a48916f7f78b32c271d56b0c6f9dd97e7b6192c90 MISC metadata.xml 426 RMD160 fb74ca8dcc43bc8f18a1aec06ece5e52d4a88c79 SHA1 0d0da5f955d037c7d2b51d6654e0ae780f3e43b3 SHA256 791aae49a8691dcd05c8d810785eb32b98e8fbae8689b1c66b32d3d838fd5ea5 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAkgaKe4ACgkQvFcC4BYPU0pA9gCgp56jbcecfbswg57gtblveJQT +s0oAoJorsGPKdpDcZMPqx3wUC5PSCRNh +=AYnP +-----END PGP SIGNATURE----- diff --git a/media-sound/bristol/bristol-0.20.1.ebuild b/media-sound/bristol/bristol-0.20.1.ebuild deleted file mode 100644 index ac5f260b0b3c..000000000000 --- a/media-sound/bristol/bristol-0.20.1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/bristol/bristol-0.20.1.ebuild,v 1.1 2008/01/27 09:50:22 aballier Exp $ - -DESCRIPTION="Synthesizer keyboard emulation package: Moog, Hammond and others" -HOMEPAGE="http://sourceforge.net/projects/bristol" -SRC_URI="mirror://sourceforge/bristol/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=">=media-sound/jack-audio-connection-kit-0.99.0 - >=media-libs/alsa-lib-1.0.0 - x11-libs/libX11" -DEPEND="${RDEPEND} - x11-proto/xproto - dev-util/pkgconfig" - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - dodoc AUTHORS ChangeLog NEWS README -} diff --git a/media-sound/bristol/bristol-0.20.5.ebuild b/media-sound/bristol/bristol-0.20.5.ebuild new file mode 100644 index 000000000000..f5d1c01108c4 --- /dev/null +++ b/media-sound/bristol/bristol-0.20.5.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/bristol/bristol-0.20.5.ebuild,v 1.1 2008/05/01 20:36:53 aballier Exp $ + +inherit autotools eutils + +DESCRIPTION="Synthesizer keyboard emulation package: Moog, Hammond and others" +HOMEPAGE="http://sourceforge.net/projects/bristol" +SRC_URI="mirror://sourceforge/bristol/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="alsa jack" + +RDEPEND="jack? ( >=media-sound/jack-audio-connection-kit-0.99.0 ) + alsa? ( >=media-libs/alsa-lib-1.0.0 ) + x11-libs/libX11" +DEPEND="${RDEPEND} + x11-proto/xproto + dev-util/pkgconfig" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${P}-cflags.patch" + epatch "${FILESDIR}/${P}-asneeded.patch" + eautoreconf +} + +src_compile() { + econf \ + $(use_enable alsa) \ + $(use_enable jack) + emake || die "make failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + dodoc AUTHORS ChangeLog NEWS README +} diff --git a/media-sound/bristol/files/bristol-0.20.5-asneeded.patch b/media-sound/bristol/files/bristol-0.20.5-asneeded.patch new file mode 100644 index 000000000000..77a210e16ac5 --- /dev/null +++ b/media-sound/bristol/files/bristol-0.20.5-asneeded.patch @@ -0,0 +1,36 @@ +Index: bristol-0.20.5/libbrighton/Makefile.am +=================================================================== +--- bristol-0.20.5.orig/libbrighton/Makefile.am ++++ bristol-0.20.5/libbrighton/Makefile.am +@@ -4,5 +4,7 @@ AM_CFLAGS = -Wall -g -I$(srcdir)/../incl + libbrighton_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ + + lib_LTLIBRARIES = libbrighton.la ++libbrighton_la_LIBADD=$(top_builddir)/libbrightonX11/libB11.la -lm ++ + libbrighton_la_SOURCES = brightonBitmaps.c brightonButton.c brightonC.c brightonColorMgt.c brightonDevice.c brightonDispatch.c brightonDisplay.c brightonDisplayMgt.c brightonEventHandlers.c brightonHammond.c brightonInterface.c brightonKbd.c brightonLayer.c brightonPanelMgt.c brightonPic.c brightonRender.c brightonRotary.c brightonScale.c brightonShadowMgt.c brightonTouchpanel.c brightonVu.c brightonWindowMgt.c brightonXpmRead.c brightonkeymappings.h brightonMenu.c brightonLedBlock.c brightonHButton.c + +Index: bristol-0.20.5/libbrightonX11/Makefile.am +=================================================================== +--- bristol-0.20.5.orig/libbrightonX11/Makefile.am ++++ bristol-0.20.5/libbrightonX11/Makefile.am +@@ -3,6 +3,7 @@ AUTOMAKE_OPTIONS = foreign + AM_CFLAGS = -Wall -g -I$(srcdir)/../include/brighton -I/usr/X11R6/include/ @BRIGHTON_HAS_XIMAGE@ + + libB11_la_LDFLAGS= -export-dynamic -version-info @BRISTOL_SO_VERSION@ ++libB11_la_LIBADD= -lX11 + + lib_LTLIBRARIES = libB11.la + libB11_la_SOURCES = bColor.c bDisplay.c bEvent.c bRender.c bRoutines.c bWindow.c +Index: bristol-0.20.5/libbristol/Makefile.am +=================================================================== +--- bristol-0.20.5.orig/libbristol/Makefile.am ++++ bristol-0.20.5/libbristol/Makefile.am +@@ -2,6 +2,7 @@ AUTOMAKE_OPTIONS = foreign + + AM_CFLAGS = -Wall -g -I$(srcdir)/../include/bristol -I$(srcdir)/../include/slab -DBRISOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ + libbristol_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ ++libbristol_la_LIBADD=$(top_builddir)/libbristolaudio/libbristolaudio.la + + lib_LTLIBRARIES = libbristol.la + libbristol_la_SOURCES = audioRoutines.c bristolcdefs.c debugging.c mixroutines.c opmgt.c diff --git a/media-sound/bristol/files/bristol-0.20.5-cflags.patch b/media-sound/bristol/files/bristol-0.20.5-cflags.patch new file mode 100644 index 000000000000..97d2307328b7 --- /dev/null +++ b/media-sound/bristol/files/bristol-0.20.5-cflags.patch @@ -0,0 +1,162 @@ +Index: bristol-0.20.5/brighton/Makefile.am +=================================================================== +--- bristol-0.20.5.orig/brighton/Makefile.am ++++ bristol-0.20.5/brighton/Makefile.am +@@ -1,9 +1,11 @@ + AUTOMAKE_OPTIONS = foreign + +-CFLAGS = -Wall -g -I$(srcdir)/../include/brighton -I$(srcdir)/../include/bristol -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ ++AM_CFLAGS = -Wall -g -I$(srcdir)/../include/brighton -I$(srcdir)/../include/bristol -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ + +-LDFLAGS = -Bdynamic -L../libbrighton/.libs -L../libbristolmidi/.libs -L../libbrightonX11/.libs -L/usr/X11R6/lib -lB11 -lbrighton -lbristolmidi @ALSA_LIBS@ -lX11 -lm -lpthread + + bin_PROGRAMS = brighton ++brighton_LDFLAGS = -Bdynamic -L../libbrighton/.libs -L../libbristolmidi/.libs -L../libbrightonX11/.libs -L/usr/X11R6/lib ++brighton_LDADD = -lB11 -lbrighton -lbristolmidi @ALSA_LIBS@ -lX11 -lm -lpthread ++ + brighton_SOURCES = brightonArp2600.c brightonAxxe.c brighton.c brightonControllers.c brightonDX.c brightonExplorer.c brightonHammondB3.c brightonHammond.c brightonJuno.c brightonMemoryMoog.c brightonMini.c brightonMixer.c brightonMixerMemory.c brightonMixerMenu.c brightonMS20.c brightonOBXa.c brightonOBX.c brightonOdyssey.c brightonPoly6.c brightonPoly.c brightonProphet10.c brightonProphet52.c brightonProphet.c brightonRhodesBass.c brightonRhodes.c brightonRoutines.c brightonSAks.c brightonVox.c brightonKeyboards.h brightonKeys.h brightonMini.h brightonMixer.h brightonMixerMemory.h brightonhelp.h brightonSolina.c brightonRoadRunner.c brightonGranular.c brightonRealistic.c brightonVoxM2.c brightonJupiter.c brightonBitOne.c brightonMaster.c + +Index: bristol-0.20.5/bristol/Makefile.am +=================================================================== +--- bristol-0.20.5.orig/bristol/Makefile.am ++++ bristol-0.20.5/bristol/Makefile.am +@@ -1,10 +1,10 @@ + AUTOMAKE_OPTIONS = foreign + +-CFLAGS = -Wall -g -I$(srcdir)/../include/bristol -I. @BRISTOL_HAS_JACK@ -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ `pkg-config --silence-errors --cflags jack` `pkg-config --silence-errors --cflags alsa` +- +-LDFLAGS = -Bdynamic `pkg-config --silence-errors --libs alsa` `pkg-config --silence-errors --libs jack` @ALSA_LIBS@ -L../libbristolmidi/.libs -L../libbristolaudio/.libs -L../libbristol/.libs -lbristolmidi -lbristolaudio -lbristol -lm -lpthread ++AM_CFLAGS = -Wall -g -I$(srcdir)/../include/bristol -I. @BRISTOL_HAS_JACK@ -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @JACK_CFLAGS@ @ALSA_CFLAGS@ + + bin_PROGRAMS = bristol ++bristol_LDFLAGS = -Bdynamic -L../libbristolmidi/.libs -L../libbristolaudio/.libs -L../libbristol/.libs ++bristol_LDADD = @JACK_LIBS@ @ALSA_LIBS@ -lbristolmidi -lbristolaudio -lbristol -lm -lpthread + + bristol_SOURCES = aksdco.c aksenv.c aksfilter.c aksreverb.c arpdco.c audioEngine.c audiothread.c bristolaks.c bristolarp2600.c bristolaxxe.c bristoldx.c bristolexplorer.c bristolhammond.c bristoljuno.c bristol.c bristolmemorymoog.c bristolmixer.c bristolmm.c bristolobx.c bristolodyssey.c bristolpoly6.c bristolpoly.c bristolprophet52.c bristolprophet.c bristolsampler.c bristolsystem.c bristolvox.c dca.c dco.c dimensionD.c dxop.c electroswitch.c envelope.c expdco.c filter2.c filter.c follower.c hammond.c hammondchorus.c hpf.c junodco.c lfo.c midihandlers.c midinote.c midithread.c noise.c prophetdco.c resonator.c reverb.c ringmod.c rotary.c sdco.c sdcoutils.c soundManager.c thesermon.c vibrachorus.c vox.c aksdco.h aksenv.h aksfilter.h aksreverb.h arpdco.h bristolaks.h bristolarp2600.h bristolaxxe.h bristolexplorer.h bristoljuno.h bristolmemorymoog.h bristolmixer.h bristolmm.h bristolobx.h bristolodyssey.h bristolpoly6.h bristolpoly.h bristolprophet.h bristolsampler.h click.h dca.h dco.h dimensionD.h dxop.h electroswitch.h envelope.h expdco.h filter.h follower.h hammondchorus.h hammond.h hpf.h hum.h junodco.h lfo.h noise.h palette.h prophetdco.h resonator.h reverb.h ringmod.h rotary.h sdco.h thesermon.h vibrachorus.h vox.h bristolsolina.c solina.h bristolroadrunner.c roadrunner.h bristolgranular.c granular.h granulardco.c granulardco.h bristolrealistic.c bristolmg1.h bristoljupiter.c bristolbitone.c bit1osc.c bit1osc.h arpeggiator.c + +Index: bristol-0.20.5/libbrighton/Makefile.am +=================================================================== +--- bristol-0.20.5.orig/libbrighton/Makefile.am ++++ bristol-0.20.5/libbrighton/Makefile.am +@@ -1,6 +1,6 @@ + AUTOMAKE_OPTIONS = foreign + +-CFLAGS = -Wall -g -I$(srcdir)/../include/brighton -I/usr/X11R6/include/ -I. ++AM_CFLAGS = -Wall -g -I$(srcdir)/../include/brighton -I/usr/X11R6/include/ -I. + libbrighton_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ + + lib_LTLIBRARIES = libbrighton.la +Index: bristol-0.20.5/libbristol/Makefile.am +=================================================================== +--- bristol-0.20.5.orig/libbristol/Makefile.am ++++ bristol-0.20.5/libbristol/Makefile.am +@@ -1,6 +1,6 @@ + AUTOMAKE_OPTIONS = foreign + +-CFLAGS = -Wall -g -I$(srcdir)/../include/bristol -I$(srcdir)/../include/slab -DBRISOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ ++AM_CFLAGS = -Wall -g -I$(srcdir)/../include/bristol -I$(srcdir)/../include/slab -DBRISOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ + libbristol_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ + + lib_LTLIBRARIES = libbristol.la +Index: bristol-0.20.5/libbristolaudio/Makefile.am +=================================================================== +--- bristol-0.20.5.orig/libbristolaudio/Makefile.am ++++ bristol-0.20.5/libbristolaudio/Makefile.am +@@ -1,8 +1,9 @@ + AUTOMAKE_OPTIONS = foreign + +-CFLAGS = -Wall -g -I$(srcdir)/../include/slab -I$(srcdir)/../include/bristol -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @BRISTOL_HAS_JACK@ `pkg-config --silence-errors --cflags alsa` `pkg-config --silence-errors --cflags jack` +-LDFLAGS = `pkg-config --silence-errors --libs alsa` `pkg-config --silence-errors --libs jack` ++AM_CFLAGS = -Wall -g -I$(srcdir)/../include/slab -I$(srcdir)/../include/bristol -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @BRISTOL_HAS_JACK@ @ALSA_CFLAGS@ @JACK_CFLAGS@ ++ + libbristolaudio_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ ++libbristolaudio_la_LIBADD=@ALSA_LIBS@ @JACK_LIBS@ + + lib_LTLIBRARIES = libbristolaudio.la + libbristolaudio_la_SOURCES = audioEngineALSA.c audioGUIALSA.c audioMastering.c audioEngine.c audioGUI.c audioNetClient.c audioEngineOSS.c audioGUIOSS.c audioEngineJack.c +Index: bristol-0.20.5/libbristolmidi/Makefile.am +=================================================================== +--- bristol-0.20.5.orig/libbristolmidi/Makefile.am ++++ bristol-0.20.5/libbristolmidi/Makefile.am +@@ -1,8 +1,8 @@ + AUTOMAKE_OPTIONS = foreign + +-CFLAGS = -Wall -g -I$(srcdir)/../include/slab -I$(srcdir)/../include/bristol `pkg-config --silence-errors --cflags alsa` `pkg-config --silence-errors --cflags jack` -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @BRISTOL_HAS_JACK@ ++AM_CFLAGS = -Wall -g -I$(srcdir)/../include/slab -I$(srcdir)/../include/bristol @ALSA_CFLAGS@ @JACK_CFLAGS@ -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @BRISTOL_HAS_JACK@ + libbristolmidi_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ +-LDFLAGS = `pkg-config --silence-errors --libs alsa` `pkg-config --silence-errors --libs jack` ++libbristolmidi_la_LIBADD=@ALSA_LIBS@ @JACK_LIBS@ + + lib_LTLIBRARIES = libbristolmidi.la + libbristolmidi_la_SOURCES = inetClient.c inetServer.c interface.c midiALSADevMan.c midiDevMan.c midiMsgMan.c midiOSSDevMan.c midiParse.c midiRoutines.c midiSeqDevMan.c midiTCPDevMan.c slabmessages.h socketToolKit.c slabmessages.h midiFileMgt.c midiJACKDevMan.c +Index: bristol-0.20.5/libbrightonX11/Makefile.am +=================================================================== +--- bristol-0.20.5.orig/libbrightonX11/Makefile.am ++++ bristol-0.20.5/libbrightonX11/Makefile.am +@@ -1,6 +1,6 @@ + AUTOMAKE_OPTIONS = foreign + +-CFLAGS = -Wall -g -I$(srcdir)/../include/brighton -I/usr/X11R6/include/ @BRIGHTON_HAS_XIMAGE@ ++AM_CFLAGS = -Wall -g -I$(srcdir)/../include/brighton -I/usr/X11R6/include/ @BRIGHTON_HAS_XIMAGE@ + + libB11_la_LDFLAGS= -export-dynamic -version-info @BRISTOL_SO_VERSION@ + +Index: bristol-0.20.5/configure.ac +=================================================================== +--- bristol-0.20.5.orig/configure.ac ++++ bristol-0.20.5/configure.ac +@@ -58,38 +58,49 @@ then + AC_SUBST(BRIGHTON_HAS_XIMAGE) + fi + ++PKG_PROG_PKG_CONFIG ++ + # Checks for library functions. + AC_ARG_ENABLE(alsa, [ --disable-alsa ignore ALSA driver ], + TRY_ALSA=$enableval , TRY_ALSA=yes ) + + HAVE_ALSA=false + BRISTOL_HAS_ALSA=0 +-if test "x$TRY_ALSA" = "xyes" ++if test "x$TRY_ALSA" = "xyes" ; + then + # check for ALSA >= 1.0.0 + PKG_CHECK_MODULES(ALSA, alsa >= 1.0.0, + [HAVE_ALSA=true + BRISTOL_HAS_ALSA=1 +- ], [true], [-lm] ++ ], [true] + ) ++else ++ ALSA_CFLAGS= ++ ALSA_LIBS= ++ AC_SUBST(ALSA_CFLAGS) ++ AC_SUBST(ALSA_LIBS) + fi + AC_SUBST(BRISTOL_HAS_ALSA) + + AC_ARG_ENABLE(jack, [ --disable-jack ignore JACK driver ], + TRY_JACK=$enableval , TRY_JACK=yes ) + HAVE_JACK="false" +-if test "x$TRY_JACK" = "xyes" ++if test "x$TRY_JACK" = "xyes" ; + then + # check for JACK >= 0.99.0 + PKG_CHECK_MODULES(JACK, jack >= 0.99.0, + [HAVE_JACK="true" +- JACK_LIBS=-lasound + JACK_DEFAULT_DRIVER=\"jack\" + BRISTOL_HAS_JACK=-D_BRISTOL_JACK +- ], [true], [-lm] ++ ], [true] + ) + AC_SUBST(JACK_LIBS) + AC_SUBST(BRISTOL_HAS_JACK) ++else ++ JACK_CFLAGS= ++ JACK_LIBS= ++ AC_SUBST(JACK_CFLAGS) ++ AC_SUBST(JACK_LIBS) + fi + AM_CONDITIONAL(HAVE_JACK, $HAVE_JACK) + -- cgit v1.2.3-65-gdbad