From efc4769339d42a4a399c040c146cf4a29c02ea4f Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Tue, 27 Mar 2018 09:53:42 +0900
Subject: doc: Support cross compilation for yat2m.

* configure.ac (HAVE_YAT2M): New.
* doc/Makefile.am [CROSS_COMPILING]: Supported.

--

Makefile portability is also improved.

Fixes-commit: 4dc6d4d2067c726cdb13593bf151637319ff65e6
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
---
 configure.ac    | 11 +++--------
 doc/Makefile.am | 21 +++++++++++++++++++--
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8d11998..0214fb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,7 +80,6 @@ AM_PROG_CC_C_O
 AC_PROG_CPP
 AC_PROG_AWK
 AC_CHECK_TOOL(AR, ar, :)
-AC_ARG_VAR(YAT2M, [tool to convert texi to man pages])
 AC_GNU_SOURCE
 
 # Set some variables depending on the platform for later use.
@@ -139,13 +138,9 @@ fi
 AC_MSG_RESULT($CC_FOR_BUILD)
 AC_ARG_VAR(CC_FOR_BUILD,[build system C compiler])
 
-AC_PATH_PROG(YAT2M, yat2m, ./yat2m)
-if test "$cross_compiling" = "yes" -a ac_cv_path_YAT2M = "./yat2m"; then
-   AC_MSG_ERROR([[
-***
-*** yat2m is not installed on this build system.  Please install.
-***]])
-fi
+AC_PATH_PROG(YAT2M, yat2m)
+AC_ARG_VAR(YAT2M, [tool to convert texi to man pages])
+AM_CONDITIONAL(HAVE_YAT2M, test -n "$ac_cv_path_YAT2M")
 
 AH_BOTTOM([
 /* Force using of NLS for W32 even if no libintl has been found.  This is
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 328089a..d1b494d 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -37,15 +37,32 @@ myman_pages   = gpg-error-config.1
 
 man_MANS = $(myman_pages)
 
+if HAVE_YAT2M
+YAT2M_CMD = $(YAT2M)
+YAT2M_DEP = $(YAT2M)$(EXEEXT)
+else
+if CROSS_COMPILING
+YAT2M_CMD = ./yat2m-for-build
+YAT2M_DEP = yat2m-for-build$(EXEEXT)
+CLEANFILES += yat2m-for-build$(EXEEXT)
+
+yat2m-for-build$(EXEEXT): yat2m.c
+	$(CC_FOR_BUILD) -o $@ $(srcdir)/yat2m.c
+else
+YAT2M_CMD = ./yat2m
+YAT2M_DEP = yat2m$(EXEEXT)
+endif
+endif
+
 yat2m-stamp: $(myman_sources)
 	@rm -f yat2m-stamp.tmp
 	@touch yat2m-stamp.tmp
 	for file in $(myman_sources) ; do \
-              $(YAT2M) $(YAT2M_OPTIONS) --store \
+              $(YAT2M_CMD) $(YAT2M_OPTIONS) --store \
 	          `test -f '$$file' || echo '$(srcdir)/'`$$file ; done
 	@mv -f yat2m-stamp.tmp $@
 
-yat2m-stamp: $(YAT2M)
+yat2m-stamp: $(YAT2M_DEP)
 
 $(myman_pages) : yat2m-stamp
 	@if test -f $@; then :; else \
-- 
cgit v1.2.3