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
authorDoug Turner <dougt@dougt.org>
Tue, 09 Oct 2012 18:39:56 -0700
changeset 109942 eaad0967decca6db802443339670d75b27507feb
parent 109941 05006509aa53ee1ae750a1580f42e5da57ac6389
child 109943 e76aae8e80c9cb592757e2f29034677b76a0fd54
push id84
push usernmatsakis@mozilla.com
push dateThu, 11 Oct 2012 23:26:24 +0000
reviewersted
bugs799391, 668191
milestone19.0a1
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
netwerk/wifi/Makefile.in
--- a/configure.in
+++ b/configure.in
@@ -8189,24 +8189,16 @@ 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)
   _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_WIFI"
 fi
 AC_SUBST(NECKO_WIFI)
 
 dnl
 dnl option to disable cookies
--- a/netwerk/wifi/Makefile.in
+++ b/netwerk/wifi/Makefile.in
@@ -31,27 +31,27 @@ XPIDLSRCS = \
 CPPSRCS = \
   nsWifiMonitor.cpp \
   nsWifiAccessPoint.cpp \
   $(NULL)
 
 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
 
 DEFINES += -DIMPL_NS_NET