[SVN-Commit] r1784 - branches/firefox34/www/firefox trunk/www/firefox

[svn-freebsd-gecko at chruetertee.ch]

Author: beat
Date: Wed Dec  3 14:47:19 2014
New Revision: 1784

Log:
Backout r1783

Requested by:	Jan Beich

Modified:
   branches/firefox34/www/firefox/Makefile.options
   trunk/www/firefox/Makefile.options

Modified: branches/firefox34/www/firefox/Makefile.options
==============================================================================
--- branches/firefox34/www/firefox/Makefile.options	Wed Dec  3 11:37:10 2014	(r1783)
+++ branches/firefox34/www/firefox/Makefile.options	Wed Dec  3 14:47:19 2014	(r1784)
@@ -2,8 +2,7 @@
 
 OPTIONS_DEFINE+=	DBUS DEBUG DTRACE GCONF GIO GNOMEUI GNOMEVFS2 GSTREAMER \
 			LIBPROXY LOGGING OPTIMIZED_CFLAGS PGO PROFILE TEST
-OPTIONS_DEFAULT+=	ALSA DBUS GIO GSTREAMER LOGGING
-OPTIONS_DEFAULT_amd64=	OPTIMIZED_CFLAGS
+OPTIONS_DEFAULT+=	ALSA DBUS GIO GSTREAMER LOGGING OPTIMIZED_CFLAGS
 
 OPTIONS_MULTI+=		AUDIO
 OPTIONS_MULTI_AUDIO=	ALSA PULSEAUDIO

Modified: trunk/www/firefox/Makefile.options
==============================================================================
--- trunk/www/firefox/Makefile.options	Wed Dec  3 11:37:10 2014	(r1783)
+++ trunk/www/firefox/Makefile.options	Wed Dec  3 14:47:19 2014	(r1784)
@@ -2,8 +2,7 @@
 
 OPTIONS_DEFINE+=	DBUS DEBUG DTRACE GCONF GIO GNOMEUI GNOMEVFS2 GSTREAMER \
 			LIBPROXY LOGGING OPTIMIZED_CFLAGS PGO PROFILE TEST
-OPTIONS_DEFAULT+=	ALSA DBUS GIO GSTREAMER LOGGING
-OPTIONS_DEFAULT_amd64=	OPTIMIZED_CFLAGS
+OPTIONS_DEFAULT+=	ALSA DBUS GIO GSTREAMER LOGGING OPTIMIZED_CFLAGS
 
 OPTIONS_MULTI+=		AUDIO
 OPTIONS_MULTI_AUDIO=	ALSA PULSEAUDIO