File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -7606,6 +7606,9 @@ $as_echo "$rubyhdrdir" >&6; }
76067606
76077607 if test " $enable_rubyinterp " = " dynamic" ; then
76087608 libruby_soname=` $vi_cv_path_ruby -r rbconfig -e " puts $ruby_rbconfig ::CONFIG['LIBRUBY_ALIASES'].split[0]" `
7609+ if test -z " $libruby_soname " ; then
7610+ libruby_soname=` $vi_cv_path_ruby -r rbconfig -e " puts $ruby_rbconfig ::CONFIG['LIBRUBY_SO']" `
7611+ fi
76097612 $as_echo " #define DYNAMIC_RUBY 1" >> confdefs.h
76107613
76117614 RUBY_CFLAGS=" -DDYNAMIC_RUBY_DLL=\\\" $libruby_soname \\\" -DDYNAMIC_RUBY_VER=$rubyversion $RUBY_CFLAGS "
Original file line number Diff line number Diff line change @@ -1956,6 +1956,9 @@ if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
19561956 AC_DEFINE ( FEAT_RUBY )
19571957 if test "$enable_rubyinterp" = "dynamic"; then
19581958 libruby_soname=`$vi_cv_path_ruby -r rbconfig -e "puts $ruby_rbconfig::CONFIG[ [ 'LIBRUBY_ALIASES'] ] .split[ [ 0] ] "`
1959+ if test -z "$libruby_soname"; then
1960+ libruby_soname=`$vi_cv_path_ruby -r rbconfig -e "puts $ruby_rbconfig::CONFIG[ [ 'LIBRUBY_SO'] ] "`
1961+ fi
19591962 AC_DEFINE ( DYNAMIC_RUBY )
19601963 RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby_soname\\\" -DDYNAMIC_RUBY_VER=$rubyversion $RUBY_CFLAGS"
19611964 RUBY_LIBS=
Original file line number Diff line number Diff line change @@ -794,6 +794,8 @@ static char *(features[]) =
794794
795795static int included_patches [] =
796796{ /* Add new patch number below this line */
797+ /**/
798+ 237 ,
797799/**/
798800 236 ,
799801/**/
You can’t perform that action at this time.
0 commit comments