[Pkg-voip-commits] [janus] 197/282: Fixed check of Jansson version in configure (fixes #1077)

Jonas Smedegaard dr at jones.dk
Wed Dec 20 21:53:41 UTC 2017


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

js pushed a commit to annotated tag debian/0.2.6-1
in repository janus.

commit 16fa8c8ce10082ae8c1b063f64b165aff904c8d0
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Mon Nov 27 12:40:31 2017 +0100

    Fixed check of Jansson version in configure (fixes #1077)
---
 configure.ac | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index dbb710a..888a6ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,6 +29,7 @@ esac
 
 glib_version=2.34
 ssl_version=1.0.1
+jansson_version=2.5
 
 ##
 # Janus
@@ -197,7 +198,7 @@ PKG_CHECK_MODULES([JANUS],
                   [
                     glib-2.0 >= $glib_version
                     nice
-                    jansson
+                    jansson >= $jansson_version
                     libssl >= $ssl_version
                     libcrypto
                   ])
@@ -359,7 +360,7 @@ fi
 PKG_CHECK_MODULES([TRANSPORTS],
                   [
                     glib-2.0 >= $glib_version
-                    jansson
+                    jansson >= $jansson_version
                   ])
 
 PKG_CHECK_MODULES([MHD],
@@ -466,7 +467,7 @@ AM_CONDITIONAL([ENABLE_PFUNIX], [test "x$enable_unix_sockets" = "xyes"])
 PKG_CHECK_MODULES([PLUGINS],
                   [
                     glib-2.0 >= $glib_version
-                    jansson
+                    jansson >= $jansson_version
                   ])
 
 AC_ARG_ENABLE([plugin-audiobridge],
@@ -625,7 +626,7 @@ AM_CONDITIONAL([ENABLE_PLUGIN_TEXTROOM], [test "x$enable_plugin_textroom" = "xye
 PKG_CHECK_MODULES([EVENTS],
                   [
                     glib-2.0 >= $glib_version
-                    jansson
+                    jansson >= $jansson_version
                   ])
 
 
@@ -695,11 +696,11 @@ AC_ARG_ENABLE([post-processing],
 AS_IF([test "x$enable_post_processing" = "xyes"],
       [PKG_CHECK_MODULES([POST_PROCESSING],
                          [
-                           glib-2.0,
-                           jansson,
-                           libavutil,
-                           libavcodec,
-                           libavformat,
+                           glib-2.0 >= $glib_version
+                           jansson >= $jansson_version
+                           libavutil
+                           libavcodec
+                           libavformat
                            ogg
                          ])
       ])

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/janus.git



More information about the Pkg-voip-commits mailing list