From owner-freebsd-gecko@FreeBSD.ORG  Tue Mar 11 01:44:51 2014
Return-Path: <owner-freebsd-gecko@FreeBSD.ORG>
Delivered-To: freebsd-gecko@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 23594E73
 for <freebsd-gecko@freebsd.org>; Tue, 11 Mar 2014 01:44:51 +0000 (UTC)
Received: from trillian.chruetertee.ch (trillian.chruetertee.ch
 [217.150.244.247])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id AAC63CD5
 for <freebsd-gecko@freebsd.org>; Tue, 11 Mar 2014 01:44:50 +0000 (UTC)
Received: from trillian.chruetertee.ch (trillian [217.150.244.247])
 by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id s2B1ifED015214
 for <freebsd-gecko@freebsd.org>; Tue, 11 Mar 2014 01:44:41 GMT
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
 by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id s2B1iaUT014759
 for freebsd-gecko@freebsd.org; Tue, 11 Mar 2014 01:44:36 GMT
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Tue, 11 Mar 2014 01:44:36 GMT
Message-Id: <201403110144.s2B1iaUT014759@trillian.chruetertee.ch>
X-Authentication-Warning: trillian.chruetertee.ch: www set sender to
 svn-freebsd-gecko@chruetertee.ch using -f
From: svn-freebsd-gecko@chruetertee.ch
To: freebsd-gecko@freebsd.org
Subject: [SVN-Commit] r1541 - trunk/www/firefox
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: freebsd-gecko@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
Reply-To: freebsd-gecko@freebsd.org
List-Id: Gecko Rendering Engine issues <freebsd-gecko.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-gecko>,
 <mailto:freebsd-gecko-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gecko/>
List-Post: <mailto:freebsd-gecko@freebsd.org>
List-Help: <mailto:freebsd-gecko-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
 <mailto:freebsd-gecko-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Mar 2014 01:44:51 -0000

Author: jbeich
Date: Tue Mar 11 01:44:36 2014
New Revision: 1541

Log:
allow building with both alsa and pulse

Modified:
   trunk/www/firefox/Makefile.options

Modified: trunk/www/firefox/Makefile.options
==============================================================================
--- trunk/www/firefox/Makefile.options	Sat Mar  8 05:20:17 2014	(r1540)
+++ trunk/www/firefox/Makefile.options	Tue Mar 11 01:44:36 2014	(r1541)
@@ -4,8 +4,8 @@
 			LIBPROXY LOGGING OPTIMIZED_CFLAGS PGO PROFILE TEST
 OPTIONS_DEFAULT+=	ALSA DBUS GIO GSTREAMER LOGGING
 
-OPTIONS_SINGLE+=	AUDIO
-OPTIONS_SINGLE_AUDIO=	ALSA PULSEAUDIO
+OPTIONS_MULTI+=		AUDIO
+OPTIONS_MULTI_AUDIO=	ALSA PULSEAUDIO
 
 ENIGMAIL_DESC?=		Enigmail extension
 GIO_DESC?=		GIO for file I/O # move to bsd.options.desc.mk