diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2010-03-10 15:29:28 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2010-03-10 15:29:28 -0800 |
| commit | a10044f899f2a7910a88c924af231197b9503089 (patch) | |
| tree | e7ca772d1640f978d088900ce4c9928fe21ed070 | |
| parent | c31133f9bb94225e8c9ec168cf319266a1b2e5cd (diff) | |
| download | wlan-a10044f899f2a7910a88c924af231197b9503089.tar.gz | |
wl1271: Fix compilation with Wpa_supplicant 0.5.X
Change-Id: If4dd668796734a5a4bd1a731e07e7f0de560da37
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| -rw-r--r-- | wl1271/CUDK/configurationutility/Android.mk | 5 | ||||
| -rw-r--r-- | wl1271/CUDK/os/linux/src/Android.mk | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/wl1271/CUDK/configurationutility/Android.mk b/wl1271/CUDK/configurationutility/Android.mk index 93450b6..0809fff 100644 --- a/wl1271/CUDK/configurationutility/Android.mk +++ b/wl1271/CUDK/configurationutility/Android.mk @@ -5,7 +5,6 @@ STATIC_LIB ?= y DEBUG ?= y BUILD_SUPPL ?= n WPA_ENTERPRISE ?= y -CONFIG_WPS ?= y WILINK_ROOT = ../.. CUDK_ROOT ?= $(WILINK_ROOT)/CUDK @@ -55,8 +54,8 @@ endif #Supplicant image building ifeq ($(BUILD_SUPPL), y) DK_DEFINES += -D WPA_SUPPLICANT -D CONFIG_CTRL_IFACE -D CONFIG_CTRL_IFACE_UNIX --include external/wpa_supplicant/.config -ifeq ($(CONFIG_WPS), y) +-include $(WPA_SUPPL_DIR)/.config +ifdef CONFIG_WPS DK_DEFINES += -DCONFIG_WPS endif endif diff --git a/wl1271/CUDK/os/linux/src/Android.mk b/wl1271/CUDK/os/linux/src/Android.mk index ec1e47e..8d673a5 100644 --- a/wl1271/CUDK/os/linux/src/Android.mk +++ b/wl1271/CUDK/os/linux/src/Android.mk @@ -41,9 +41,9 @@ endif ifeq ($(BUILD_SUPPL), y) DK_DEFINES += -D WPA_SUPPLICANT -D CONFIG_CTRL_IFACE -D CONFIG_CTRL_IFACE_UNIX -include $(WPA_SUPPL_DIR)/.config - ifeq ($(CONFIG_WPS), y) - DK_DEFINES += -DCONFIG_WPS - endif +ifdef CONFIG_WPS +DK_DEFINES += -DCONFIG_WPS +endif endif LOCAL_CFLAGS += \ |