Bug 920551 - 1/2: Allow building b2g without MOZ_B2G_RIL. r=khuey
authorVicamo Yang <vyang@mozilla.com>
Tue, 29 Oct 2013 16:12:36 +0800
changeset 152686 db78190281aeee83e3efb3a1b30488566aec2b47
parent 152685 61492582956a4039a25bceba07a5f9342297d1cd
child 152687 6a36dbff2b3ab57fdb76b68cb00efaf342d4a55b
push id25559
push userryanvm@gmail.com
push dateThu, 31 Oct 2013 02:37:04 +0000
treeherdermozilla-central@f0d363d72753 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs920551
milestone27.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 920551 - 1/2: Allow building b2g without MOZ_B2G_RIL. r=khuey
configure.in
--- a/configure.in
+++ b/configure.in
@@ -1936,17 +1936,17 @@ 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
+        _PLATFORM_HAVE_RIL=1
         MOZ_B2G_FM=1
         MOZ_SYNTH_PICO=1
     else
         _PLATFORM_DEFAULT_TOOLKIT=cairo-android
         MOZ_LINKER=1
     fi
     TARGET_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
 
@@ -7269,19 +7269,24 @@ if test -n "$MOZ_REFLOW_PERF"; then
 fi
 
 dnl ========================================================
 dnl = Enable Radio Interface for B2G (Gonk usually)
 dnl ========================================================
 MOZ_ARG_ENABLE_BOOL(b2g-ril,
 [  --enable-b2g-ril      Set compile flags necessary for testing B2G Radio Interface Layer via network sockets ],
     MOZ_B2G_RIL=1,
-    MOZ_B2G_RIL= )
+    MOZ_B2G_RIL=,
+    MOZ_B2G_RIL=$_PLATFORM_HAVE_RIL )
 if test -n "$MOZ_B2G_RIL"; then
-    AC_DEFINE(MOZ_B2G_RIL)
+    if test -n "$_PLATFORM_HAVE_RIL"; then
+        AC_DEFINE(MOZ_B2G_RIL)
+    else
+        AC_MSG_ERROR([b2g-ril cannot be enabled because target platform doesn't support it.])
+    fi
 fi
 AC_SUBST(MOZ_B2G_RIL)
 
 dnl ========================================================
 dnl = Enable Radio FM for B2G (Gonk usually)
 dnl ========================================================
 if test -n "$MOZ_B2G_FM"; then
     AC_DEFINE(MOZ_B2G_FM)