From 88bc95fd673863518792a8b662245ce26ff55253 Mon Sep 17 00:00:00 2001 From: Dennis Schridde Date: Tue, 2 Oct 2012 02:16:00 +0200 Subject: [PATCH] Check for presence of a2x (from asciidoc) in configure and use path in Makefile --- Makefile.am | 2 +- configure.ac | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index fcc9bfc..44920e0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,7 +35,7 @@ EXTRA_DIST = doc/lsyncd.1.txt inotify.c fsevents.c bin2carray.lua \ default.lua default-rsync.lua default-rsyncssh.lua default-direct.lua doc/lsyncd.1: doc/lsyncd.1.txt - a2x --format=manpage $< + $(A2X) --format=manpage $< CLEANFILES = runner.out defaults.out runner.c defaults.c diff --git a/configure.ac b/configure.ac index a58625e..254d164 100644 --- a/configure.ac +++ b/configure.ac @@ -5,11 +5,17 @@ AC_INIT(lsyncd, 2.0.7, axkibe@gmail.com) AC_CONFIG_SRCDIR([lsyncd.c]) AC_CONFIG_HEADER([config.h]) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) + # Checks for programs. AC_PROG_CC AC_PROG_INSTALL AC_PROG_MAKE_SET +AC_PATH_PROG([A2X], [a2x], [no]) +if test x${A2X} = xno ; then + AC_MSG_ERROR([Program 'a2x' (package asciidoc) is required]) +fi + ### # Checks for lua PKG_CHECK_MODULES([LUA], [lua5.1 >= 5.1.3],,[