Merge branch 'master' into net-next
This commit is contained in:
commit
16ab6c47ba
|
|
@ -19,6 +19,10 @@ ifeq ($(IP_CONFIG_SETNS),y)
|
|||
CFLAGS += -DHAVE_SETNS
|
||||
endif
|
||||
|
||||
ifeq ($(HAVE_ELF),y)
|
||||
CFLAGS += -DHAVE_ELF
|
||||
LDLIBS += -lelf
|
||||
endif
|
||||
ifeq ($(HAVE_MNL),y)
|
||||
CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags)
|
||||
LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs)
|
||||
|
|
|
|||
|
|
@ -4,6 +4,10 @@ ifeq ($(IP_CONFIG_SETNS),y)
|
|||
CFLAGS += -DHAVE_SETNS
|
||||
endif
|
||||
|
||||
ifeq ($(HAVE_ELF),y)
|
||||
CFLAGS += -DHAVE_ELF
|
||||
endif
|
||||
|
||||
ifeq ($(HAVE_MNL),y)
|
||||
CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags)
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -102,6 +102,10 @@ endif
|
|||
TCOBJ += $(TCMODULES)
|
||||
LDLIBS += -L. -lm
|
||||
|
||||
ifeq ($(HAVE_ELF),y)
|
||||
CFLAGS += -DHAVE_ELF
|
||||
LDLIBS += -lelf
|
||||
endif
|
||||
ifeq ($(HAVE_MNL),y)
|
||||
CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags)
|
||||
LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs)
|
||||
|
|
|
|||
Loading…
Reference in New Issue