Add simplifications and adjustments

- Separate M4 macro removed (EXTRA_LIBS and ZEND_EXTRA_LIBS directly
  used in template)
- Generated files added to 'make distclean' command for removal
- Installation log texts adjusted according to current context
- In templates PHP_THREAD_SAFETY used instead of ZEND_ZTS

Author: petk

build/Makefile.global

@@ -131,6 +131,7 @@ distclean: clean
 	rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 sapi/phpdbg/phpdbg.1 ext/phar/phar.1 ext/phar/phar.phar.1
 	rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html
 	rm -f ext/phar/phar.phar ext/phar/phar.php
+	rm -f scripts/php.pc sapi/embed/php-embed.pc
 	if test "$(srcdir)" != "$(builddir)"; then \
 	  rm -f ext/phar/phar/phar.inc; \
 	fi

build/php.m4

@@ -2536,19 +2536,3 @@ AS_VAR_IF([php_var], [yes],
     [Define to 1 if the compiler supports the '$1' variable attribute.])])
 AS_VAR_POPDEF([php_var])
 ])
-
-dnl
-dnl PHP_PKG_CONFIG
-dnl
-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_PKG_CONFIG],
-[PHP_LIBS_PRIVATE=$EXTRA_LIBS
-AS_VAR_SET_IF([ZEND_EXTRA_LIBS],
-  [AS_VAR_APPEND([PHP_LIBS_PRIVATE], [" $ZEND_EXTRA_LIBS"])])
-AC_SUBST([PHP_LIBS_PRIVATE])
-AC_SUBST([ZEND_DEBUG])
-AC_SUBST([ZEND_ZTS])
-])

configure.ac

@@ -1328,8 +1328,6 @@ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LDFLAGS"
 EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $LDFLAGS"
 unset LDFLAGS
 
-PHP_PKG_CONFIG
-
 AC_ARG_PROGRAM
 
 AS_VAR_IF([prefix], [NONE], [prefix=/usr/local])
@@ -1433,6 +1431,8 @@ AC_SUBST([SAPI_LIBNAME_STATIC])
 AC_SUBST([PHP_VERSION])
 AC_SUBST([PHP_VERSION_ID])
 AC_SUBST([PHP_LDFLAGS])
+AC_SUBST([PHP_THREAD_SAFETY])
+AC_SUBST([ZEND_DEBUG])
 
 PHP_UTILIZE_RPATHS
 
@@ -1495,7 +1495,7 @@ PHP_SUBST_OLD([EXTENSION_DIR])
 PHP_SUBST([EXTRA_LDFLAGS])
 PHP_SUBST([EXTRA_LDFLAGS_PROGRAM])
 PHP_SUBST_OLD([EXTRA_LIBS])
-PHP_SUBST([ZEND_EXTRA_LIBS])
+PHP_SUBST_OLD([ZEND_EXTRA_LIBS])
 PHP_SUBST([INCLUDES])
 PHP_SUBST([EXTRA_INCLUDES])
 PHP_SUBST([INSTALL_IT])

sapi/embed/Makefile.frag

@@ -1,4 +1,4 @@
 install-embed:
-	@echo "Installing PHP Embed SAPI:         $(INSTALL_ROOT)$(libdir)"
+	@echo "Installing PHP Embed .pc file:    $(INSTALL_ROOT)$(orig_libdir)/pkgconfig/"
 	@$(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/config.m4

@@ -31,7 +31,9 @@ if test "$PHP_EMBED" != "no"; then
   AC_MSG_RESULT([$PHP_EMBED_TYPE])
   AC_SUBST([PHP_EMBED_TYPE])
 
-  PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/embed/Makefile.frag], [$abs_srcdir/sapi/embed], [$abs_builddir/sapi/embed])
+  PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/embed/Makefile.frag],
+    [$abs_srcdir/sapi/embed],
+    [$abs_builddir/sapi/embed])
   PHP_OUTPUT([sapi/embed/php-embed.pc])
 
   install_embed=install-embed

sapi/embed/php-embed.pc.in

@@ -24,13 +24,13 @@ 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).
-php_zts=@ZEND_ZTS@
+php_zts=@PHP_THREAD_SAFETY@
 
 Name: PHP Embed SAPI
 Description: A lightweight SAPI to embed PHP into application using C bindings
 URL: https://www.php.net
 License: PHP
 Version: @PHP_VERSION@
 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.private: @EXTRA_LIBS@ @ZEND_EXTRA_LIBS@
 Libs: -L${libdir} -lphp

scripts/Makefile.frag

@@ -46,7 +46,7 @@ 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)$(orig_libdir)/pkgconfig/php.pc"
+	@echo "Installing PHP .pc file:          $(INSTALL_ROOT)$(orig_libdir)/pkgconfig/"
 	@$(mkinstalldirs) $(INSTALL_ROOT)$(orig_libdir)/pkgconfig
 	@$(INSTALL_DATA) $(builddir)/php.pc $(INSTALL_ROOT)$(orig_libdir)/pkgconfig/$(program_prefix)php$(program_suffix).pc
 

scripts/php.pc.in

@@ -24,13 +24,13 @@ 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).
-php_zts=@ZEND_ZTS@
+php_zts=@PHP_THREAD_SAFETY@
 
 Name: PHP
 Description: Build extension for a PHP general-purpose scripting language
 URL: https://www.php.net
 License: PHP
 Version: @PHP_VERSION@
 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.private: @EXTRA_LIBS@ @ZEND_EXTRA_LIBS@
 Libs: