[vlc-commits] jack: check for jack >= 1.9.7 or jack >= 0.120.1 (fixes #8493)

[Tristan Matthews]

vlc | branch: master | Tristan Matthews <le.businessman at gmail.com> | Tue Apr 30 02:44:01 2013 -0400| [c7991ee619d337a750abd9925be5fb6168024547] | committer: Rémi Denis-Courmont

jack: check for jack >= 1.9.7 or jack >= 0.120.1 (fixes #8493)

These are the versions of JACK and JACK2 which introduced the
latency API.
Error out if JACK is not installed and "--enable-jack" was used.

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c7991ee619d337a750abd9925be5fb6168024547
---

 configure.ac |   24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 9d3fb68..e8f60ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3569,7 +3569,29 @@ fi
 dnl
 dnl  JACK modules
 dnl
-PKG_ENABLE_MODULES_VLC([JACK], [jack access_jack], [jack], [JACK audio I/O modules],[auto])
+AC_ARG_ENABLE(jack,
+  [AS_HELP_STRING([--disable-jack],
+    [do not use jack (default auto)])])
+if test "${enable_jack}" != "no" ; then
+    PKG_CHECK_MODULES(JACK, jack >= 1.9.7,
+      [ have_jack=yes ],
+      [
+      AC_MSG_WARN([${JACK_PKG_ERRORS}, trying jack1 instead])
+
+      PKG_CHECK_MODULES(JACK, jack >= 0.120.1 jack < 1.0,
+      [ have_jack=yes ],
+      [
+      AS_IF([test -n "${enable_jack}"],
+         [AC_MSG_ERROR([${JACK_PKG_ERRORS}.])],
+         [AC_MSG_WARN([${JACK_PKG_ERRORS}.])])
+      ])
+    ])
+    if test "x${have_jack}" = "xyes" ;  then
+      VLC_ADD_PLUGIN([jack access_jack])
+      VLC_ADD_LIBS([jack access_jack],[$JACK_LIBS])
+      VLC_ADD_CFLAGS([jack access_jack],[$JACK_CFLAGS])
+    fi
+fi
 
 dnl
 dnl  OpenSLES Android