[gnunet] branch master updated: meson: fix build without pulse

[gnunet]

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

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

The following commit(s) were added to refs/heads/master by this push:
     new 722a53e21 meson: fix build without pulse
722a53e21 is described below

commit 722a53e211a247c15b218ea8767f457aa87861d2
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Mon Jan 8 13:48:21 2024 +0100

    meson: fix build without pulse
---
 meson.build | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/meson.build b/meson.build
index ed0ba4159..10937517f 100644
--- a/meson.build
+++ b/meson.build
@@ -321,27 +321,25 @@ endif
 if ogg_dep.found()
   add_project_arguments('-DHAVE_OGG', language : 'c')
 endif
+gst_dep = dependency('gstreamer-1.0', required : false)
+if not gst_dep.found()
+  gst_dep = cc.find_library('gstreamer-1.0', required : false)
+endif
+gst_app_dep = dependency('gstreamer-app-1.0', required : false)
+if not gst_app_dep.found()
+  gst_app_dep = cc.find_library('gstreamer-app-1.0', required : false)
+endif
+gst_audio_dep = dependency('gstreamer-audio-1.0', required : false)
+if not gst_audio_dep.found()
+  gst_audio_dep = cc.find_library('gstreamer-audio-1.0', required : false)
+endif
 
 conversation_backend = 'none'
 if pulse_dep.found() and opus_dep.found() and ogg_dep.found()
   conversation_backend = 'pulse'
-else
-  gst_dep = dependency('gstreamer-1.0', required : false)
-  if not gst_dep.found()
-    gst_dep = cc.find_library('gstreamer-1.0', required : false)
-  endif
-  gst_app_dep = dependency('gstreamer-app-1.0', required : false)
-  if not gst_app_dep.found()
-    gst_app_dep = cc.find_library('gstreamer-app-1.0', required : false)
-  endif
-  gst_audio_dep = dependency('gstreamer-audio-1.0', required : false)
-  if not gst_audio_dep.found()
-    gst_audio_dep = cc.find_library('gstreamer-audio-1.0', required : false)
-  endif
-  if gst_dep.found() and gst_app_dep.found() and gst_audio_dep.found()
+elif gst_dep.found() and gst_app_dep.found() and gst_audio_dep.found()
     add_project_arguments('-DHAVE_GST', language : 'c')
     conversation_backend = 'gst'
-  endif
 endif
 ## END conversation
 

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