only do have_header checks if we are embedding libyaml

1 files changed, 16 insertions, 14 deletions

diff --git a/ext/psych/extconf.rb b/ext/psych/extconf.rb
index 5bef73d..dc4b3f6 100644
--- a/ext/psych/extconf.rb
+++ b/ext/psych/extconf.rb
@@ -5,21 +5,8 @@ require 'fileutils'
 
 dir_config 'libyaml'
 
-have_header 'dlfcn.h'
-have_header 'inttypes.h'
-have_header 'memory.h'
-have_header 'stdint.h'
-have_header 'stdlib.h'
-have_header 'strings.h'
-have_header 'string.h'
-have_header 'sys/stat.h'
-have_header 'sys/types.h'
-have_header 'unistd.h'
-
 unless find_header('yaml.h') && find_library('yaml', 'yaml_get_version')
-  if $mswin
-    $CFLAGS += " -DYAML_DECLARE_STATIC -DHAVE_CONFIG_H"
-  end
+  # Embed libyaml since we could not find it.
 
   srcdir = File.expand_path File.dirname __FILE__
   files = Dir.chdir File.join(srcdir, 'yaml') do
@@ -30,6 +17,21 @@ unless find_header('yaml.h') && find_library('yaml', 'yaml_get_version')
 
   FileUtils.cp_r files, srcdir
 
+  if $mswin
+    $CFLAGS += " -DYAML_DECLARE_STATIC -DHAVE_CONFIG_H"
+  end
+
+  have_header 'dlfcn.h'
+  have_header 'inttypes.h'
+  have_header 'memory.h'
+  have_header 'stdint.h'
+  have_header 'stdlib.h'
+  have_header 'strings.h'
+  have_header 'string.h'
+  have_header 'sys/stat.h'
+  have_header 'sys/types.h'
+  have_header 'unistd.h'
+
   find_header 'yaml.h'
   have_header 'config.h'
 end