Fix php install for SWIG-4.0.1

This version of SWIG does not generate gv.php anymore, so
installing it shouldn't be tried. The autotools framework is
already there, so just use a conditional in Makefile.am.

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70add55ce0c269f20ed82426aff8ce6c2351959f..514c8de82a7dc28c844903d1fc04a77f7c71c073 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   arguably a regression in Graphviz 6.0.1. #2307
 - The CMake build system’s interactions with a Zlib installed in a non-system
   location has been improved.
+- Do not try to install `gv.php` if using SWIG-4.1.0. Complete #2277, #2303
 
 ## [7.0.1] – 2022-11-09
 

diff --git a/tclpkg/Makefile.am b/tclpkg/Makefile.am
index 7f28f56b025f9be4019f87006ef7b70837110cc7..707812dfa68aefca09a0ea329a5a52f218d37dd0 100644 (file)
--- a/tclpkg/Makefile.am
+++ b/tclpkg/Makefile.am
@@ -63,6 +63,7 @@ if WITH_PHP
                echo "Warning: $(PHP_INSTALL_DIR) is not writable."; \
                echo "Skipping system installation of php binding."; \
        fi
+if WITH_SWIG_PHP_DATA
        -mkdir -p $(DESTDIR)$(PHP_INSTALL_DATADIR);
        if test -w $(DESTDIR)$(PHP_INSTALL_DATADIR); then \
                (cd $(DESTDIR)$(PHP_INSTALL_DATADIR); \
@@ -72,6 +73,7 @@ if WITH_PHP
                echo "Skipping system installation of php binding."; \
        fi
 endif
+endif
 if WITH_PYTHON
        -mkdir -p $(DESTDIR)$(PYTHON_INSTALL_DIR);
        if test -w $(DESTDIR)$(PYTHON_INSTALL_DIR); then \