diff options
| author | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2020-06-07 14:18:34 +0000 |
|---|---|---|
| committer | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2020-06-07 14:18:34 +0000 |
| commit | 1cdf8d75ca1fd396049202d57b5ea545a2500acd (patch) | |
| tree | 8eee048421988c8f3f872c87b498ff17fb0b9929 | |
| parent | 86012fd64e248c31554d42e6d6b38bfcd4357f92 (diff) | |
| parent | 5997ca7d43385e114f05ef06ca2bb7168879c612 (diff) | |
| download | gnutls-1cdf8d75ca1fd396049202d57b5ea545a2500acd.tar.gz | |
Merge branch 'tmp-fix-36-mandatory-lib' into 'gnutls_3_6_x'
Merge the extra libraries to link dynamically in GNUTLS_LIBS_PRIVATE
See merge request gnutls/gnutls!1281
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | lib/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/gnutls.pc.in | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index d59553b6a1..74278d5689 100644 --- a/configure.ac +++ b/configure.ac @@ -120,8 +120,7 @@ case "$host" in *mingw32* | *mingw64*) have_win=yes AC_DEFINE([_UNICODE], [1], [Defined to 1 for Unicode (wide chars) APIs]) - LIB_CRYPT32="-lcrypt32" - AC_SUBST([LIB_CRYPT32]) + GNUTLS_LIBS_PRIVATE="${GNUTLS_LIBS_PRIVATE} -lcrypt32" AC_PREPROC_IFELSE([AC_LANG_PROGRAM( [[#include <windows.h> #if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0600 @@ -135,9 +134,8 @@ case "$host" in if test "x$enable_dyn_ncrypt" = "xyes"; then AC_DEFINE([DYN_NCRYPT], 1, [Dynamic use of ncrypt API (win32)]) else - LIBNCRYPT="-lncrypt" + GNUTLS_LIBS_PRIVATE="${GNUTLS_LIBS_PRIVATE} -lncrypt" fi - AC_SUBST([LIBNCRYPT]) ;; *darwin*) have_macosx=yes @@ -601,11 +599,12 @@ fi AM_CONDITIONAL(HAVE_LIBIDN2, test "$with_libidn2" != "no") if test "x$have_vista_dynamic" = "xno"; then - AC_CHECK_TYPES([BCRYPT_ALG_HANDLE],[LIBBCRYPT="-lbcrypt"],[],[#include <windows.h> + AC_CHECK_TYPES([BCRYPT_ALG_HANDLE],[ + GNUTLS_LIBS_PRIVATE="${GNUTLS_LIBS_PRIVATE} -lbcrypt" + ],[],[#include <windows.h> #include <bcrypt.h>]) fi AM_CONDITIONAL(HAVE_BCRYPT, test "$ac_cv_type_BCRYPT_ALG_HANDLE" = "yes") -AC_SUBST([LIBBCRYPT]) AC_ARG_ENABLE(non-suiteb-curves, AS_HELP_STRING([--disable-non-suiteb-curves], [disable curves not in SuiteB]), @@ -937,6 +936,7 @@ AC_CHECK_SIZEOF(time_t, 4) # export for use in scripts AC_SUBST(ac_cv_sizeof_time_t) +AC_SUBST(GNUTLS_LIBS_PRIVATE) AC_SUBST(GNUTLS_REQUIRES_PRIVATE) diff --git a/lib/Makefile.am b/lib/Makefile.am index f55f298f7b..fa47ac5e62 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -151,7 +151,7 @@ libgnutls_la_LIBADD = ../gl/libgnu.la x509/libgnutls_x509.la \ auth/libgnutls_auth.la algorithms/libgnutls_alg.la \ extras/libgnutls_extras.la thirdparty_libadd = $(LTLIBZ) $(LTLIBINTL) $(LIBSOCKET) $(LTLIBNSL) \ - $(P11_KIT_LIBS) $(LIB_SELECT) $(LIB_CRYPT32) + $(P11_KIT_LIBS) $(LIB_SELECT) $(GNUTLS_LIBS_PRIVATE) if HAVE_LIBIDN2 thirdparty_libadd += $(LIBIDN2_LIBS) diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in index 0ed41e2ddd..7cdedda5d7 100644 --- a/lib/gnutls.pc.in +++ b/lib/gnutls.pc.in @@ -19,6 +19,6 @@ Description: Transport Security Layer implementation for the GNU system URL: https://www.gnutls.org/ Version: @VERSION@ Libs: -L${libdir} -lgnutls -Libs.private: @LIBINTL@ @LIBSOCKET@ @INET_PTON_LIB@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBATOMIC_LIBS@ @LIB_CRYPT32@ @LIBNCRYPT@ @LIBBCRYPT@ +Libs.private: @LIBINTL@ @LIBSOCKET@ @INET_PTON_LIB@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBATOMIC_LIBS@ @GNUTLS_LIBS_PRIVATE@ @GNUTLS_REQUIRES_PRIVATE@ Cflags: -I${includedir} |