diff --git a/Makefile.am b/Makefile.am index f952988..a2a7da6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2419,7 +2419,6 @@ endif # Integration tests # ##################### -if ENABLE_INTGCHECK intgcheck: set -e; \ rm -Rf intg; \ @@ -2430,6 +2429,7 @@ intgcheck: cd intg/bld; \ $(abs_top_srcdir)/configure \ --prefix="$$prefix" \ + --enable-intgcheck \ --with-ldb-lib-dir="$$prefix"/lib/ldb \ $(INTGCHECK_CONFIGURE_FLAGS); \ $(MAKE) $(AM_MAKEFLAGS); \ @@ -2440,7 +2440,6 @@ intgcheck: $(MAKE) $(AM_MAKEFLAGS) -C src/tests/intg intgcheck-installed; \ cd ../..; \ rm -Rf "$$prefix" intg -endif # ENABLE_INTGCHECK #################### # Client Libraries # diff --git a/configure.ac b/configure.ac index 518e6c1..0eacd3f 100644 --- a/configure.ac +++ b/configure.ac @@ -318,7 +318,6 @@ AM_CONDITIONAL([BUILD_PYTHON_BINDINGS], -o x"$with_python3_bindings" = xyes]) AM_PYTHON2_MODULE([ldap]) -AM_CONDITIONAL([HAVE_PY2MOD_LDAP], [test x"$HAVE_PY2MOD_LDAP" == xyes]) if test x$HAVE_SELINUX != x; then AM_CHECK_SELINUX @@ -392,7 +391,7 @@ AM_CHECK_CMOCKA AM_CHECK_UID_WRAPPER AM_CHECK_NSS_WRAPPER -AM_ENABLE_INTGCHECK +SSS_ENABLE_INTGCHECK AM_CONDITIONAL([HAVE_DEVSHM], [test -d /dev/shm]) diff --git a/src/external/cwrap.m4 b/src/external/cwrap.m4 index 0bd0bc9..b03d1ef 100644 --- a/src/external/cwrap.m4 +++ b/src/external/cwrap.m4 @@ -4,20 +4,19 @@ dnl AM_CHECK_WRAPPER(name, conditional) dnl If the cwrap library is found, sets the HAVE_$name conditional AC_DEFUN([AM_CHECK_WRAPPER], [ - FOUND_WRAPPER=0 - AC_MSG_CHECKING([for $1]) PKG_CHECK_EXISTS([$1], [ AC_MSG_RESULT([yes]) - FOUND_WRAPPER=1 + AC_SUBST([$2], [yes]) ], [ AC_MSG_RESULT([no]) + AC_SUBST([$2], [no]) AC_MSG_WARN([cwrap library $1 not found, some tests will not run]) ]) - AM_CONDITIONAL($2, [ test x$FOUND_WRAPPER = x1]) + AM_CONDITIONAL($2, [ test x$2 = xyes]) ]) AC_DEFUN([AM_CHECK_UID_WRAPPER], diff --git a/src/external/fakeroot.m4 b/src/external/fakeroot.m4 index 685eaf8..91c2ceb 100644 --- a/src/external/fakeroot.m4 +++ b/src/external/fakeroot.m4 @@ -1,2 +1 @@ -AC_CHECK_PROG([HAVE_FAKEROOT], [fakeroot], [true], [false]) -AM_CONDITIONAL([HAVE_FAKEROOT], [$HAVE_FAKEROOT]) +AC_CHECK_PROG([HAVE_FAKEROOT], [fakeroot], [yes], [no]) diff --git a/src/external/intgcheck.m4 b/src/external/intgcheck.m4 index 1f919bd..432e14b 100644 --- a/src/external/intgcheck.m4 +++ b/src/external/intgcheck.m4 @@ -1,23 +1,27 @@ -AC_DEFUN([AM_INTGCHECK_REQ], [ - AM_COND_IF([$1], , [ - AC_MSG_ERROR([cannot enable integration tests: $2 not found]) - ]) +dnl Check for for variable and fail unless value is "yes" +dnl The second argument will be printed in error message in case of error +dnl Usage: +dnl SSS_INTGCHECK_REQ(variable, message) + +AC_DEFUN([SSS_INTGCHECK_REQ], [ + AS_IF([test x$$1 = xyes], , [ + AC_MSG_ERROR([cannot enable integration tests: $2 not found])]) ]) -AC_DEFUN([AM_ENABLE_INTGCHECK], [ + +AC_DEFUN([SSS_ENABLE_INTGCHECK], [ AC_ARG_ENABLE(intgcheck, - [AS_HELP_STRING([--enable-intgcheck], - [enable integration test support (intgcheck target) [default=no]])], - enable_intgcheck="$enableval", - enable_intgcheck="no") - if test x"$enable_intgcheck" == xyes; then - AM_INTGCHECK_REQ([HAVE_UID_WRAPPER], [uid_wrapper]) - AM_INTGCHECK_REQ([HAVE_NSS_WRAPPER], [nss_wrapper]) - AM_INTGCHECK_REQ([HAVE_SLAPD], [slapd]) - AM_INTGCHECK_REQ([HAVE_LDAPMODIFY], [ldapmodify]) - AM_INTGCHECK_REQ([HAVE_FAKEROOT], [fakeroot]) - AM_INTGCHECK_REQ([HAVE_PYTHON2], [python2]) - AM_INTGCHECK_REQ([HAVE_PYTEST], [pytest]) - AM_INTGCHECK_REQ([HAVE_PY2MOD_LDAP], [python-ldap]) + [AS_HELP_STRING([--enable-intgcheck], + [enable integration test support (intgcheck target) [default=no]])], + [enable_intgcheck="$enableval"], + [enable_intgcheck="no"]) + if test x"$enable_intgcheck" = xyes; then + SSS_INTGCHECK_REQ([HAVE_UID_WRAPPER], [uid_wrapper]) + SSS_INTGCHECK_REQ([HAVE_NSS_WRAPPER], [nss_wrapper]) + SSS_INTGCHECK_REQ([HAVE_SLAPD], [slapd]) + SSS_INTGCHECK_REQ([HAVE_LDAPMODIFY], [ldapmodify]) + SSS_INTGCHECK_REQ([HAVE_FAKEROOT], [fakeroot]) + SSS_INTGCHECK_REQ([HAVE_PYTHON2], [python2]) + SSS_INTGCHECK_REQ([HAVE_PYTEST], [pytest]) + SSS_INTGCHECK_REQ([HAVE_PY2MOD_LDAP], [python-ldap]) fi - AM_CONDITIONAL([ENABLE_INTGCHECK], [test x"$enable_intgcheck" == xyes]) ]) diff --git a/src/external/ldap.m4 b/src/external/ldap.m4 index be71f4c..33feb97 100644 --- a/src/external/ldap.m4 +++ b/src/external/ldap.m4 @@ -93,6 +93,5 @@ LIBS=$SAVE_LIBS AC_PATH_PROG([SLAPD], [slapd], , [$PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR]) AC_SUBST([SLAPD]) -AM_CONDITIONAL([HAVE_SLAPD], [test x"$SLAPD" != x]) -AC_CHECK_PROG([HAVE_LDAPMODIFY], [ldapmodify], [true], [false]) -AM_CONDITIONAL([HAVE_LDAPMODIFY], [$HAVE_LDAPMODIFY]) +AS_IF([test -n "$SLAPD"], [HAVE_SLAPD=yes], [HAVE_SLAPD=no]) +AC_CHECK_PROG([HAVE_LDAPMODIFY], [ldapmodify], [yes], [no]) diff --git a/src/external/pytest.m4 b/src/external/pytest.m4 index 00f28e5..2d7c0dd 100644 --- a/src/external/pytest.m4 +++ b/src/external/pytest.m4 @@ -1,3 +1,2 @@ AC_PATH_PROG([PYTEST], [py.test]) -AC_SUBST([PYTEST]) -AM_CONDITIONAL([HAVE_PYTEST], [test x"$PYTEST" != x]) +AS_IF([test -n "$PYTEST"], [HAVE_PYTEST=yes], [HAVE_PYTEST=no])