From 315c162bbb6cd53a64ae48571c140e43364cac4e Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Mon, 27 Oct 2014 15:51:07 -0400
Subject: [PATCH] configure: simplify BUILD_OPUS/BUILD_ILBC
Existing version works but it is redundant to check twice for
without-{opus, ilbc}
Refs #57865
Change-Id: I72e846c696668b95b117885aeebccc6869796103
---
daemon/configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/daemon/configure.ac b/daemon/configure.ac
index 9089716821..5f6700810f 100644
--- a/daemon/configure.ac
+++ b/daemon/configure.ac
@@ -494,7 +494,7 @@ AS_CASE(["$with_libilbc"],
[yes], [PKG_CHECK_MODULES([libilbc], [libilbc], [HAVE_LIBILBC=1])],
[no], [HAVE_LIBILBC=0],
[PKG_CHECK_MODULES([libilbc], [libilbc], [HAVE_LIBILBC=1], [HAVE_LIBILBC=0])])
-AM_CONDITIONAL([BUILD_ILBC], [test "$with_libilbc" != no -a "$HAVE_LIBILBC" -eq 1])
+AM_CONDITIONAL([BUILD_ILBC], [test "$HAVE_LIBILBC" -eq 1])
dnl opus is enabled if it's installed
AC_ARG_WITH([opus],
@@ -503,7 +503,7 @@ AS_CASE(["$with_opus"],
[yes], [PKG_CHECK_MODULES([opus], [opus], [HAVE_OPUS=1])],
[no], [HAVE_OPUS=0],
[PKG_CHECK_MODULES([opus], [opus], [HAVE_OPUS=1], [HAVE_OPUS=0])])
-AM_CONDITIONAL([BUILD_OPUS], [test "$with_opus" != no -a "$HAVE_OPUS" -eq 1])
+AM_CONDITIONAL([BUILD_OPUS], [test "$HAVE_OPUS" -eq 1])
AC_ARG_WITH([iax],
AS_HELP_STRING([--without-iax], [Ignore presence of iax and disable it]))
--
GitLab