[open-ils-commits] [GIT] Evergreen ILS branch master updated. 35efd51995cd593dcefd2cd29cc1b913854b8d8b

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  35efd51995cd593dcefd2cd29cc1b913854b8d8b (commit)
      from  713bb94723f009fb4a3b1ac36626c56066865edc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 35efd51995cd593dcefd2cd29cc1b913854b8d8b
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Wed Mar 22 17:24:02 2017 -0400

    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 at equinoxinitiative.org>

diff --git a/configure.ac b/configure.ac
index a7685ad..dacb5a3 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

-----------------------------------------------------------------------

Summary of changes:
 configure.ac |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS