Fix pkg-config .pc files installation path and substitute missing variables

- Fixes missing extensiondir, php_inidir, php_inipath pkg-config
  variables
- The PHP_CFLAGS_PRIVATE has been for now removed but might be
  reintroduced when possible or when global CFLAGS and CFLAGS_CLEAN will
  be refactored.
- Installation now works and adds it to pkgconfig directory in libdir
- PHP_SET_LIBS_PRIVATE M4 macro renamed to PHP_PKG_CONFIG

Author: petk

build/php.m4

@@ -2538,12 +2538,13 @@ AS_VAR_POPDEF([php_var])
 ])
 
 dnl
-dnl PHP_SET_LIBS_PRIVATE
+dnl PHP_PKG_CONFIG
 dnl
-dnl Get a list of all external libraries that were linked to PHP. For using in
-dnl templates, such as php.pc.in.
+dnl Prepare and substitute variables needed in pkg-config .pc files, such as
+dnl php.pc.in. For example, a list of all external libraries that were linked to
+dnl PHP.
 dnl
-AC_DEFUN([PHP_SET_LIBS_PRIVATE],
+AC_DEFUN([PHP_PKG_CONFIG],
 [PHP_LIBS_PRIVATE=$EXTRA_LIBS
 AS_VAR_SET_IF([ZEND_EXTRA_LIBS],
   [AS_VAR_APPEND([PHP_LIBS_PRIVATE], [" $ZEND_EXTRA_LIBS"])])

configure.ac

@@ -1328,7 +1328,7 @@ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LDFLAGS"
 EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $LDFLAGS"
 unset LDFLAGS
 
-PHP_SET_LIBS_PRIVATE
+PHP_PKG_CONFIG
 
 AC_ARG_PROGRAM
 

sapi/embed/Makefile.frag

@@ -1,4 +1,4 @@
 install-embed:
 	@echo "Installing PHP Embed SAPI:         $(INSTALL_ROOT)$(libdir)"
-	@$(mkinstalldirs) $(INSTALL_ROOT)$(libdir)/pkgconfig
-	@$(INSTALL_DATA) sapi/embed/php-embed.pc $(INSTALL_ROOT)$(libdir)/pkgconfig/$(program_prefix)php-embed$(program_suffix).pc
+	@$(mkinstalldirs) $(INSTALL_ROOT)$(orig_libdir)/pkgconfig
+	@$(INSTALL_DATA) sapi/embed/php-embed.pc $(INSTALL_ROOT)$(orig_libdir)/pkgconfig/$(program_prefix)php-embed$(program_suffix).pc

sapi/embed/php-embed.pc.in

@@ -14,13 +14,13 @@ exec_prefix=@exec_prefix@
 includedir=@includedir@/php
 libdir=@exec_prefix@/lib
 # The extension_dir PHP INI directive absolute path.
-extensiondir=@PHP_EXTENSION_DIR@
+extensiondir=@EXPANDED_EXTENSION_DIR@
 # PHP version as integer.
 php_vernum=@PHP_VERSION_ID@
 # The path where to scan for additional INI configuration files.
-php_inidir=@PHP_CONFIG_FILE_SCAN_DIR@
+php_inidir=@EXPANDED_PHP_CONFIG_FILE_SCAN_DIR@
 # The path in which to look for php.ini.
-php_inipath=@PHP_CONFIG_FILE_PATH@
+php_inipath=@EXPANDED_PHP_CONFIG_FILE_PATH@
 # Whether PHP is built in debug mode (yes) or not (no).
 php_debug=@ZEND_DEBUG@
 # Whether PHP is built with thread safety (yes) or not (no).
@@ -31,7 +31,6 @@ Description: A lightweight SAPI to embed PHP into application using C bindings
 URL: https://www.php.net
 License: PHP
 Version: @PHP_VERSION@
-Cflags.private: @PHP_CFLAGS_PRIVATE@
 Cflags: -I${includedir} -I${includedir}/main -I${includedir}/TSRM -I${includedir}/Zend -I${includedir}/ext -I${includedir}/ext/date/lib
 Libs.private: @PHP_LIBS_PRIVATE@
 Libs: -L${libdir} -lphp

scripts/Makefile.frag

@@ -46,9 +46,9 @@ install-programs: $(builddir)/phpize $(builddir)/php-config
 		echo "  page: $(program_prefix)$${page}$(program_suffix).1"; \
 		$(INSTALL_DATA) $(builddir)/man1/$${page}.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)$${page}$(program_suffix).1; \
 	done
-	@echo "Installing pkgconf .pc file:       $(INSTALL_ROOT)$(libdir)/pkgconfig/php.pc"
-	@$(mkinstalldirs) $(INSTALL_ROOT)$(libdir)/pkgconfig
-	@$(INSTALL_DATA) $(builddir)/php.pc $(INSTALL_ROOT)$(libdir)/pkgconfig/$(program_prefix)php$(program_suffix).pc
+	@echo "Installing pkgconf .pc file:       $(INSTALL_ROOT)$(orig_libdir)/pkgconfig/php.pc"
+	@$(mkinstalldirs) $(INSTALL_ROOT)$(orig_libdir)/pkgconfig
+	@$(INSTALL_DATA) $(builddir)/php.pc $(INSTALL_ROOT)$(orig_libdir)/pkgconfig/$(program_prefix)php$(program_suffix).pc
 
 $(builddir)/phpize: $(srcdir)/phpize.in $(top_builddir)/config.status
 	(CONFIG_FILES=$@ CONFIG_HEADERS= $(top_builddir)/config.status)

scripts/php.pc.in

@@ -14,13 +14,13 @@ exec_prefix=@exec_prefix@
 includedir=@includedir@/php
 libdir=@exec_prefix@/lib
 # The extension_dir PHP INI directive absolute path.
-extensiondir=@PHP_EXTENSION_DIR@
+extensiondir=@EXPANDED_EXTENSION_DIR@
 # PHP version as integer.
 php_vernum=@PHP_VERSION_ID@
 # The path where to scan for additional INI configuration files.
-php_inidir=@PHP_CONFIG_FILE_SCAN_DIR@
+php_inidir=@EXPANDED_PHP_CONFIG_FILE_SCAN_DIR@
 # The path in which to look for php.ini.
-php_inipath=@PHP_CONFIG_FILE_PATH@
+php_inipath=@EXPANDED_PHP_CONFIG_FILE_PATH@
 # Whether PHP is built in debug mode (yes) or not (no).
 php_debug=@ZEND_DEBUG@
 # Whether PHP is built with thread safety (yes) or not (no).
@@ -31,7 +31,6 @@ Description: Build extension for a PHP general-purpose scripting language
 URL: https://www.php.net
 License: PHP
 Version: @PHP_VERSION@
-Cflags.private: @PHP_CFLAGS_PRIVATE@
 CFlags: -I${includedir} -I${includedir}/main -I${includedir}/TSRM -I${includedir}/Zend -I${includedir}/ext -I${includedir}/ext/date/lib
 Libs.private: @PHP_LIBS_PRIVATE@
 Libs: