wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Doug Turner 2012-10-09 18:39:56 -07:00
parent 8c389dfe18
commit 88c1ccd373
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.in
View File

@ -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"

20
netwerk/wifi/Makefile.in
View File

@ -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