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.
This commit is contained in:
Amar Takhar 2009-01-14 06:10:03 +00:00
parent fa240bc665
commit c37e33e29c
1 changed files with 2 additions and 4 deletions

View File

@ -628,7 +628,8 @@ AC_ARG_ENABLE(csri, [ --disable-csri disable CSRI (ASA) support (defau
if test "$enable_csri" != "no"; then if test "$enable_csri" != "no"; then
PKG_CHECK_MODULES(CSRI, csri >= 0.1.0, with_csri="yes", with_csri="no") 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]) AC_DEFINE(WITH_CSRI, 1, [Enable CSRI (ASA) Subtitle Provider])
fi fi
else else
@ -637,9 +638,6 @@ fi
AM_CONDITIONAL([WITH_CSRI], [test "$with_csri" = "yes"]) AM_CONDITIONAL([WITH_CSRI], [test "$with_csri" = "yes"])
PKG_CHECK_MODULES(ASA, asa >= 0.3.2, with_asa="yes", with_asa="no")
########### ###########
## Hunspell ## Hunspell