From 35efd51995cd593dcefd2cd29cc1b913854b8d8b Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Wed, 22 Mar 2017 17:24:02 -0400 Subject: [PATCH] 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 --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- 2.43.2