scripts/rvm-ruby-installer in rvm-0.0.39 vs scripts/rvm-ruby-installer in rvm-0.0.40
- old
+ new
@@ -87,13 +87,16 @@
if [ -s ./Makefile -a -z "$rvm_re_configure" ] ; then
__rvm_log "warn" "\tSkipping configure step, Makefile exists so configure must have already been run."
elif [ -s ./configure ] ; then
__rvm_log "info" "\tConfiguring $rvm_ruby_package_name using $rvm_ruby_configure, this may take a while depending on your cpu(s)..."
if [ -d $rvm_path/usr/include/readline/ ] ; then
- __rvm_run "configure" "./configure --prefix=$rvm_ruby_home $rvm_ruby_configure --with-readline-dir=$rvm_path/usr/include/readline/"
- else
- __rvm_run "configure" "./configure --prefix=$rvm_ruby_home $rvm_ruby_configure"
+ parameters="$parameters --with-readline-dir=$rvm_path/usr/include/readline/"
fi
+ if [ -d $rvm_path/usr/include/iconv/ ] ; then
+ parameters="$parameters --with-iconv-dir=$rvm_path/usr/include/iconv/"
+ fi
+ __rvm_run "configure" "./configure --prefix=$rvm_ruby_home --enable-shared=true $rvm_ruby_configure $parameters"
+ unset parameters
if [ $? -gt 0 ] ; then status=$? ; return $status ; fi
else
__rvm_log "error" "\tSkipping configure step, 'configure' script does not exist, did autoconf not run successfully?"
fi