From patchwork Wed Jan 4 22:37:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grant Erickson X-Patchwork-Id: 134374 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from maxx.maxx.shmoo.com (maxx.shmoo.com [205.134.188.171]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "maxx.shmoo.com", Issuer "CA Cert Signing Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id A6D381007D7 for ; Thu, 5 Jan 2012 09:38:29 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id A7DF59C1B4; Wed, 4 Jan 2012 17:38:25 -0500 (EST) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IFQsJlWg3I-j; Wed, 4 Jan 2012 17:38:25 -0500 (EST) Received: from maxx.shmoo.com (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 042059C1BF; Wed, 4 Jan 2012 17:38:18 -0500 (EST) X-Original-To: mailman-post+hostap@maxx.shmoo.com Delivered-To: mailman-post+hostap@maxx.shmoo.com Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 6F4109C1B5 for ; Wed, 4 Jan 2012 17:38:16 -0500 (EST) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fu2-mYRr2-k9 for ; Wed, 4 Jan 2012 17:38:12 -0500 (EST) Received: from mail-tul01m020-f172.google.com (mail-tul01m020-f172.google.com [209.85.214.172]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (not verified)) by maxx.maxx.shmoo.com (Postfix) with ESMTPS id 9E84F9C149 for ; Wed, 4 Jan 2012 17:38:12 -0500 (EST) Received: by obcuz6 with SMTP id uz6so22593286obc.17 for ; Wed, 04 Jan 2012 14:38:12 -0800 (PST) Received: by 10.50.76.162 with SMTP id l2mr78610igw.1.1325716691821; Wed, 04 Jan 2012 14:38:11 -0800 (PST) Received: from localhost.localdomain (74-93-5-105-SFBA.hfc.comcastbusiness.net. [74.93.5.105]) by mx.google.com with ESMTPS id cv10sm114751297igc.0.2012.01.04.14.38.10 (version=SSLv3 cipher=OTHER); Wed, 04 Jan 2012 14:38:11 -0800 (PST) From: Grant Erickson To: hostap@lists.shmoo.com, Jouni Malinen Subject: [PATCH] build: allow overriding D-Bus version from pkg-config Date: Wed, 4 Jan 2012 14:37:51 -0800 Message-Id: <1325716671-25307-1-git-send-email-marathon96@gmail.com> X-Mailer: git-send-email 1.7.8.2 X-BeenThere: hostap@lists.shmoo.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: HostAP Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: hostap-bounces@lists.shmoo.com Errors-To: hostap-bounces@lists.shmoo.com This allows the package build to specify the D-Bus version being built against externally to pkg-config. Signed-off-by: Grant Erickson --- 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),)