diff options
| author | Bjarke Istrup Pedersen <gurli@gurlinet.dk> | 2011-11-14 11:12:19 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2011-11-14 11:12:19 +0100 |
| commit | 57df6fdf8df8ea9b72d6afdf9da09343b8138261 (patch) | |
| tree | 59abb1fa8f052a5700046616d5ab705e78068810 | |
| parent | 9c1d758129e02af5623b4faa52342b8bae3f5fd9 (diff) | |
| download | iw-57df6fdf8df8ea9b72d6afdf9da09343b8138261.tar.gz | |
always use libnl 3.2 as 3.2, not 3.0
With libnl 3.2, both LIBNL3FOUND and LIBNL3xFOUND
might become true, leading to errors. Disable the
former if the latter is found.
| -rw-r--r-- | Makefile | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -38,6 +38,14 @@ LIBS += -lnl-genl NLLIBNAME = libnl-2.0 endif +ifeq ($(NL3xFOUND),Y) +# libnl 3.2 might be found as 3.2 and 3.0 +NL3FOUND = N +CFLAGS += -DCONFIG_LIBNL30 +LIBS += -lnl-genl-3 +NLLIBNAME = libnl-3.0 +endif + ifeq ($(NL3FOUND),Y) CFLAGS += -DCONFIG_LIBNL30 LIBS += -lnl-genl @@ -52,12 +60,6 @@ LIBS += -lnl-genl NLLIBNAME = libnl-3.1 endif -ifeq ($(NL3xFOUND),Y) -CFLAGS += -DCONFIG_LIBNL30 -LIBS += -lnl-genl-3 -NLLIBNAME = libnl-3.0 -endif - ifeq ($(NLLIBNAME),) $(error Cannot find development files for any supported version of libnl) endif |