[gnunet] branch master updated (6c19200f2 -> e18ad2888)

[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 6c19200f2 BUILD: Add pt and exit
     new e73c63f28 BUILD: Build util executables
     new e18ad2888 BUILD: use check_header

The 2 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:
 contrib/gana         |  2 +-
 contrib/sphinx       |  2 +-
 meson.build          | 55 +++++++++++++++++++++++++++++++++++++++++++-----
 src/meson.build      |  2 +-
 src/util/meson.build | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 112 insertions(+), 8 deletions(-)

diff --git a/contrib/gana b/contrib/gana
index c1dc2dc97..c9bda2187 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit c1dc2dc975742c929a523c22d91f7d4f82787230
+Subproject commit c9bda21875ea1775f88b71de735d527132e45922
diff --git a/contrib/sphinx b/contrib/sphinx
index 9c5b9d904..0cccef450 160000
--- a/contrib/sphinx
+++ b/contrib/sphinx
@@ -1 +1 @@
-Subproject commit 9c5b9d9040d21542eff792e26624cf9669b127aa
+Subproject commit 0cccef450b037a48170402117f7d3b6c0a4272af
diff --git a/meson.build b/meson.build
index a827c1796..17ce5cea1 100644
--- a/meson.build
+++ b/meson.build
@@ -114,7 +114,7 @@ mhd_dep = dependency('libmicrohttpd', required : false)
 if not mhd_dep.found()
   mhd_dep = cc.find_library('microhttpd', required : true)
 endif
-json_dep = dependency('libjansson', required : false)
+json_dep = dependency('jansson', required : false)
 if not json_dep.found()
   json_dep = cc.find_library('jansson', required : true)
 endif
@@ -129,7 +129,7 @@ if not gnutls_dep.found()
     gnutls_dep = cc.find_library('gnutls-dane', required : true)
   endif
 endif
-sodium_dep = dependency('libsodium', required : false)
+sodium_dep = dependency('libsodium', required : false, version: '>=1.0.18')
 if not sodium_dep.found()
   sodium_dep = cc.find_library('sodium', required : true)
 endif
@@ -175,6 +175,10 @@ if ssh_bin.found()
   add_project_arguments('-DHAVE_SSH_BINARY', language : 'c')
 endif
 
+# FIXME we are not doing anything with this right now
+sudo_bin = find_program('sudo', '/usr/bin/sudo', required : false)
+doas_bin = find_program('doas', '/usr/bin/doas', required : false)
+
 # Optional dependencies
 
 # FIXME: I think we wanted to retire mysql support
@@ -200,6 +204,43 @@ if zbar_dep.found()
   add_project_arguments('-DHAVE_ZBAR', language : 'c')
 endif
 
+## FIXME conversation: pulse/gst detection in configure.ac obviously
+## broken. Needs reconsideration. No idea for now.
+pulse_dep = dependency('libpulse', required : false)
+if not pulse_dep.found()
+  pulse_dep = cc.find_library('pulse', required : false)
+endif
+if pulse_dep.found()
+  add_project_arguments('-DHAVE_PULSE', language : 'c')
+endif
+
+opus_dep = dependency('libopus', required : false)
+if not opus_dep.found()
+  opus_dep = cc.find_library('opus', required : false)
+endif
+if opus_dep.found()
+  add_project_arguments('-DHAVE_OPUS', language : 'c')
+endif
+
+ogg_dep = dependency('libogg', required : false)
+if not ogg_dep.found()
+  ogg_dep = cc.find_library('ogg', required : false)
+endif
+if ogg_dep.found()
+  add_project_arguments('-DHAVE_OGG', language : 'c')
+endif
+
+if pulse_dep.found() or ogg_dep.found() or opus_dep.found()
+  gst_dep = dependency('libgst', required : false)
+  if not gst_dep.found()
+    gst_dep = cc.find_library('gstreamer', required : false)
+  endif
+  if gst_dep.found()
+    add_project_arguments('-DHAVE_GST', language : 'c')
+  endif
+endif
+## END conversation
+
 gnunetdeps = [mhd_dep,
               sodium_dep,
               gcrypt_dep,
@@ -213,16 +254,20 @@ gnunetdeps = [mhd_dep,
 
 add_project_arguments('-DNEED_LIBGCRYPT_VERSION="1.6.0"', language : 'c')
 
-if cc.has_header('sys/time.h')
+if cc.check_header('sys/time.h')
   add_project_arguments('-DHAVE_SYS_TIME_H', language : 'c')
 endif
-if cc.has_header('sys/param.h')
+if cc.check_header('sys/param.h')
   add_project_arguments('-DHAVE_SYS_PARAM_H', language : 'c')
 endif
 
+# NSS
+if cc.check_header('nss.h')
+  add_project_arguments('-DHAVE_GLIBCNSS', language : 'c')
+endif
 
 # GNUTLS DANE
-if cc.has_header('gnutls/dane.h')
+if cc.check_header('gnutls/dane.h')
   if cc.has_function('dane_verify_crt_raw',
                            prefix: '#include <gnutls/dane.h>',
                            dependencies: gnutls_dep)
diff --git a/src/meson.build b/src/meson.build
index e463bd4f5..64fa54ca0 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -56,7 +56,7 @@ subdir('revocation')
 subdir('vpn')
 subdir('gns')
 subdir('zonemaster')
-##subdir('$(CONVERSATION_DIR)')
+#subdir('$(CONVERSATION_DIR)')
 subdir('fs')
 # TODO
 subdir('exit')
diff --git a/src/util/meson.build b/src/util/meson.build
index 9cda9f193..eecb7d553 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -91,6 +91,65 @@ libgnunetutil_dep = declare_dependency(link_with : 
libgnunetutil)
 pkg.generate(libgnunetutil, url: 'https://www.gnunet.org',
              description : 'Provides miscellaneous utility functions and API 
for GNUnet')
 
+executable ('gnunet-base32',
+            ['gnunet-base32.c'],
+            dependencies: [libgnunetutil_dep, libgnunetutil_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('bindir'))
+executable ('gnunet-config',
+            ['gnunet-config.c'],
+            dependencies: [libgnunetutil_dep, libgnunetutil_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('bindir'))
+executable ('gnunet-resolver',
+            ['gnunet-resolver.c'],
+            dependencies: [libgnunetutil_dep, libgnunetutil_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('bindir'))
+executable ('gnunet-ecc',
+            ['gnunet-ecc.c'],
+            dependencies: [libgnunetutil_dep, libgnunetutil_dep, gcrypt_dep, 
m_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('bindir'))
+executable ('gnunet-scrypt',
+            ['gnunet-scrypt.c'],
+            dependencies: [libgnunetutil_dep, libgnunetutil_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('bindir'))
+executable ('gnunet-uri',
+            ['gnunet-uri.c'],
+            dependencies: [libgnunetutil_dep, libgnunetutil_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('bindir'))
+if zbar_dep.found()
+  executable ('gnunet-qr',
+              ['gnunet-qr.c'],
+              dependencies: [zbar_dep, libgnunetutil_dep, libgnunetutil_dep],
+              include_directories: [incdir, configuration_inc],
+              install: true,
+              install_dir: get_option('bindir'))
+endif
+executable ('gnunet-config-diff',
+            ['gnunet-config-diff.c'],
+            dependencies: [libgnunetutil_dep, libgnunetutil_dep],
+            include_directories: [incdir, configuration_inc],
+            install: false)
+executable ('test_common_logging_dummy',
+            ['test_common_logging_dummy.c'],
+            dependencies: [libgnunetutil_dep, libgnunetutil_dep],
+            include_directories: [incdir, configuration_inc],
+            install: false)
+executable ('gnunet-crypto-tvg',
+            ['gnunet-crypto-tvg.c'],
+            dependencies: [libgnunetutil_dep, libgnunetutil_dep, json_dep],
+            include_directories: [incdir, configuration_inc],
+            install: false)
 
 testcommonalloc = executable ('test_common_allocation',
             ['test_common_allocation.c'],

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.