Bug 1517232 - NSPR: Remove the gonk reference r=ted

2 files changed, 1 insertions, 32 deletions

diff --git a/configure b/configure
index e529d15e..0d81aac0 100755
--- a/configure
+++ b/configure
@@ -783,7 +783,6 @@ with_android_ndk
 with_android_toolchain
 with_android_version
 with_android_platform
-with_gonk
 with_dist_prefix
 with_dist_bindir
 with_dist_includedir
@@ -873,6 +872,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE}'
@@ -1484,7 +1484,6 @@ Optional Packages:
                           Android platform version, default 5 for arm, 9 for x86/mips
   --with-android-platform=DIR
                           location of platform dir
-  --with-gonk=DIR         location of gonk dir
   --with-dist-prefix=DIST_PREFIX
                           place build files in DIST_PREFIX dist
   --with-dist-bindir=DIR  build execuatables in DIR DIST_PREFIX/bin
@@ -2656,19 +2655,6 @@ mipsel-*android*)
     ;;
 esac
 
-
-
-# Check whether --with-gonk was given.
-if test "${with_gonk+set}" = set; then :
-  withval=$with_gonk; gonkdir=$withval
-fi
-
-
-if test -n "$gonkdir" ; then
-
-    $as_echo "#define ANDROID 1" >>confdefs.h
-
-else
 case "$target" in
 *-android*|*-linuxandroid*)
     if test -z "$android_ndk" ; then
@@ -2754,7 +2740,6 @@ $as_echo "$android_platform" >&6; }
 
     ;;
 esac
-fi
 
 dist_prefix='${MOD_DEPTH}/dist'
 dist_bindir='${dist_prefix}/bin'
diff --git a/configure.in b/configure.in
index 8f9dd621..9ff70f35 100644
--- a/configure.in
+++ b/configure.in
@@ -147,21 +147,6 @@ mipsel-*android*)
     ;;
 esac
 
-dnl ========================================================
-dnl = Gonk is a fork of Android used for Mozilla's B2G project.
-dnl = Configuration is done largely by the top level config
-dnl = and the specified gonk directory doesn't matter here.
-dnl ========================================================
-
-AC_ARG_WITH(gonk,
-[  --with-gonk=DIR         location of gonk dir],
-    gonkdir=$withval)
-
-if test -n "$gonkdir" ; then
-    dnl Most things are directly configured by env vars when building for gonk
-
-    AC_DEFINE(ANDROID)
-else
 case "$target" in
 *-android*|*-linuxandroid*)
     if test -z "$android_ndk" ; then
@@ -246,7 +231,6 @@ case "$target" in
     AC_DEFINE(ANDROID)
     ;;
 esac
-fi
 
 dnl ========================================================
 dnl =