VERSION_INFO["libxml"]["source"] now indicates whether libxml2 comes …

…from "system" or "packaged" libraries.
sparklemotion · Apr 14, 2013 · e811c08 · e811c08
1 parent b79a4fe
commit e811c08
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/ext/nokogiri/extconf.rb b/ext/nokogiri/extconf.rb
@@ -138,6 +138,8 @@
     $LDFLAGS << " -Wl,-rpath,#{libxml2_recipe.path}/lib"
     $LDFLAGS << " -Wl,-rpath,#{libxslt_recipe.path}/lib"
 
+    $CFLAGS << " -DNOKOGIRI_USE_PACKAGED_LIBRARIES"
+
     HEADER_DIRS = [libxml2_recipe, libxslt_recipe].map { |_| File.join(_.path, "include") }
     LIB_DIRS = [libxml2_recipe, libxslt_recipe].map { |_| File.join(_.path, "lib") }
     XML2_HEADER_DIRS = HEADER_DIRS + [File.join(libxml2_recipe.path, "include", "libxml2")]

diff --git a/ext/nokogiri/nokogiri.c b/ext/nokogiri/nokogiri.c
@@ -90,6 +90,12 @@ void Init_nokogiri()
                 NOKOGIRI_STR_NEW2(xmlParserVersion)
               );
 
+#ifdef NOKOGIRI_USE_PACKAGED_LIBRARIES
+  rb_const_set(mNokogiri, rb_intern("NOKOGIRI_USE_PACKAGED_LIBRARIES"), Qtrue);
+#else
+  rb_const_set(mNokogiri, rb_intern("NOKOGIRI_USE_PACKAGED_LIBRARIES"), Qfalse);
+#endif
+
 #ifdef LIBXML_ICONV_ENABLED
   rb_const_set(mNokogiri, rb_intern("LIBXML_ICONV_ENABLED"), Qtrue);
 #else

diff --git a/lib/nokogiri/version.rb b/lib/nokogiri/version.rb
@@ -25,6 +25,14 @@ def libxml2?
       defined?(LIBXML_VERSION)
     end
 
+    def libxml2_using_system?
+      ! libxml2_using_packaged?
+    end
+
+    def libxml2_using_packaged?
+      NOKOGIRI_USE_PACKAGED_LIBRARIES
+    end
+
     def warnings
       return [] unless libxml2?
 
@@ -49,6 +57,7 @@ def to_hash
       if libxml2?
         hash_info['libxml']              = {}
         hash_info['libxml']['binding']   = 'extension'
+        hash_info['libxml']['source']    = libxml2_using_packaged? ? "packaged" : "system"
         hash_info['libxml']['compiled']  = compiled_parser_version
         hash_info['libxml']['loaded']    = loaded_parser_version
         hash_info['warnings']            = warnings