[GNUnet-SVN] [gnunet] branch master updated (ca5e6a9b9 -> b0da4b2b9)

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a change to branch master
in repository gnunet.

    from ca5e6a9b9 5604
     new b30650b8f temp fix for #5606
     new e81f832a8 Merge branch 'master' of git+ssh://gnunet.org/gnunet
     new b0da4b2b9 Merge branch 'master' of git+ssh://gnunet.org/gnunet

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/util/Makefile.am | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 5fa6e907e..755f91a11 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -124,7 +124,11 @@ libgnunetutil_la_SOURCES = \
        proc_compat.c
 
 if HAVE_LIBATOMIC
+if DARWIN
+       LIBATOMIC=
+else
   LIBATOMIC= -latomic
+endif
 else
   LIBATOMIC=
 endif

-- 
To stop receiving notification emails like this one, please contact
address@hidden