Support docbook-to-man command, e.g. for openSUSE (#153)

diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt
index 9a9df09a41a9908ea87137d276889defebcee1c7..292726e01b9e086c9819e65f352546b283a2e4f7 100644 (file)
--- a/expat/CMakeLists.txt
+++ b/expat/CMakeLists.txt
@@ -18,7 +18,7 @@ endif()
 if(MSVC OR NOT BUILD_tools_default)\r
     set(BUILD_doc_default OFF)\r
 else()\r
-    find_program(DOCBOOK_TO_MAN NAMES docbook2x-man docbook2man)\r
+    find_program(DOCBOOK_TO_MAN NAMES docbook2x-man docbook2man docbook-to-man)\r
     if(DOCBOOK_TO_MAN)\r
         set(BUILD_doc_default ON)\r
     else()\r

diff --git a/expat/Changes b/expat/Changes
index e695ab86cc12212657be42f27ab628160eb7a268..b5a6ff85b59cc039a8eef359efdf3a7fc1c8a038 100644 (file)
--- 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 fbfd24987ad1dac5cf18d78b5a2f829ab8d97a98..3d12085e12c8c09ccadbfd3c0095439805686954 100644 (file)
--- 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.])])])