com web/rmtools: fixed ext configure option guessing: client/include/PeclExt.php

Commit: 11f0cc59b39b284a5de91b1c395c7e1d3c018463 Author: Anatol Belski <ab@php.net> Thu, 12 Sep 2013 19:20:08 +0200 Parents: 35a30732baac56d8c35eccfc344e5f4fc6f273d9 Branches: master Link: http://git.php.net/?p=web/rmtools.git;a=commitdiff;h=11f0cc59b39b284a5de91b1c395c7e1d3c018463 Log: fixed ext configure option guessing Changed paths: M client/include/PeclExt.php Diff: diff --git a/client/include/PeclExt.php b/client/include/PeclExt.php index 08e6e6e..15eb4bf 100644 --- a/client/include/PeclExt.php +++ b/client/include/PeclExt.php @@ -61,6 +61,7 @@ class PeclExt foreach (array('ARG_ENABLE', 'ARG_WITH') as $str) { if (preg_match("/$str\s*\(\s*('|\")([a-z0-9_]+)('|\")\s*,/Sm", file_get_contents($config_w32_path), $m)) { $this->name = $m[2]; + break; } } } @@ -326,8 +327,9 @@ class PeclExt $config_w32_path = $this->tmp_extract_path . DIRECTORY_SEPARATOR . 'config.w32'; foreach (array('enable' => 'ARG_ENABLE', 'with' => 'ARG_WITH') as $arg => $str) { - if (preg_match(',' . $str .'.*' . $this->name . ',Sm', file_get_contents($config_w32_path))) { + if (preg_match(',' . $str .'.*' . str_replace('_', '-', $this->name) . ',Sm', file_get_contents($config_w32_path))) { $config['type'] = $arg; + break; } } if (!isset($config['type'])) {