From 0f5186c7b8e503c669e332d944712de010b265f3 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Fri, 27 Oct 2017 19:46:18 +0200 Subject: [PATCH] Support docbook-to-man command, e.g. for openSUSE (#153) --- expat/CMakeLists.txt | 2 +- expat/Changes | 1 + expat/configure.ac | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt index 9a9df09a..292726e0 100644 --- a/expat/CMakeLists.txt +++ b/expat/CMakeLists.txt @@ -18,7 +18,7 @@ endif() if(MSVC OR NOT BUILD_tools_default) set(BUILD_doc_default OFF) else() - find_program(DOCBOOK_TO_MAN NAMES docbook2x-man docbook2man) + find_program(DOCBOOK_TO_MAN NAMES docbook2x-man docbook2man docbook-to-man) if(DOCBOOK_TO_MAN) set(BUILD_doc_default ON) else() diff --git a/expat/Changes b/expat/Changes index e695ab86..b5a6ff85 100644 --- a/expat/Changes +++ b/expat/Changes @@ -39,6 +39,7 @@ Release 2.2.5 ??????????????????? Benbuck Nason Hans Wennborg José Gutiérrez de la Concha + Pedro Monreal Gonzalez Rhodri James Rolf Ade Stephen Groat diff --git a/expat/configure.ac b/expat/configure.ac index fbfd2498..3d12085e 100644 --- a/expat/configure.ac +++ b/expat/configure.ac @@ -237,7 +237,7 @@ AS_HELP_STRING([--without-docbook], AC_ARG_VAR([DOCBOOK_TO_MAN], [docbook2x-man command]) AS_IF([test "x$with_docbook" != xno], - [AC_CHECK_PROGS([DOCBOOK_TO_MAN], [docbook2x-man docbook2man], + [AC_CHECK_PROGS([DOCBOOK_TO_MAN], [docbook2x-man docbook2man docbook-to-man], [if test "x$with_docbook" != xcheck; then AC_MSG_ERROR([Required program 'docbook2x-man' not found.])])])