From 532b77008fb5ce710d2ee23a019c25e95d556989 Mon Sep 17 00:00:00 2001
From: Doug Turner <dougt@dougt.org>
Date: Tue, 9 Oct 2012 18:39:56 -0700
Subject: [PATCH] Bug 799391 - After bug 668191, we no longer need a libiw
 check. Fixes netwerk/wifi Makefile to only build DBUS scanner when DBUS is
 enabled. r=ted

---
 configure.in             |  8 --------
 netwerk/wifi/Makefile.in | 20 ++++++++++----------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/configure.in b/configure.in
index 61bed85630f1..57dd2aba739a 100644
--- a/configure.in
+++ b/configure.in
@@ -8194,14 +8194,6 @@ if test "$NECKO_WIFI" -a \
   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)
   _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_WIFI"
diff --git a/netwerk/wifi/Makefile.in b/netwerk/wifi/Makefile.in
index 495ebf890d53..e8c8036f66f1 100644
--- a/netwerk/wifi/Makefile.in
+++ b/netwerk/wifi/Makefile.in
@@ -36,21 +36,21 @@ CPPSRCS = \
 ifeq ($(OS_ARCH),Darwin)
 CPPSRCS += nsWifiScannerMac.cpp
 CMMSRCS = osx_corewlan.mm
-else
+endif
+
 ifneq (,$(filter WINNT,$(OS_ARCH)))
 CPPSRCS += nsWifiScannerWin.cpp
-else
-ifeq ($(OS_ARCH),Linux)
-CPPSRCS += nsWifiScannerDBus.cpp
-OS_INCLUDES += $(MOZ_DBUS_GLIB_CFLAGS)
-else
+endif
+
 ifeq ($(OS_ARCH),SunOS)
 CPPSRCS += nsWifiScannerSolaris.cpp
 OS_INCLUDES += $(GLIB_CFLAGS)
-endif # solaris
-endif # linux
-endif # windows
-endif # mac
+endif
+
+ifdef MOZ_ENABLE_DBUS
+CPPSRCS += nsWifiScannerDBus.cpp
+OS_INCLUDES += $(MOZ_DBUS_GLIB_CFLAGS)
+endif
 
 include $(topsrcdir)/config/rules.mk