[PATCH] build: allow overriding D-Bus version from pkg-config

Grant Erickson marathon96 at gmail.com
Wed Jan 4 17:37:51 EST 2012


This allows the package build to specify the D-Bus version being built
against externally to pkg-config.

Signed-off-by: Grant Erickson <marathon96 at gmail.com>
---
 wpa_supplicant/Makefile |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 0832f10..554c22a 100644
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -1161,7 +1161,11 @@ endif
 ifndef DBUS_INCLUDE
 DBUS_INCLUDE := $(shell $(PKG_CONFIG) --cflags dbus-1)
 endif
-dbus_version=$(subst ., ,$(shell $(PKG_CONFIG) --modversion dbus-1))
+ifndef DBUS_VERSION
+dbus_version := $(subst ., ,$(shell $(PKG_CONFIG) --modversion dbus-1))
+else
+dbus_version := $(subst ., ,$(DBUS_VERSION))
+endif
 DBUS_VERSION_MAJOR=$(word 1,$(dbus_version))
 DBUS_VERSION_MINOR=$(word 2,$(dbus_version))
 ifeq ($(DBUS_VERSION_MAJOR),)
-- 
1.7.8.2



More information about the HostAP mailing list