expose_all_built_and_installed_apis

Gbp-Pq: Name 0020-expose_all_built_and_installed_apis.patch

diff --git a/scripts/man1/php-config.1.in b/scripts/man1/php-config.1.in
index 5ed77c574cb4244149f4a535047fffede013509e..9eba2e2edd9dd6723dd36a6f1318688c2f60272a 100644 (file)
--- 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 cac95acc478a070e93a4de655e97266fb770b049..45a0759743301c74989340ca7921ab101efe73cb 100644 (file)
--- 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