From d7a76c6b6460efa26c690aaa97a1843c9391d19f Mon Sep 17 00:00:00 2001
From: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue, 13 Dec 2022 23:17:48 +0000
Subject: [PATCH] Cygwin: configure: Add option to disable building 'dumper'

Rather than guessing, based on just the presence of libbfd, add an
explicit configuration option, to build dumper or not, defaulting to
building it.

This might have some use when bootstrapping Cygwin for a new
architecture, or when building your own Cygwin-targetted cross-compiler,
rather than installing one from the copr, along with the dependencies of
libbfd.

(cherry picked from commit 1b5fc91a1daa90fb955f57937f4590c5079dd161)
---
 winsup/configure.ac            |  8 +++++---
 winsup/doc/faq-programming.xml | 10 ++++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/winsup/configure.ac b/winsup/configure.ac
index 49a8346fa..132028d0d 100644
--- a/winsup/configure.ac
+++ b/winsup/configure.ac
@@ -111,10 +111,12 @@ AM_CONDITIONAL(CROSS_BOOTSTRAP, [test "x$with_cross_bootstrap" != "xyes"])
 
 AC_EXEEXT
 
-AC_CHECK_LIB([bfd], [bfd_init], [true],
-	     AC_MSG_WARN([Not building dumper.exe since some required libraries or headers are missing]))
+AC_ARG_ENABLE([dumper],
+	      [AS_HELP_STRING([--disable-dumper], [do not build the 'dumper' utility])],
+	      [build_dumper=$enableval],
+	      [build_dumper=yes])
 
-AM_CONDITIONAL(BUILD_DUMPER, [test "x$ac_cv_lib_bfd_bfd_init" = "xyes"])
+AM_CONDITIONAL(BUILD_DUMPER, [test "x$build_dumper" = "xyes"])
 
 # libbfd.a doesn't have a pkgconfig file, so we guess what it's dependencies
 # are, based on what's present in the build environment
diff --git a/winsup/doc/faq-programming.xml b/winsup/doc/faq-programming.xml
index d23f32c3a..478cf997f 100644
--- a/winsup/doc/faq-programming.xml
+++ b/winsup/doc/faq-programming.xml
@@ -679,8 +679,14 @@ rewriting the runtime library in question from specs...
 installed; you at least need <literal>gcc-g++</literal>,
 <literal>make</literal>, <literal>automake</literal>,
 <literal>autoconf</literal>, <literal>git</literal>, <literal>perl</literal>,
-<literal>gettext-devel</literal>, <literal>libiconv-devel</literal>, <literal>libzstd-devel</literal>,
-<literal>zlib-devel</literal>, <literal>cocom</literal> and <literal>patch</literal>.
+<literal>cocom</literal> and <literal>patch</literal>.
+</para>
+
+<para>
+Additionally, building the <code>dumper</code> utility requires
+<literal>gettext-devel</literal>, <literal>libiconv-devel</literal>, <literal>libzstd-devel</literal> and
+<literal>zlib-devel</literal>.  Building this program can be disabled with the
+<literal>--disable-dumper</literal> option to <literal>configure</literal>.
 </para>
 
 <para>
-- 
2.43.5