From c37e33e29c773ee3b38e0499ade46b7ffade7344 Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Wed, 14 Jan 2009 06:10:03 +0000 Subject: [PATCH] Move PKG_CHECK_MODULES(ASA.. within the $with_csri block, also check for detection of CSRI _and_ ASA before enabling CSRI. Originally committed to SVN as r2694. --- configure.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/configure.in b/configure.in index bb31a185c..b9acb77af 100644 --- a/configure.in +++ b/configure.in @@ -628,7 +628,8 @@ AC_ARG_ENABLE(csri, [ --disable-csri disable CSRI (ASA) support (defau if test "$enable_csri" != "no"; then PKG_CHECK_MODULES(CSRI, csri >= 0.1.0, with_csri="yes", with_csri="no") - if test "$with_csri" = "yes"; then + PKG_CHECK_MODULES(ASA, asa >= 0.3.2, with_asa="yes", with_asa="no") + if test "$with_csri" = "yes" && test "$with_asa" = "yes"; then AC_DEFINE(WITH_CSRI, 1, [Enable CSRI (ASA) Subtitle Provider]) fi else @@ -637,9 +638,6 @@ fi AM_CONDITIONAL([WITH_CSRI], [test "$with_csri" = "yes"]) -PKG_CHECK_MODULES(ASA, asa >= 0.3.2, with_asa="yes", with_asa="no") - - ########### ## Hunspell