diff options
author | Bram Moolenaar <Bram@vim.org> | 2010-10-27 16:49:47 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2010-10-27 16:49:47 +0200 |
commit | 3ca71f1f1f6b83e0ec078897959387fca58bdf55 (patch) | |
tree | cc6b8d8a69e4147709a7028d2757f858ab72778f /src/configure.in | |
parent | beca055b0c7bfd5abdfdcbd7f601d060ff3865e5 (diff) | |
download | vim-git-3ca71f1f1f6b83e0ec078897959387fca58bdf55.tar.gz |
updated for version 7.3.043v7.3.043
Problem: Can't load Ruby dynamically on Unix.
Solution: Adjust the configure script. (James Vega)
Diffstat (limited to 'src/configure.in')
-rw-r--r-- | src/configure.in | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/configure.in b/src/configure.in index 152313b7a..e7794f1ee 100644 --- a/src/configure.in +++ b/src/configure.in @@ -1299,10 +1299,10 @@ AC_SUBST(TCL_LIBS) AC_MSG_CHECKING(--enable-rubyinterp argument) AC_ARG_ENABLE(rubyinterp, - [ --enable-rubyinterp Include Ruby interpreter.], , + [ --enable-rubyinterp[=OPTS] Include Ruby interpreter. [default=no] [OPTS=no/yes/dynamic]], , [enable_rubyinterp="no"]) AC_MSG_RESULT($enable_rubyinterp) -if test "$enable_rubyinterp" = "yes"; then +if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then AC_MSG_CHECKING(--with-ruby-command argument) AC_ARG_WITH(ruby-command, [ --with-ruby-command=RUBY name of the Ruby command (default: ruby)], RUBY_CMD="$withval"; AC_MSG_RESULT($RUBY_CMD), @@ -1360,6 +1360,12 @@ if test "$enable_rubyinterp" = "yes"; then RUBY_OBJ="objects/if_ruby.o" RUBY_PRO="if_ruby.pro" AC_DEFINE(FEAT_RUBY) + if test "$enable_rubyinterp" = "dynamic"; then + libruby=`$vi_cv_path_ruby -r rbconfig -e 'printf "lib%s.%s\n", Config::CONFIG[["RUBY_SO_NAME"]], Config::CONFIG[["DLEXT"]]'` + AC_DEFINE(DYNAMIC_RUBY) + RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby\\\" -DDYNAMIC_RUBY_VER=$rubyversion $RUBY_CFLAGS" + RUBY_LIBS= + fi else AC_MSG_RESULT(not found; disabling Ruby) fi |