diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2019-01-23 19:14:01 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2019-01-23 19:14:01 +0000 |
| commit | 312ff972329ab6cfc80a07c84282ad31afbcd553 (patch) | |
| tree | 808e4e1e60dd8792e02b6a545bcf7e9e1564a514 | |
| parent | 6d016afe040e3e461aade39fe72e61f2da45f407 (diff) | |
| parent | 615b89850193812b58d2d3d0592f6d743586dd0a (diff) | |
| download | gnutls-312ff972329ab6cfc80a07c84282ad31afbcd553.tar.gz | |
Merge branch 'master' into 'master'
configure.ac: check if libatomic is needed
See merge request gnutls/gnutls!878
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | lib/gnutls.pc.in | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index c21660c3f3..52cb1d0f2a 100644 --- a/configure.ac +++ b/configure.ac @@ -207,6 +207,9 @@ dnl Need netinet/tcp.h for TCP_FASTOPEN AC_CHECK_HEADERS([netinet/tcp.h]) AC_CHECK_HEADERS([stdatomic.h]) +dnl This ensures that we link with the right library for atomic operations on Linux SPARC +AC_SEARCH_LIBS([__atomic_load_4], [atomic], [AC_SUBST([LIBATOMIC_LIBS], [-latomic])]) + dnl We use its presence to detect C11 threads AC_CHECK_HEADERS([threads.h]) diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in index 9f26852ccd..68be2d1101 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: http://www.gnutls.org/ Version: @VERSION@ Libs: -L${libdir} -lgnutls -Libs.private: @LIBINTL@ @LIBSOCKET@ @LIBNSL@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@ +Libs.private: @LIBINTL@ @LIBSOCKET@ @LIBNSL@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@ @LIBATOMIC_LIBS@ @GNUTLS_REQUIRES_PRIVATE@ Cflags: -I${includedir} |