Add ABI version to RUBY_LIB_VERSION

This commit adds the ABI version as build metadata to
RUBY_LIB_VERSION. This will ensure that gems are installed in a path
with the ABI version.

tool/mkconfig.rb

@@ -229,15 +229,6 @@ end
   print "  CONFIG[#{v.dump}] = #{(versions[v]||vars[v]).dump}\n"
 end
 
-# Get the ABI version
-File.foreach(File.join(srcdir, "include/ruby/internal/abi.h")) do |l|
-  m = /^\s*#\s*define\s+RUBY_ABI_VERSION\s+(\d+)/.match(l)
-  if m
-    print "  CONFIG[\"ruby_abi_version\"] = \"#{m[1]}\"\n"
-    break
-  end
-end
-
 dest = drive ? %r'= "(?!\$[\(\{])(?i:[a-z]:)' : %r'= "(?!\$[\(\{])'
 v_disabled = {}
 v_others.collect! do |x|

version.h

@@ -18,6 +18,7 @@
 #define RUBY_RELEASE_DAY 24
 
 #include "ruby/version.h"
+#include "ruby/internal/abi.h"
 
 #ifndef TOKEN_PASTE
 #define TOKEN_PASTE(x,y) x##y
@@ -39,9 +40,11 @@
 
 #if !defined RUBY_LIB_VERSION && defined RUBY_LIB_VERSION_STYLE
 # if RUBY_LIB_VERSION_STYLE == 3
-#   define RUBY_LIB_VERSION STRINGIZE(RUBY_API_VERSION_MAJOR)"."STRINGIZE(RUBY_API_VERSION_MINOR)"."STRINGIZE(RUBY_API_VERSION_TEENY)
+#   define RUBY_LIB_VERSION STRINGIZE(RUBY_API_VERSION_MAJOR)"."STRINGIZE(RUBY_API_VERSION_MINOR) \
+        "."STRINGIZE(RUBY_API_VERSION_TEENY)"+"STRINGIZE(RUBY_ABI_VERSION)
 # elif RUBY_LIB_VERSION_STYLE == 2
-#   define RUBY_LIB_VERSION STRINGIZE(RUBY_API_VERSION_MAJOR)"."STRINGIZE(RUBY_API_VERSION_MINOR)
+#   define RUBY_LIB_VERSION STRINGIZE(RUBY_API_VERSION_MAJOR)"."STRINGIZE(RUBY_API_VERSION_MINOR) \
+    "+"STRINGIZE(RUBY_ABI_VERSION)
 # endif
 #endif