From 710b0a26bd3f4048015ccc393c34ad2a725889eb Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Wed, 23 Jan 2019 20:42:34 +0100 Subject: update on "Fix gnutls.pc for multiarch builds" This replaces LTLIBUNISTRING with LIBUNISTRING in Makefile.am. The former is no longer produced by configure.ac. Signed-off-by: Nikos Mavrogiannopoulos --- lib/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Makefile.am b/lib/Makefile.am index 5c0eac680c..9f140469da 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -149,7 +149,7 @@ thirdparty_libadd += $(LIBIDN2_LIBS) endif if HAVE_LIBUNISTRING -thirdparty_libadd += $(LTLIBUNISTRING) +thirdparty_libadd += $(LIBUNISTRING) else libgnutls_la_LIBADD += unistring/libunistring.la endif -- cgit v1.2.1 From 35f578a1b540925c088eefac183850e9bef9cbb3 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Wed, 23 Jan 2019 20:51:11 +0100 Subject: .travis.yml: avoid installing submodules They are not necessary for building and testing the basic test suite. Signed-off-by: Nikos Mavrogiannopoulos --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 017a3788fe..466146c396 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,6 @@ notifications: before_install: - - git submodule update --init - if [[ "$TRAVIS_OS_NAME" = "osx" ]]; then brew update; for pkg in autoconf automake autogen libtool nettle p11-kit libtasn1 gettext;do -- cgit v1.2.1 From faca5121ad3bafda122f7d4765c026caea337695 Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Thu, 24 Jan 2019 01:57:13 +0300 Subject: configure.ac: fix substitution for libatomic Signed-off-by: Dmitry Eremin-Solenikov --- configure.ac | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 52cb1d0f2a..8cc4c26d60 100644 --- a/configure.ac +++ b/configure.ac @@ -208,7 +208,10 @@ 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])]) +AC_SEARCH_LIBS([__atomic_load_4], [atomic], [], [AC_MSG_NOTICE([Could not detect libatomic])]) +AS_IF([test "$ac_cv_search___atomic_load_4" = "none required" || test "$ac_cv_search___atomic_load_4" = "no"], + [AC_SUBST([LIBATOMIC_LIBS], [])], + [AC_SUBST([LIBATOMIC_LIBS], [$ac_cv_search___atomic_load_4])]) dnl We use its presence to detect C11 threads AC_CHECK_HEADERS([threads.h]) -- cgit v1.2.1