Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 1 addition & 13 deletions configure.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ function usage() // {{{
even if it fails validation [{$acd['FORCE_DOM_SAVE']}]
--enable-chm Enable Windows HTML Help Edition pages [{$acd['CHMENABLED']}]
--enable-xml-details Enable detailed XML error messages [{$acd['DETAILED_ERRORMSG']}]
--disable-segfault-error LIBXML may segfault with broken XML, use this
if it does [{$acd['SEGFAULT_ERROR']}]
--disable-version-files Do not merge the extension specific
version.xml files
--disable-sources-file Do not generate sources.xml file
Expand Down Expand Up @@ -309,7 +307,6 @@ function find_xml_files($path) // {{{
'FORCE_DOM_SAVE' => 'no',
'PARTIAL' => 'no',
'DETAILED_ERRORMSG' => 'no',
'SEGFAULT_ERROR' => 'yes',
'VERSION_FILES' => 'yes',
'SOURCES_FILE' => 'yes',
'HISTORY_FILE' => 'yes',
Expand Down Expand Up @@ -413,10 +410,6 @@ function find_xml_files($path) // {{{
$ac['DETAILED_ERRORMSG'] = $v;
break;

case 'segfault-error':
$ac['SEGFAULT_ERROR'] = $v;
break;

case 'version-files':
$ac['VERSION_FILES'] = $v;
break;
Expand Down Expand Up @@ -543,9 +536,6 @@ function find_xml_files($path) // {{{
checking('whether to enable detailed XML error messages');
checkvalue($ac['DETAILED_ERRORMSG']);

checking('whether to enable detailed error reporting (may segfault)');
checkvalue($ac['SEGFAULT_ERROR']);

if ($ac["GENERATE"] != "no") {
$ac["ONLYDIR"] = dirname(realpath($ac["GENERATE"]));
}
Expand Down Expand Up @@ -611,9 +601,7 @@ function xml_configure()
file_put_contents( __DIR__ . "/temp/manual.conf" , implode( "\n" , $conf ) );
}

if ($ac['SEGFAULT_ERROR'] === 'yes') {
libxml_use_internal_errors(true);
}
libxml_use_internal_errors(true);

globbetyglob("{$ac['basedir']}/scripts", 'make_scripts_executable');

Expand Down
Loading