Message ID | 29b3fdcb-afbc-b3b3-41c3-825f778ccecd@jp.fujitsu.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 2018年04月11日 16:29, Misono Tomohiro wrote: > AC_PATH_PROG won't fail even if it fails to find command path. > xmlto is required for document build and we should report error > if it doesn't exist at configure time. > > Signed-off-by: Tomohiro Misono <misono.tomohiro@jp.fujitsu.com> Looks good. Reviewed-by: Qu Wenruo <wqu@suse.com> Thanks, Qu > --- > configure.ac | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/configure.ac b/configure.ac > index af13a959..a4c98b31 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -93,7 +93,11 @@ AC_SUBST([DISABLE_DOCUMENTATION]) > dnl detect tools to build documentation > ASCIIDOC_TOOL="none" > if test "x$enable_documentation" = xyes; then > - AC_PATH_PROG([XMLTO], [xmlto], [xmlto]) > + AC_PATH_PROG([XMLTO], [xmlto]) > + if test -z "$XMLTO"; then > + AC_MSG_ERROR([cannot find xmlto, cannot build documentation]) > + fi > + > AC_PATH_PROG([GZIP], [gzip], [gzip]) > AC_PATH_PROG([MV], [mv], [mv]) > AC_PROG_SED > -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Apr 11, 2018 at 05:29:00PM +0900, Misono Tomohiro wrote: > AC_PATH_PROG won't fail even if it fails to find command path. > xmlto is required for document build and we should report error > if it doesn't exist at configure time. > > Signed-off-by: Tomohiro Misono <misono.tomohiro@jp.fujitsu.com> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/configure.ac b/configure.ac index af13a959..a4c98b31 100644 --- a/configure.ac +++ b/configure.ac @@ -93,7 +93,11 @@ AC_SUBST([DISABLE_DOCUMENTATION]) dnl detect tools to build documentation ASCIIDOC_TOOL="none" if test "x$enable_documentation" = xyes; then - AC_PATH_PROG([XMLTO], [xmlto], [xmlto]) + AC_PATH_PROG([XMLTO], [xmlto]) + if test -z "$XMLTO"; then + AC_MSG_ERROR([cannot find xmlto, cannot build documentation]) + fi + AC_PATH_PROG([GZIP], [gzip], [gzip]) AC_PATH_PROG([MV], [mv], [mv]) AC_PROG_SED
AC_PATH_PROG won't fail even if it fails to find command path. xmlto is required for document build and we should report error if it doesn't exist at configure time. Signed-off-by: Tomohiro Misono <misono.tomohiro@jp.fujitsu.com> --- configure.ac | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)