Support db2x_docbook2man for man page compilation (#188)

diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt
index ac540beaef0e143971e48f5392250ef31b29b104..c06749f205ca23fac87f427c2ea8caf773e6aa11 100644 (file)
--- a/expat/CMakeLists.txt
+++ b/expat/CMakeLists.txt
@@ -20,7 +20,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 docbook-to-man)\r
+    find_program(DOCBOOK_TO_MAN NAMES docbook2x-man db2x_docbook2man 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 00f8dd8a033a4ffc70eff71108ba921d7a68e31b..7c1e52491054c44a47885d23f8fbd33cbed2d95a 100644 (file)
--- a/expat/Changes
+++ b/expat/Changes
@@ -13,6 +13,7 @@ Release 2.2.? ???????????????????
                     file systems
             #181  Autotools: Drop -rpath option passed to libtool
             #188  Autotools: Detect and deny SGML docbook2man as ours is XML
+            #188  Autotools/CMake: Support command db2x_docbook2man as well
             #174  CMake: Introduce option WARNINGS_AS_ERRORS, defaults to OFF
        #184 #185  CMake: Introduce option MSVC_USE_STATIC_CRT, defaults to OFF
             #175  CMake: Prefer check_symbol_exists over check_function_exists

diff --git a/expat/configure.ac b/expat/configure.ac
index a0992c92d78c61d5f4a0ddcb70ba1de44591f3b3..4f4014225d9c13fd04ce8a3950756927b47de3b9 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 docbook-to-man])])
+  [AC_CHECK_PROGS([DOCBOOK_TO_MAN], [docbook2x-man db2x_docbook2man docbook2man docbook-to-man])])
 AS_IF([test "x${DOCBOOK_TO_MAN}" = x -a "x$with_docbook" = xyes],
   [AC_MSG_ERROR([Required program 'docbook2x-man' not found.])])
 AS_IF([${DOCBOOK_TO_MAN} --help | grep -i -q -F sgmlbase],