From 0b89eda3985d50bfd54b3876715c0ef02ab740d1 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Wed, 12 Oct 2022 19:53:40 +0900 Subject: [PATCH] Abandon when libyaml is not found --- ext/psych/extconf.rb | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/ext/psych/extconf.rb b/ext/psych/extconf.rb index 24173567..afae0860 100644 --- a/ext/psych/extconf.rb +++ b/ext/psych/extconf.rb @@ -7,14 +7,6 @@ end yaml_source = with_config("libyaml-source-dir") -unless yaml_source # default to pre-installed libyaml - pkg_config('yaml-0.1') - dir_config('libyaml') - unless find_header('yaml.h') && find_library('yaml', 'yaml_get_version') - yaml_source = true # fallback to the bundled source if exists - end -end - if yaml_source yaml_source = yaml_source.gsub(/\$\((\w+)\)|\$\{(\w+)\}/) {ENV[$1||$2]} yaml_source = yaml_source.chomp("/") @@ -44,6 +36,11 @@ libyaml = "libyaml.#$LIBEXT" $cleanfiles << libyaml $LOCAL_LIBS.prepend("$(LIBYAML) ") +else # default to pre-installed libyaml + pkg_config('yaml-0.1') + dir_config('libyaml') + find_header('yaml.h') or abort "yaml.h not found" + find_library('yaml', 'yaml_get_version') or "libyaml not found" end create_makefile 'psych' do |mk|