DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

wpa_supplicant: Respect PKG_CONFIG variable if set in the environment

Browse source 
This is required for cross-compilation support on certain
platforms to avoid changing the pkg-config files themselves.

Signed-off-by: David James <davidjames@chromium.org>
Signed-off-by: Paul Stewart <pstew@chromium.org>
This commit is contained in:
Paul Stewart 2011-07-04 20:35:38 +03:00 committed by Jouni Malinen
parent 751bc722bd
commit 572a171f4f
3 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
wpa_supplicant/Android.mk
View file

@ -16,6 +16,7 @@
# #
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
PKG_CONFIG ?= pkg-config
WPA_BUILD_SUPPLICANT := false WPA_BUILD_SUPPLICANT := false
ifneq ($(TARGET_SIMULATOR),true) ifneq ($(TARGET_SIMULATOR),true)
@ -1143,12 +1144,12 @@ DBUS_OBJS += dbus/dbus_old_handlers_wps.c
endif endif
DBUS_OBJS += dbus/dbus_dict_helpers.c DBUS_OBJS += dbus/dbus_dict_helpers.c
ifndef DBUS_LIBS ifndef DBUS_LIBS
DBUS_LIBS := $(shell pkg-config --libs dbus-1) DBUS_LIBS := $(shell $(PKG_CONFIG) --libs dbus-1)
endif endif
ifndef DBUS_INCLUDE ifndef DBUS_INCLUDE
DBUS_INCLUDE := $(shell pkg-config --cflags dbus-1) DBUS_INCLUDE := $(shell $(PKG_CONFIG) --cflags dbus-1)
endif endif
dbus_version=$(subst ., ,$(shell pkg-config --modversion dbus-1)) dbus_version=$(subst ., ,$(shell $(PKG_CONFIG) --modversion dbus-1))
DBUS_VERSION_MAJOR=$(word 1,$(dbus_version)) DBUS_VERSION_MAJOR=$(word 1,$(dbus_version))
DBUS_VERSION_MINOR=$(word 2,$(dbus_version)) DBUS_VERSION_MINOR=$(word 2,$(dbus_version))
ifeq ($(DBUS_VERSION_MAJOR),) ifeq ($(DBUS_VERSION_MAJOR),)
@ -1172,10 +1173,10 @@ ifdef CONFIG_WPS
DBUS_OBJS += dbus/dbus_new_handlers_wps.c DBUS_OBJS += dbus/dbus_new_handlers_wps.c
endif endif
ifndef DBUS_LIBS ifndef DBUS_LIBS
DBUS_LIBS := $(shell pkg-config --libs dbus-1) DBUS_LIBS := $(shell $(PKG_CONFIG) --libs dbus-1)
endif endif
ifndef DBUS_INCLUDE ifndef DBUS_INCLUDE
DBUS_INCLUDE := $(shell pkg-config --cflags dbus-1) DBUS_INCLUDE := $(shell $(PKG_CONFIG) --cflags dbus-1)
endif endif
ifdef CONFIG_CTRL_IFACE_DBUS_INTRO ifdef CONFIG_CTRL_IFACE_DBUS_INTRO
DBUS_OBJS += dbus/dbus_new_introspect.c DBUS_OBJS += dbus/dbus_new_introspect.c

11
wpa_supplicant/Makefile
View file

@ -8,6 +8,7 @@ endif
export LIBDIR ?= /usr/local/lib/ export LIBDIR ?= /usr/local/lib/
export BINDIR ?= /usr/local/sbin/ export BINDIR ?= /usr/local/sbin/
PKG_CONFIG ?= pkg-config
CFLAGS += -I../src CFLAGS += -I../src
CFLAGS += -I../src/utils CFLAGS += -I../src/utils
@ -1118,12 +1119,12 @@ DBUS_OBJS += dbus/dbus_old_handlers_wps.o
endif endif
DBUS_OBJS += dbus/dbus_dict_helpers.o DBUS_OBJS += dbus/dbus_dict_helpers.o
ifndef DBUS_LIBS ifndef DBUS_LIBS
DBUS_LIBS := $(shell pkg-config --libs dbus-1) DBUS_LIBS := $(shell $(PKG_CONFIG) --libs dbus-1)
endif endif
ifndef DBUS_INCLUDE ifndef DBUS_INCLUDE
DBUS_INCLUDE := $(shell pkg-config --cflags dbus-1) DBUS_INCLUDE := $(shell $(PKG_CONFIG) --cflags dbus-1)
endif endif
dbus_version=$(subst ., ,$(shell pkg-config --modversion dbus-1)) dbus_version=$(subst ., ,$(shell $(PKG_CONFIG) --modversion dbus-1))
DBUS_VERSION_MAJOR=$(word 1,$(dbus_version)) DBUS_VERSION_MAJOR=$(word 1,$(dbus_version))
DBUS_VERSION_MINOR=$(word 2,$(dbus_version)) DBUS_VERSION_MINOR=$(word 2,$(dbus_version))
ifeq ($(DBUS_VERSION_MAJOR),) ifeq ($(DBUS_VERSION_MAJOR),)
@ -1150,10 +1151,10 @@ ifdef CONFIG_P2P
DBUS_OBJS += dbus/dbus_new_handlers_p2p.o DBUS_OBJS += dbus/dbus_new_handlers_p2p.o
endif endif
ifndef DBUS_LIBS ifndef DBUS_LIBS
DBUS_LIBS := $(shell pkg-config --libs dbus-1) DBUS_LIBS := $(shell $(PKG_CONFIG) --libs dbus-1)
endif endif
ifndef DBUS_INCLUDE ifndef DBUS_INCLUDE
DBUS_INCLUDE := $(shell pkg-config --cflags dbus-1) DBUS_INCLUDE := $(shell $(PKG_CONFIG) --cflags dbus-1)
endif endif
ifdef CONFIG_CTRL_IFACE_DBUS_INTRO ifdef CONFIG_CTRL_IFACE_DBUS_INTRO
DBUS_OBJS += dbus/dbus_new_introspect.o DBUS_OBJS += dbus/dbus_new_introspect.o

7
wpa_supplicant/dbus/Makefile
View file

@ -15,6 +15,7 @@ ifndef CFLAGS
CFLAGS = -MMD -O2 -Wall -g CFLAGS = -MMD -O2 -Wall -g
endif endif
PKG_CONFIG ?= pkg-config
CFLAGS += -I../../src -I../../src/utils CFLAGS += -I../../src -I../../src/utils
@ -38,10 +39,10 @@ CFLAGS += -DCONFIG_CTRL_IFACE_DBUS_NEW
CFLAGS += -DCONFIG_CTRL_IFACE_DBUS CFLAGS += -DCONFIG_CTRL_IFACE_DBUS
ifndef DBUS_LIBS ifndef DBUS_LIBS
DBUS_LIBS := $(shell pkg-config --libs dbus-1) DBUS_LIBS := $(shell $(PKG_CONFIG) --libs dbus-1)
endif endif
ifndef DBUS_INCLUDE ifndef DBUS_INCLUDE
DBUS_INCLUDE := $(shell pkg-config --cflags dbus-1) DBUS_INCLUDE := $(shell $(PKG_CONFIG) --cflags dbus-1)
endif endif
ifdef CONFIG_CTRL_IFACE_DBUS_INTRO ifdef CONFIG_CTRL_IFACE_DBUS_INTRO
CFLAGS += -DCONFIG_CTRL_IFACE_DBUS_INTRO CFLAGS += -DCONFIG_CTRL_IFACE_DBUS_INTRO
@ -49,7 +50,7 @@ DBUS_INCLUDE += $(shell xml2-config --cflags)
DBUS_LIBS += $(shell xml2-config --libs) DBUS_LIBS += $(shell xml2-config --libs)
endif endif
dbus_version=$(subst ., ,$(shell pkg-config --modversion dbus-1)) dbus_version=$(subst ., ,$(shell $(PKG_CONFIG) --modversion dbus-1))
DBUS_VERSION_MAJOR=$(word 1,$(dbus_version)) DBUS_VERSION_MAJOR=$(word 1,$(dbus_version))
DBUS_VERSION_MINOR=$(word 2,$(dbus_version)) DBUS_VERSION_MINOR=$(word 2,$(dbus_version))
ifeq ($(DBUS_VERSION_MAJOR),) ifeq ($(DBUS_VERSION_MAJOR),)