Skip to content

Commit 822b884

Browse files
committed
configure.ac: Add libyaml dependency
I'm about to introduce a feature that is configured via YAML documents. Add a configure.ac dependency for the library to be used for handling those configuration documents. Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
1 parent fb4e5d0 commit 822b884

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

.github/workflows/makefile.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Install dependencies
2323
run: |
2424
sudo apt-get update
25-
sudo apt-get -y install gnutls-dev libkeyutils-dev libnl-3-dev libnl-genl-3-dev libglib2.0-dev
25+
sudo apt-get -y install gnutls-dev libkeyutils-dev libnl-3-dev libnl-genl-3-dev libglib2.0-dev libyaml-dev
2626
2727
- name: Configure
2828
run: |

configure.ac

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ AC_SUBST([LIBNL3_LIBS])
6262
PKG_CHECK_MODULES([LIBNL_GENL3], libnl-genl-3.0 >= 3.1)
6363
AC_SUBST([LIBNL_GENL3_CFLAGS])
6464
AC_SUBST([LIBNL_GENL3_LIBS])
65+
PKG_CHECK_MODULES(LIBYAML, [yaml-0.1])
66+
AC_SUBST([LIBYAML_CFLAGS])
67+
AC_SUBST([LIBYAML_LIBS])
6568

6669
AC_CHECK_HEADER([linux/quic.h],
6770
[AC_CHECK_LIB([gnutls], [gnutls_handshake_set_secret_function],

src/tlshd/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ EXTRA_DIST = $(man8_MANS)
2222
sbin_PROGRAMS = tlshd
2323
tlshd_CFLAGS = -Werror -Wall -Wextra $(LIBGNUTLS_CFLAGS) \
2424
$(LIBKEYUTILS_CFLAGS) $(GLIB_CFLAGS) $(LIBNL3_CFLAGS) \
25-
$(LIBNL_GENL3_CFLAGS)
25+
$(LIBNL_GENL3_CFLAGS) $(LIBYAML_CFLAGS)
2626
tlshd_SOURCES = client.c config.c handshake.c keyring.c ktls.c log.c \
2727
main.c netlink.c netlink.h server.c tlshd.h quic.c
2828
tlshd_LDADD = $(LIBGNUTLS_LIBS) $(LIBKEYUTILS_LIBS) $(GLIB_LIBS) \
29-
$(LIBNL3_LIBS) $(LIBNL_GENL3_LIBS)
29+
$(LIBNL3_LIBS) $(LIBNL_GENL3_LIBS) $(LIBYAML_LIBS)
3030

3131
SUBDIRS = etc
3232
MAINTAINERCLEANFILES = Makefile.in cscope.out

0 commit comments

Comments
 (0)