Add openssl + gnutls to Requires.private for the ssl_library=both case.
Add liboath to Requires.private.
Signed-off-by: Kevin Cernekee <cernekee at gmail.com>
---
configure.ac | 6 +++---
openconnect-internal.h | 2 +-
openconnect.pc.in | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index 357b001..934488b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -385,7 +385,7 @@ 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
@@ -393,7 +393,7 @@ case "$ssl_library" in
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;"])
@@ -403,7 +403,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)'])
diff --git a/openconnect-internal.h b/openconnect-internal.h
index 1d68f6e..7ac3dda 100644
--- a/openconnect-internal.h
+++ b/openconnect-internal.h
@@ -427,7 +427,7 @@ const char *keystore_strerror(int err);
int keystore_fetch(const char *key, unsigned char **result);
#endif
-/* ${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);
diff --git a/openconnect.pc.in b/openconnect.pc.in
index db4cb80..6930a8b 100644
--- a/openconnect.pc.in
+++ b/openconnect.pc.in
@@ -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}
--
1.7.9.5
