Skip to content

Commit 236756a

Browse files
igawchucklever
authored andcommitted
tlshd: Ensure libnl-genl3 is available
tlshd depends on libnl-genl3, thus add a explicit check if the library is available. Signed-off-by: Daniel Wagner <[email protected]>
1 parent 22e0f96 commit 236756a

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

configure.ac

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ AC_SUBST([GLIB_LIBS])
5959
PKG_CHECK_MODULES([LIBNL3], libnl-3.0 >= 3.1)
6060
AC_SUBST([LIBNL3_CFLAGS])
6161
AC_SUBST([LIBNL3_LIBS])
62+
PKG_CHECK_MODULES([LIBNL_GENL3], libnl-genl-3.0 >= 3.1)
63+
AC_SUBST([LIBNL_GENL3_CFLAGS])
64+
AC_SUBST([LIBNL_GENL3_LIBS])
6265

6366
AC_CHECK_FILE([/usr/include/linux/quic.h],
6467
[AC_CHECK_LIB([gnutls], [gnutls_handshake_set_secret_function],

src/tlshd/Makefile.am

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,11 @@ EXTRA_DIST = $(man5_MANS) $(man8_MANS)
2424

2525
sbin_PROGRAMS = tlshd
2626
tlshd_CFLAGS = -Werror -Wall -Wextra $(LIBGNUTLS_CFLAGS) \
27-
$(LIBKEYUTILS_CFLAGS) $(GLIB_CFLAGS) $(LIBNL3_CFLAGS)
27+
$(LIBKEYUTILS_CFLAGS) $(GLIB_CFLAGS) $(LIBNL3_CFLAGS) \
28+
$(LIBNL_GENL3_CFLAGS)
2829
tlshd_SOURCES = client.c config.c handshake.c keyring.c ktls.c log.c \
2930
main.c netlink.c netlink.h server.c tlshd.h quic.c
3031
tlshd_LDADD = $(LIBGNUTLS_LIBS) $(LIBKEYUTILS_LIBS) $(GLIB_LIBS) \
31-
$(LIBNL3_LIBS) -lnl-genl-3
32+
$(LIBNL3_LIBS) $(LIBNL_GENL3_LIBS)
3233

3334
MAINTAINERCLEANFILES = Makefile.in cscope.out

0 commit comments

Comments
 (0)