From f805392012ce1932243bf2c33f8b745fec09f488 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Sat, 12 Jun 2010 00:44:29 +0200 Subject: [PATCH 1/1] * configure.ac: Check for docbook2x-man. * Makefile.am: Build radsecproxy.conf.5 only if docbook2x-man exists. --- Makefile.am | 6 +++++- configure.ac | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index c7d3f49..098f9bd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -44,10 +44,14 @@ radsecproxy_LDADD = @SSL_LIBS@ catgconf_CFLAGS = -g -Wall -fno-strict-aliasing @TARGET_CFLAGS@ catgconf_LDFLAGS = @TARGET_LDFLAGS@ -dist_man_MANS = radsecproxy.1 radsecproxy.conf.5 +dist_man_MANS = radsecproxy.1 $(GENMANPAGES) EXTRA_DIST = LICENSE radsecproxy.conf-example radsecproxy.conf.5.xml \ tools/naptr-eduroam.sh tools/radsec-dynsrv.sh tools/README +if HAVE_DOCBOOK2X_MAN +GENMANPAGES = radsecproxy.conf.5 +endif + radsecproxy.conf.5: $(srcdir)/radsecproxy.conf.5.xml docbook2x-man $< diff --git a/configure.ac b/configure.ac index d4ba292..9bbbda3 100644 --- a/configure.ac +++ b/configure.ac @@ -81,6 +81,10 @@ if test "x$dtls" = "xyes" ; then TARGET_CFLAGS="$TARGET_CFLAGS -DRADPROT_DTLS" fi +AC_ARG_VAR([DOCBOOK2X_MAN], [docbook2x-man]) +AC_CHECK_PROG([DOCBOOK2X_MAN], [docbook2x-man], [yes]) +AM_CONDITIONAL(HAVE_DOCBOOK2X_MAN, test "$DOCBOOK2X_MAN" = "yes") + AC_SUBST(TARGET_CFLAGS) AC_SUBST(TARGET_LDFLAGS) AX_CHECK_SSL -- 2.1.4