diff options
| author | Stefan Lippers-Hollmann <s.L-H@gmx.de> | 2012-01-18 20:53:03 +0100 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@frijolero.org> | 2012-01-18 15:36:49 -0800 |
| commit | f2a073df6d785a229f8b05ba8e488b03cb46d509 (patch) | |
| tree | a6b091e60c0086c1648499ecbe7768321aff8740 | |
| parent | d6bf498f05a2ac64a48137da00c0ada021a38fe0 (diff) | |
| download | crda-f2a073df6d785a229f8b05ba8e488b03cb46d509.tar.gz crda-f2a073df6d785a229f8b05ba8e488b03cb46d509.tar.bz2 crda-f2a073df6d785a229f8b05ba8e488b03cb46d509.zip | |
crda: add nested support for libnl-3.2
Skip libnl-3.1 due to broken .pc files.
Tested to work with:
- libnl-3.2.3 (Debian 3.2.3-1)
Changes-licensed-under: ISC
Signed-off-by: Stefan Lippers-Hollmann <s.l-h@gmx.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>
| -rw-r--r-- | Makefile | 25 | ||||
| -rw-r--r-- | crda.c | 4 |
2 files changed, 18 insertions, 11 deletions
@@ -48,19 +48,26 @@ INSTALL ?= install NL1FOUND := $(shell pkg-config --atleast-version=1 libnl-1 && echo Y) NL2FOUND := $(shell pkg-config --atleast-version=2 libnl-2.0 && echo Y) NL3FOUND := $(shell pkg-config --atleast-version=3 libnl-3.0 && echo Y) +NL32FOUND := $(shell pkg-config --atleast-version=3 libnl-3.2 && echo Y) -ifeq ($(NL3FOUND),Y) +ifeq ($(NL32FOUND),Y) CFLAGS += -DCONFIG_LIBNL30 -NLLIBS += -lnl-genl -NLLIBNAME = libnl-3.0 +NLLIBS += $(shell pkg-config --libs libnl-genl-3.2) +NLLIBNAME = libnl-3.2 else - ifeq ($(NL2FOUND),Y) - CFLAGS += -DCONFIG_LIBNL20 - NLLIBS += -lnl-genl - NLLIBNAME = libnl-2.0 + ifeq ($(NL3FOUND),Y) + CFLAGS += -DCONFIG_LIBNL30 + NLLIBS += $(shell pkg-config --libs libnl-genl-3.0) + NLLIBNAME = libnl-3.0 else - ifeq ($(NL1FOUND),Y) - NLLIBNAME = libnl-1 + ifeq ($(NL2FOUND),Y) + CFLAGS += -DCONFIG_LIBNL20 + NLLIBS += -lnl-genl + NLLIBNAME = libnl-2.0 + else + ifeq ($(NL1FOUND),Y) + NLLIBNAME = libnl-1 + endif endif endif endif @@ -21,7 +21,7 @@ #include "regdb.h" #include "reglib.h" -#if !defined(CONFIG_LIBNL20) && !defined(CONFIG_LIBNL30) +#if !defined(CONFIG_LIBNL20) && !defined(CONFIG_LIBNL30) && !defined(CONFIG_LIBNL32) /* libnl 2.0 compatibility code */ static inline struct nl_handle *nl_socket_alloc(void) { @@ -44,7 +44,7 @@ static inline int __genl_ctrl_alloc_cache(struct nl_handle *h, struct nl_cache * #define genl_ctrl_alloc_cache __genl_ctrl_alloc_cache #define nl_sock nl_handle -#endif /* CONFIG_LIBNL20 && CONFIG_LIBNL30 */ +#endif /* CONFIG_LIBNL20 && CONFIG_LIBNL30 && CONFIG_LIBNL32 */ struct nl80211_state { struct nl_sock *nl_sock; |