From: Pierre Labastie <pierre.labastie@neuf.fr>
Date: Tue, 15 Nov 2022 08:03:54 +0000 (+0100)
Subject: Fix php install for SWIG-4.0.1
X-Git-Tag: 7.0.2~6^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a365b50b6872a3986d2dc5670cef5f51fcfc296;p=graphviz

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 70add55ce..514c8de82 100644
--- 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 7f28f56b0..707812dfa 100644
--- 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 \