From b55860cce8d69e7a7cc6cd954fa0fe25a3125d85 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Thu, 3 Jun 2021 23:35:56 +0100
Subject: [PATCH] fix build with doxy disabled

---
 configure.ac          | 6 ++++--
 cplusplus/Makefile.am | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 989f7f07..aa53f7ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1539,13 +1539,15 @@ AC_MSG_RESULT([dnl
 enable debug:                           $enable_debug
 enable deprecated library components:   $enable_deprecated
 enable modules:                         $gmodule_supported_flag
-enable docs with gtkdoc:                $enable_gtk_doc
+enable C docs with gtkdoc:              $enable_gtk_doc
+ (requires gtk-doc 1.14 or later)
 gobject introspection:                  $found_introspection
+ (requires gobject-introspection 1.30 or later)
 RAD load/save:                          $with_radiance
 Analyze7 load/save:                     $with_analyze
 PPM load/save:                          $with_ppm
 GIF load:                               $with_nsgif
-generate C++ docs:                      $with_doxygen
+generate C++ docs with doxygen:         $with_doxygen
 
 ## Optional dependencies
 use fftw3 for FFT:                      $with_fftw
diff --git a/cplusplus/Makefile.am b/cplusplus/Makefile.am
index aec1f2c9..9d23c14f 100644
--- a/cplusplus/Makefile.am
+++ b/cplusplus/Makefile.am
@@ -30,7 +30,6 @@ vips-operators.cpp:
 
 if HAVE_DOXYGEN
 html_DATA = html
-endif
 
 html: doxygen.stamp
 
@@ -44,6 +43,7 @@ install-htmlDATA:
 
 uninstall-htmlDATA:
 	rm -rf $(DESTDIR)$(htmldir)/html
+endif
 
 EXTRA_DIST = \
 	README.md \