[cpp-opensaml] 07/10: Prefer the plain cxxtestgen program

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository cpp-opensaml.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-opensaml.git;a=commit;h=e957194c92b65c91e1616f223b52a417fbc66af0

commit e957194c92b65c91e1616f223b52a417fbc66af0
Author: Ferenc Wágner <wferi at debian.org>
AuthorDate: Sat Oct 13 10:13:05 2018 +0200

    Prefer the plain cxxtestgen program
    
    cxxtestgen.pl was removed in 2009.
---
 configure.ac | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/configure.ac b/configure.ac
index c4b5aef..d6f7439 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,21 +81,10 @@ AX_PKG_CHECK_MODULES([xmltooling],,[xmltooling >= 3])
 PKG_CHECK_VAR([DX_INCLUDE], [xmltooling], [includedir])
 
 # Check for unit test support
-CXXTEST="/usr/bin/cxxtestgen.pl"
-CXXTESTFLAGS=""
-AC_ARG_WITH(cxxtest,
-    AS_HELP_STRING([--with-cxxtest=PATH], [where cxxtest is installed]),
-    [if test x_$with_cxxtest != x_/usr; then
-        CXXTEST="${with_cxxtest}/cxxtestgen.pl"
-        CXXTESTFLAGS="-I${with_cxxtest}"
-    fi])
-if ! test -f "${CXXTEST}"; then
-    AC_MSG_WARN([cxxtestgen not found, won't build unit tests])
-fi
-
-AC_SUBST(CXXTEST)
-AC_SUBST(CXXTESTFLAGS)
-AM_CONDITIONAL(BUILD_UNITTEST,test -f ${CXXTEST})
+AC_ARG_VAR([CXXTEST], [override the cxxtestgen executable and options])
+AC_CHECK_PROGS([CXXTEST], [cxxtestgen cxxtestgen.pl], [false])
+AC_ARG_VAR([CXXTESTFLAGS], [override the cxxtest compiler flags needed to build tests])
+AM_CONDITIONAL([BUILD_UNITTEST], [test "x${CXXTEST}" != xfalse])
 
 AC_ARG_WITH([pkgxmldir],
     AS_HELP_STRING([--with-pkgxmldir],

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.