Backed out changeset 769ffdc41a52 / bug 745998 due to complete build bustage
authorMark Banner <bugzilla@standard8.plus.com>
Tue, 08 May 2012 14:01:13 +0100
changeset 12063 28dc4ceee01994ff38c45e5906c8f02f45e16d9e
parent 12062 769ffdc41a524f8774c629f079b35d7a06ce7444
child 12065 6dcf542bcc3650e6b52f0b2f1627bef817d8ae04
push idunknown
push userunknown
push dateunknown
bugs745998
backs out769ffdc41a524f8774c629f079b35d7a06ce7444
Backed out changeset 769ffdc41a52 / bug 745998 due to complete build bustage
config/autoconf.mk.in
configure.in
suite/installer/package-manifest.in
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -180,17 +180,16 @@ MOZ_PLUGINS	= @MOZ_PLUGINS@
 MOZ_POST_DSO_LIB_COMMAND = @MOZ_POST_DSO_LIB_COMMAND@
 MOZ_POST_PROGRAM_COMMAND = @MOZ_POST_PROGRAM_COMMAND@
 
 MOZ_BUILD_ROOT             = @MOZ_BUILD_ROOT@
 
 MOZ_XUL                    = @MOZ_XUL@
 MOZ_RDF                    = @MOZ_RDF@
 
-NECKO_WIFI = @NECKO_WIFI@
 MOZ_AUTH_EXTENSION = @MOZ_AUTH_EXTENSION@
 
 MOZ_NATIVE_HUNSPELL = @SYSTEM_HUNSPELL@
 MOZ_HUNSPELL_LIBS = @MOZ_HUNSPELL_LIBS@
 MOZ_HUNSPELL_CFLAGS = @MOZ_HUNSPELL_CFLAGS@
 
 MOZ_NATIVE_ZLIB	= @SYSTEM_ZLIB@
 MOZ_NATIVE_BZ2	= @SYSTEM_BZ2@
--- a/configure.in
+++ b/configure.in
@@ -4488,17 +4488,16 @@ MOZ_UI_LOCALE=en-US
 MOZ_UNIVERSALCHARDET=1
 MOZ_URL_CLASSIFIER=
 MOZ_XSLT_STANDALONE=
 MOZ_XTF=1
 MOZ_XUL=1
 MOZ_ZIPWRITER=1
 NS_PRINTING=1
 NSS_DISABLE_DBM=
-NECKO_WIFI=1
 BUILD_CTYPES=1
 
 
 case "$target_os" in
 darwin*)
     ACCESSIBILITY=
     ;;
 *)
@@ -6617,49 +6616,16 @@ MOZ_ARG_DISABLE_BOOL(rdf,
     MOZ_RDF= )
 if test "$MOZ_RDF"; then
   AC_DEFINE(MOZ_RDF)
 fi
 
 AC_SUBST(MOZ_RDF)
 
 dnl
-dnl option to disable necko's wifi scanner
-dnl
-MOZ_ARG_DISABLE_BOOL(necko-wifi,
-[  --disable-necko-wifi    Disable necko wifi scanner],
-    NECKO_WIFI=,
-    NECKO_WIFI=1)
-
-if test "$OS_ARCH" = "OS2"; then
-  dnl OS/2 implementation of Necko-WiFi support will be added in bug 506566
-  NECKO_WIFI=
-fi
-if test "$NECKO_WIFI" -a \
-        "$OS_ARCH" != "Linux" -a \
-        "$OS_ARCH" != "Darwin" -a \
-        "$OS_ARCH" != "SunOS" -a \
-        "$OS_ARCH" != "WINNT"; then
-  AC_MSG_ERROR([Necko WiFi scanning not supported on your platform, use --disable-necko-wifi])
-fi
-
-if test -z "$SKIP_LIBRARY_CHECKS" -a "$NECKO_WIFI" -a "$OS_ARCH" = "Linux"
-then
-  MOZ_CHECK_HEADER([iwlib.h])
-  if test "$ac_cv_header_iwlib_h" != "yes"; then
-    AC_MSG_ERROR([Can't find header iwlib.h for Necko WiFi scanning (might be in package libiw-dev (Ubuntu) or wireless-tools-devel (Fedora) or libiw-devel (openSUSE)); use --disable-necko-wifi to disable])
-  fi
-fi
-
-if test "$NECKO_WIFI"; then
-  AC_DEFINE(NECKO_WIFI)
-fi
-AC_SUBST(NECKO_WIFI)
-
-dnl
 dnl Build jsctypes on the platforms we can, unless it's explicitly disabled.
 dnl
 MOZ_ARG_DISABLE_BOOL(ctypes,
 [  --disable-ctypes        Disable js-ctypes],
     BUILD_CTYPES=,
     BUILD_CTYPES=1)
 AC_SUBST(BUILD_CTYPES)
 if test "$BUILD_CTYPES"; then
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -246,19 +246,17 @@
 @BINPATH@/components/necko_file.xpt
 @BINPATH@/components/necko_ftp.xpt
 @BINPATH@/components/necko_http.xpt
 @BINPATH@/components/necko_res.xpt
 @BINPATH@/components/necko_socket.xpt
 @BINPATH@/components/necko_strconv.xpt
 @BINPATH@/components/necko_viewsource.xpt
 @BINPATH@/components/necko_websocket.xpt
-#ifdef NECKO_WIFI
 @BINPATH@/components/necko_wifi.xpt
-#endif
 @BINPATH@/components/necko_wyciwyg.xpt
 #ifdef MOZ_ENABLE_GNOMEVFS
 @BINPATH@/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@
 #endif
 @BINPATH@/components/parentalcontrols.xpt
 @BINPATH@/components/places.xpt
 @BINPATH@/components/plugin.xpt
 @BINPATH@/components/pref.xpt