[Openais] [PATCH corosync] test for augtool before using it in "make check"

[Steven Dake]

good for merge

regards
-steve

On Wed, 2010-04-14 at 11:14 +1000, Angus Salkeld wrote:
> This fixes the freebsd build.
> 
> Signed-off-by: Angus Salkeld <asalkeld at redhat.com>
> ---
>  Makefile.am  |    4 +++-
>  configure.ac |    3 ++-
>  2 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/Makefile.am b/Makefile.am
> index 6d42f61..e2e44e3 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -72,7 +72,7 @@ uninstall-local:
>  	rmdir $(DESTDIR)/${localstatedir}/lib/corosync || :;
>  	rmdir $(DESTDIR)/${SOCKETDIR} || :;
>  
> -
> +if AUGTOOL
>  check_SCRIPTS = test_lense.sh
>  TESTS = $(check_SCRIPTS)
>  
> @@ -80,6 +80,8 @@ test_lense.sh:
>  	echo "augparse -I $(srcdir)/conf/lenses/ $(srcdir)/conf/lenses/tests/test_corosync.aug" > $@
>  	chmod +x $@
>  
> +endif
> +
>  lint:
>  	for dir in lcr lib exec services tools test; do make -C $$dir lint; done
>  
> diff --git a/configure.ac b/configure.ac
> index 66d718f..23a011b 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -64,6 +64,7 @@ AC_PROG_MAKE_SET
>  AC_PROG_RANLIB
>  AC_CHECK_PROGS([GROFF], [groff])
>  AC_CHECK_PROGS([PKGCONFIG], [pkg-config])
> +AC_CHECK_PROGS([AUGTOOL], [augtool])
>  
>  # Checks for libraries.
>  AC_CHECK_LIB([dl], [dlopen])
> @@ -475,7 +476,7 @@ AC_SUBST([OS_DYFLAGS])
>  
>  AC_SUBST([OS_LDL])
>  AM_CONDITIONAL(INSTALL_TESTAGENTS, test -n "${enable_testagents}")
> -
> +AM_CONDITIONAL(AUGTOOL, test -n "${AUGTOOL}")
>  AC_SUBST([NSS_LDFLAGS])
>  
>  AM_CONDITIONAL(BUILD_DARWIN, test -n "${DARWIN_OPTS}")