From 014e113a7965ea79eab16c1dbdc91c899cf5c448 Mon Sep 17 00:00:00 2001 From: Debian PHP Maintainers Date: Sat, 2 May 2015 10:26:56 +0200 Subject: [PATCH] expose_all_built_and_installed_apis Gbp-Pq: Name 0020-expose_all_built_and_installed_apis.patch --- scripts/man1/php-config.1.in | 2 +- scripts/php-config.in | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/man1/php-config.1.in b/scripts/man1/php-config.1.in index 8ccd1716..04a32907 100644 --- a/scripts/man1/php-config.1.in +++ b/scripts/man1/php-config.1.in @@ -44,7 +44,7 @@ Full path to php CLI or CGI binary .TP .PD 0 .B \-\-php-sapis -Show all SAPI modules available +Show all SAPI modules installed on the Debian system .TP .PD 0 .B \-\-configure-options diff --git a/scripts/php-config.in b/scripts/php-config.in index cac95acc..45a07597 100644 --- a/scripts/php-config.in +++ b/scripts/php-config.in @@ -18,11 +18,14 @@ exe_extension="@EXEEXT@" php_cli_binary=NONE php_cgi_binary=NONE configure_options="@CONFIGURE_OPTIONS@" -php_sapis="@PHP_INSTALLED_SAPIS@" +#php_sapis="@PHP_INSTALLED_SAPIS@" phpapi="@DEBIAN_PHP_API@" ini_dir="@EXPANDED_PHP_CONFIG_FILE_SCAN_DIR@" ini_path="@EXPANDED_PHP_CONFIG_FILE_PATH@" +# Query the dpkg database for available PHP sapis +php_sapis=$(dpkg-query -W -f='${Package} ' libapache2-mod-php${program_suffix} php${program_suffix}-cgi php${program_suffix}-cli php${program_suffix}-fpm libphp${program_suffix}-embed php${program_suffix}-phpdbg 2>/dev/null | sed -e "s|libapache2-mod-php${program_suffix}|apache2handler|;s|php${program_suffix}-cgi|cgi|;s|php${program_suffix}-cli|cli|;s|php${program_suffix}-fpm|fpm|;s|libphp${program_suffix}-embed|embed|;s|php${program_suffix}-phpdbg|phpdbg|;") + # Set php_cli_binary and php_cgi_binary if available for sapi in $php_sapis; do case $sapi in -- 2.30.2