Skip to content

Commit

Permalink
library: Update openconnect.pc.in
Browse files Browse the repository at this point in the history
Add openssl + gnutls to Requires.private for the ssl_library=both case.
Add liboath to Requires.private.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
  • Loading branch information
cernekee committed Jan 15, 2014
1 parent 3032088 commit 2453840
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions configure.ac
Expand Up @@ -387,15 +387,15 @@ case "$ssl_library" in
gnutls)
AC_DEFINE(OPENCONNECT_GNUTLS, 1)
AC_DEFINE(DTLS_GNUTLS, 1)
AC_SUBST(SSL_LIBRARY, [gnutls])
AC_SUBST(SSL_DTLS_PC, [gnutls])
AC_SUBST(SSL_LIBS, ['$(GNUTLS_LIBS)'])
AC_SUBST(SSL_CFLAGS, ['$(GNUTLS_CFLAGS)'])
check_openssl_dtls=no
;;
openssl)
AC_DEFINE(OPENCONNECT_OPENSSL, 1)
AC_DEFINE(DTLS_OPENSSL, 1)
AC_SUBST(SSL_LIBRARY, [openssl])
AC_SUBST(SSL_DTLS_PC, [openssl])
AC_SUBST(SSL_LIBS, ['$(OPENSSL_LIBS)'])
AC_SUBST(SSL_CFLAGS, ['$(OPENSSL_CFLAGS)'])
AC_SUBST(SYMVER_PRINT_ERR, ["openconnect_print_err_cb;"])
Expand All @@ -405,7 +405,7 @@ case "$ssl_library" in
# GnuTLS for TCP, OpenSSL for DTLS
AC_DEFINE(OPENCONNECT_GNUTLS, 1)
AC_DEFINE(DTLS_OPENSSL, 1)
AC_SUBST(SSL_LIBRARY, [gnutls])
AC_SUBST(SSL_DTLS_PC, [gnutls openssl])
AC_SUBST(SSL_LIBS, ['$(GNUTLS_LIBS)'])
AC_SUBST(SSL_CFLAGS, ['$(GNUTLS_CFLAGS)'])
AC_SUBST(DTLS_SSL_LIBS, ['$(OPENSSL_LIBS)'])
Expand Down
2 changes: 1 addition & 1 deletion openconnect-internal.h
Expand Up @@ -407,7 +407,7 @@ void check_cmd_fd(struct openconnect_info *vpninfo, fd_set *fds);
int is_cancel_pending(struct openconnect_info *vpninfo, fd_set *fds);
void poll_cmd_fd(struct openconnect_info *vpninfo, int timeout);

/* ${SSL_LIBRARY}.c */
/* {gnutls,openssl}.c */
int openconnect_SSL_gets(struct openconnect_info *vpninfo, char *buf, size_t len);
int openconnect_SSL_write(struct openconnect_info *vpninfo, char *buf, size_t len);
int openconnect_SSL_read(struct openconnect_info *vpninfo, char *buf, size_t len);
Expand Down
2 changes: 1 addition & 1 deletion openconnect.pc.in
Expand Up @@ -7,7 +7,7 @@ includedir=@includedir@
Name: openconnect
Description: OpenConnect VPN client
Version: @VERSION@
Requires.private: @LIBPROXY_PC@ @ZLIB_PC@ @SSL_LIBRARY@ @P11KIT_PC@ @LIBSTOKEN_PC@ libxml-2.0
Requires.private: @LIBPROXY_PC@ @ZLIB_PC@ @SSL_DTLS_PC@ @P11KIT_PC@ @LIBSTOKEN_PC@ @LIBOATH_PC@ libxml-2.0
Libs: -L${libdir} -lopenconnect
Libs.private: @LIBINTL@
Cflags: -I${includedir}

0 comments on commit 2453840

Please sign in to comment.