From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Wed, 22 Mar 2017 21:24:02 +0000 (-0400)
Subject: LP#1669868: fix regression that broke building staff client
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=872efcecbe5d0778a562470b8a5367cdf2d0a1ff;p=Evergreen.git

LP#1669868: fix regression that broke building staff client

Looks like AM_CONDITIONAL should not be in if blocks per
https://www.gnu.org/software/automake/manual/html_node/Usage-of-Conditionals.html

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---

diff --git a/configure.ac b/configure.ac
index a7685ad38d..dacb5a36b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -236,6 +236,8 @@ if ! test -d "$DBI_LIBS"; then
 fi
 AC_SUBST([DBI_LIBS])
 
+AM_CONDITIONAL(CHECK_TESTS, test x$enable_tests = xyes)
+
 if test "x$openils_core" = "xtrue"; then
 
     AC_PATH_PROG([OSRF_CONFIG], [osrf_config])
@@ -349,7 +351,6 @@ if test "x$openils_core" = "xtrue"; then
     #---------------------------------
     PKG_CHECK_MODULES([CHECK], [check >= 0.9.0], [enable_tests=yes],
                       [enable_tests=no])
-    AM_CONDITIONAL(CHECK_TESTS, test x$enable_tests = xyes)
     if test "x$enable_tests" = "xno"; then
         AC_MSG_WARN(Check unit testing framework not found.)
     fi