scripts/package in rvm-0.1.27 vs scripts/package in rvm-0.1.29

@@ -2,12 +2,24 @@
 
 #
 # ruby dependency packages:
 #
 
+for rvmrc in /etc/rvmrc $HOME/.rvmrc ; do
+  if [[ -f "$rvmrc" ]] ; then
+    if grep -q '^\s*rvm .*$' $rvmrc ; then
+      $rvm_scripts_path/log "error" "$rvmrc is for rvm settings only.\nrvm CLI may NOT be called from within $rvmrc. \nSkipping the loading of $rvmrc"
+      return 1
+    else
+      source "$rvmrc"
+    fi
+  fi
+done
+
 source $rvm_scripts_path/initialize
 source $rvm_scripts_path/utility
+__rvm_load_rvmrc
 
 trap "rm -f $rvm_tmp_path/$$* > /dev/null 2>&1 ; exit" 0 1 2 3 15
 if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
 
 action="$(echo $* | awk '{print $1}')"
@@ -35,11 +47,11 @@
     echo -e "Unrecognized archive format '$archive_format'" ; return 1
   fi
 
   builtin cd "$rvm_src_path/$package-$version"
 
-  __rvm_run "$package/configure" "${configure:-"./configure --prefix=$rvm_usr_path"} $configure_flags" "Configuring $package in $rvm_src_path/$package-$version."
+  __rvm_run "$package/configure" "${configure:-"./configure --prefix=${prefix_path:-"$rvm_usr_path"}"} $configure_flags" "Configuring $package in $rvm_src_path/$package-$version."
 
   unset configure_flags
 
   if [[ "$action" = "uninstall" ]] ; then
     __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "Uninstalling $package from $rvm_usr_path"
@@ -77,24 +89,31 @@
   if $rvm_scripts_path/match "$rvm_archflags" "x86_64" ; then
     export openssl_os="os/compiler darwin64-x86_64-cc"
   else
     export openssl_os="os/compiler darwin-i386-cc"
   fi
-  package="openssl" ; version="0.9.8k" ; archive_format="tar.gz"
+  package="openssl" ; version="0.9.8n" ; archive_format="tar.gz"
   package_url="http://www.openssl.org/source"
   configure="./config --prefix=$rvm_usr_path zlib no-asm no-krb5 shared"
   install_package
 }
 
 zlib() {
-  package="zlib" ; version="1.2.4" ; archive_format="tar.gz"
+  package="zlib" ; version="1.2.5" ; archive_format="tar.gz"
   package_url="http://www.zlib.net"
   install_package
 }
 
-ncurses() {
+autoconf() {
+  package_url="ftp.gnu.org/gnu/autoconf"
+  package="autoconf" ; version="2.65" ; archive_format="tar.gz"
 
+  prefix_path="${rvm_symlink_path:-"${rvm_path:-"$HOME/.rvm"}/bin"}"
+  install_package
+}
+
+ncurses() {
   package_url="http://ftp.gnu.org/pub/gnu/ncurses"
   package="ncurses" ; version="5.7" ; archive_format="tar.gz"
   configure_flags="--with-shared --disable-rpath --without-debug --without-ada --enable-safe-sprintf --enable-sigwinch --without-progs"
   install_package
 }
@@ -109,10 +128,20 @@
   package_url="ftp://ftp.gnu.org/pub/gnu/gettext"
   package="gettext" ; version="0.17" ; archive_format="tar.gz"
   install_package
 }
 
+libxml2() {
+  package_url="ftp://xmlsoft.org/libxml2/"
+  package="libxml2" ; version="2.7.3" ; archive_format="tar.gz"
+  if [[ "Darwin" = "$(uname)" ]] ; then
+    configure="./configure --prefix=${rvm_usr_path} --build=i686-apple-darwin$(uname -r) --host=i686-apple-darwin$(uname -r)"
+  fi
+  install_package
+  unset prefix_path
+}
+
 glib() {
   package="glib" ; version="2.23.1" ; archive_format="tar.gz"
   package_url="http://ftp.gnome.org/pub/gnome/sources/glib/2.23"
   configure="CC=\"cc -L$rvm_usr_path/lib\" ./configure --prefix=$rvm_usr_path"
 
@@ -144,10 +173,10 @@
   fi
   __rvm_pushpop
 }
 
 if [[ ! -z "$library" ]] ; then
-  if [[ " readline iconv curl openssl zlib ncurses pkgconfig gettext glib mono llvm " =~ "$library" ]] ; then
+  if [[ " readline iconv curl openssl zlib autoconf ncurses pkgconfig gettext glib mono llvm libxml2 " =~ "$library" ]] ; then
     ${library}
   else
     $rvm_scripts_path/log "error" "Package '${library}' is unknown."
   fi
 else