diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2019-01-24 12:24:55 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2019-01-24 12:24:55 +0000 |
| commit | cd73edf45d98b84c44a43d840de68f48e2e0a160 (patch) | |
| tree | 9935243d2070a28bf1d88a01f7ecf913df0d56d9 | |
| parent | 856939429cb1a33463094dfa48d8aa09e0166d14 (diff) | |
| parent | faca5121ad3bafda122f7d4765c026caea337695 (diff) | |
| download | gnutls-cd73edf45d98b84c44a43d840de68f48e2e0a160.tar.gz | |
Merge branch 'tmp-fix-macosx' into 'master'
.travis.yml: make macosx builds compile again
See merge request gnutls/gnutls!890
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | lib/Makefile.am | 2 |
3 files changed, 5 insertions, 3 deletions
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 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]) 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 |