mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
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
This commit is contained in:
parent
ef9bf6814b
commit
2a28baa649
@ -8194,14 +8194,6 @@ if test "$NECKO_WIFI" -a \
|
|||||||
AC_MSG_ERROR([Necko WiFi scanning not supported on your platform, use --disable-necko-wifi])
|
AC_MSG_ERROR([Necko WiFi scanning not supported on your platform, use --disable-necko-wifi])
|
||||||
fi
|
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
|
if test "$NECKO_WIFI"; then
|
||||||
AC_DEFINE(NECKO_WIFI)
|
AC_DEFINE(NECKO_WIFI)
|
||||||
_NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_WIFI"
|
_NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_WIFI"
|
||||||
|
@ -36,21 +36,21 @@ CPPSRCS = \
|
|||||||
ifeq ($(OS_ARCH),Darwin)
|
ifeq ($(OS_ARCH),Darwin)
|
||||||
CPPSRCS += nsWifiScannerMac.cpp
|
CPPSRCS += nsWifiScannerMac.cpp
|
||||||
CMMSRCS = osx_corewlan.mm
|
CMMSRCS = osx_corewlan.mm
|
||||||
else
|
endif
|
||||||
|
|
||||||
ifneq (,$(filter WINNT,$(OS_ARCH)))
|
ifneq (,$(filter WINNT,$(OS_ARCH)))
|
||||||
CPPSRCS += nsWifiScannerWin.cpp
|
CPPSRCS += nsWifiScannerWin.cpp
|
||||||
else
|
endif
|
||||||
ifeq ($(OS_ARCH),Linux)
|
|
||||||
CPPSRCS += nsWifiScannerDBus.cpp
|
|
||||||
OS_INCLUDES += $(MOZ_DBUS_GLIB_CFLAGS)
|
|
||||||
else
|
|
||||||
ifeq ($(OS_ARCH),SunOS)
|
ifeq ($(OS_ARCH),SunOS)
|
||||||
CPPSRCS += nsWifiScannerSolaris.cpp
|
CPPSRCS += nsWifiScannerSolaris.cpp
|
||||||
OS_INCLUDES += $(GLIB_CFLAGS)
|
OS_INCLUDES += $(GLIB_CFLAGS)
|
||||||
endif # solaris
|
endif
|
||||||
endif # linux
|
|
||||||
endif # windows
|
ifdef MOZ_ENABLE_DBUS
|
||||||
endif # mac
|
CPPSRCS += nsWifiScannerDBus.cpp
|
||||||
|
OS_INCLUDES += $(MOZ_DBUS_GLIB_CFLAGS)
|
||||||
|
endif
|
||||||
|
|
||||||
include $(topsrcdir)/config/rules.mk
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user