Bug 733285 - Add bluetooth default option and change ril option locations in configure.in; r=mwu
authorKyle Machulis <kyle@nonpolynomial.com>
Thu, 08 Mar 2012 17:13:26 -0800
changeset 91475 1894cac029b5affc6804f26df617cfbef45ff3fe
parent 91474 e7d6d62c89585a97c63978a791ad44c114f2c81d
child 91476 63dce6d751c643aafbd8abb672beb49663e60a51
push idunknown
push userunknown
push dateunknown
reviewersmwu
bugs733285
milestone13.0a1
Bug 733285 - Add bluetooth default option and change ril option locations in configure.in; r=mwu
configure.in
--- a/configure.in
+++ b/configure.in
@@ -2519,16 +2519,18 @@ ia64*-hpux*)
     AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
     ;;
 
 *-android*|*-linuxandroid*)
     AC_DEFINE(NO_PW_GECOS)
     no_x=yes
     if test -n "$gonkdir"; then
         _PLATFORM_DEFAULT_TOOLKIT=cairo-gonk
+        MOZ_B2G_RIL=1
+        MOZ_B2G_BT=1
     else
         _PLATFORM_DEFAULT_TOOLKIT=cairo-android
         MOZ_LINKER=1
     fi
     TARGET_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
 
     MOZ_GFX_OPTIMIZE_MOBILE=1
     MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks -fno-reorder-functions"
@@ -5033,17 +5035,16 @@ cairo-android)
 cairo-gonk)
     AC_DEFINE(MOZ_WIDGET_GONK)
     AC_DEFINE(MOZ_TOUCH)
     MOZ_WIDGET_TOOLKIT=gonk
     TK_CFLAGS='$(MOZ_CAIRO_CFLAGS)'
     TK_LIBS='$(MOZ_CAIRO_LIBS)'
     MOZ_WEBGL=1
     MOZ_PDF_PRINTING=1
-    MOZ_B2G_RIL=1
     MOZ_TOUCH=1
     ;;
 
 esac
 
 AC_SUBST(MOZ_OLD_LINKER)
 AC_SUBST(MOZ_PDF_PRINTING)
 if test "$MOZ_PDF_PRINTING"; then