diff options
| author | sam <sam@FreeBSD.org> | 2008-03-24 19:46:53 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2008-03-24 19:46:53 +0000 |
| commit | 153f9c1cd9a5b749f57e28682fadb39c781e1e5d (patch) | |
| tree | f77bae77287d18eaa89acc25e38b5acccca132fe /contrib/wpa_supplicant/Makefile | |
| parent | 35aef052ff21baa52c4cec68b512986c21f70a48 (diff) | |
| download | FreeBSD-src-153f9c1cd9a5b749f57e28682fadb39c781e1e5d.zip FreeBSD-src-153f9c1cd9a5b749f57e28682fadb39c781e1e5d.tar.gz | |
Import of WPA supplicant 0.5.10
Diffstat (limited to 'contrib/wpa_supplicant/Makefile')
| -rw-r--r-- | contrib/wpa_supplicant/Makefile | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/contrib/wpa_supplicant/Makefile b/contrib/wpa_supplicant/Makefile index f29eb69..51114fa 100644 --- a/contrib/wpa_supplicant/Makefile +++ b/contrib/wpa_supplicant/Makefile @@ -654,8 +654,25 @@ endif ifdef CONFIG_CTRL_IFACE_DBUS CFLAGS += -DCONFIG_CTRL_IFACE_DBUS -DDBUS_API_SUBJECT_TO_CHANGE OBJS += ctrl_iface_dbus.o ctrl_iface_dbus_handlers.o dbus_dict_helpers.o -LIBS += `pkg-config --libs dbus-1` -CFLAGS += `pkg-config --cflags dbus-1` +ifndef DBUS_LIBS +DBUS_LIBS := $(shell pkg-config --libs dbus-1) +endif +LIBS += $(DBUS_LIBS) +ifndef DBUS_INCLUDE +DBUS_INCLUDE := $(shell pkg-config --cflags dbus-1) +endif +dbus_version=$(subst ., ,$(shell pkg-config --modversion dbus-1)) +DBUS_VERSION_MAJOR=$(word 1,$(dbus_version)) +DBUS_VERSION_MINOR=$(word 2,$(dbus_version)) +ifeq ($(DBUS_VERSION_MAJOR),) +DBUS_VERSION_MAJOR=0 +endif +ifeq ($(DBUS_VERSION_MINOR),) +DBUS_VERSION_MINOR=0 +endif +DBUS_INCLUDE += -DDBUS_VERSION_MAJOR=$(DBUS_VERSION_MAJOR) +DBUS_INCLUDE += -DDBUS_VERSION_MINOR=$(DBUS_VERSION_MINOR) +CFLAGS += $(DBUS_INCLUDE) endif ifdef CONFIG_READLINE @@ -724,6 +741,10 @@ ifndef CONFIG_MAIN CONFIG_MAIN=main endif +ifdef CONFIG_DEBUG_FILE +CFLAGS += -DCONFIG_DEBUG_FILE +endif + OBJS += wpa_supplicant.o events.o OBJS_t := $(OBJS) eapol_test.o radius.o radius_client.o OBJS_t2 := $(OBJS) preauth_test.o |
