[open-ils-commits] [GIT] Evergreen ILS branch rel_2_12 updated. f58b387937d4aa9c7e8ac2573191dc3923e3799f

[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, rel_2_12 has been updated
       via  f58b387937d4aa9c7e8ac2573191dc3923e3799f (commit)
      from  4bdd6f8ed95b9430a1fa00f665689c0e15aae33e (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 f58b387937d4aa9c7e8ac2573191dc3923e3799f
Author: Jason Stephenson <jason at sigio.com>
Date:   Tue Mar 21 15:34:21 2017 -0400

    LP 1669868: Fix make check for all distros.
    
    Chris Sharp found that make check was failing on Ubuntu 14.04 and 16.04.
    
    I borrowed a few lines from the OpenSRF configure.ac and modified the
    Open-ILS/src/c-apps/tests/Makefile.am to use a more autoconf-oriented
    approach that won't lead to unnecessary checks in the install scripts.
    
    Signed-off-by: Jason Stephenson <jason at sigio.com>
    Signed-off-by: Ben Shum <ben at evergreener.net>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/src/c-apps/tests/Makefile.am b/Open-ILS/src/c-apps/tests/Makefile.am
index 67b258d..a782624 100644
--- a/Open-ILS/src/c-apps/tests/Makefile.am
+++ b/Open-ILS/src/c-apps/tests/Makefile.am
@@ -10,12 +10,12 @@ TESTS = check_util check_idl
 check_PROGRAMS = check_util check_idl
 
 check_util_SOURCES = $(COMMON) check_util.c
-check_util_CFLAGS = $(AM_CFLAGS)
-check_util_LDFLAGS = $(AM_LDFLAGS) -loils_idl -loils_utils -lcheck
+check_util_CFLAGS = $(AM_CFLAGS) $(CHECK_CFLAGS)
+check_util_LDFLAGS = $(AM_LDFLAGS) $(CHECK_LIBS) -loils_idl -loils_utils 
 check_util_DEPENDENCIES = ../liboils_idl.la ../liboils_utils.la
 
 check_idl_SOURCES = $(COMMON) check_idl.c
-check_idl_CFLAGS = $(AM_CFLAGS)
-check_idl_LDFLAGS = $(AM_LDFLAGS) -loils_idl -loils_utils -lcheck
+check_idl_CFLAGS = $(AM_CFLAGS) $(CHECK_CFLAGS)
+check_idl_LDFLAGS = $(AM_LDFLAGS) $(CHECK_LIBS) -loils_idl -loils_utils 
 check_idl_DEPENDENCIES = ../liboils_idl.la ../liboils_utils.la
 
diff --git a/configure.ac b/configure.ac
index d49a437..a7685ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -344,6 +344,16 @@ if test "x$openils_core" = "xtrue"; then
     AC_FUNC_STRTOD
     AC_CHECK_FUNCS([localtime_r memset nl_langinfo setlocale strcasecmp strchr strdup strerror strncasecmp])
 
+    #---------------------------------
+    # Check for unit test framework.
+    #---------------------------------
+    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
+
     #----------------------------
     # Create Makefiles/Output
     #----------------------------

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

Summary of changes:
 Open-ILS/src/c-apps/tests/Makefile.am |    8 ++++----
 configure.ac                          |   10 ++++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS