From: Sebastian Pipping <sebastian@pipping.org>
Date: Thu, 2 Nov 2017 20:59:38 +0000 (+0100)
Subject: Fix configure syntax error (#165)
X-Git-Tag: R_2_2_6~29^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8e3f402efe0dc53fa7e4f5484971d7744902aa51;p=libexpat

Fix configure syntax error (#165)
---

diff --git a/expat/Changes b/expat/Changes
index 5d07aab3..9ac7141c 100644
--- a/expat/Changes
+++ b/expat/Changes
@@ -4,6 +4,7 @@ NOTE: We are looking for help with a few things:
 
 Release 2.2.? ???????????????????
         Other changes:
+            #165  Autotools: Fix docbook-related configure syntax error
             #166  Autotools: Avoid grep option `-q` for Solaris
             #167  Autotools: Support
                     ./configure DOCBOOK_TO_MAN="xmlto man --skip-validation"
diff --git a/expat/configure.ac b/expat/configure.ac
index b4e56dfd..1dab0e75 100644
--- a/expat/configure.ac
+++ b/expat/configure.ac
@@ -237,9 +237,9 @@ 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],
-  [if test "x$with_docbook" != xcheck; then 
-    AC_MSG_ERROR([Required program 'docbook2x-man' not found.])])])
+  [AC_CHECK_PROGS([DOCBOOK_TO_MAN], [docbook2x-man 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.])])
 
 AM_CONDITIONAL(WITH_DOCBOOK, [test "x${DOCBOOK_TO_MAN}" != x])