1 files changed, 7 insertions, 31 deletions
diff --git a/openbabel.sh b/openbabel.sh
index 3016d95..367fb28 100755
--- a/openbabel.sh
+++ b/openbabel.sh
@@ -19,6 +19,11 @@ if [ ! -e "$WGET" ]; then
   echo "'wget' missing. Install 'wget' first. Aborting..."
   exit 1
 fi
+CMAKE="`which cmake`"
+if [ ! -e "$CMAKE" ]; then
+  echo "'cmake' missing. Install 'cmake' first. Aborting..."
+  exit 1
+fi
 
 # Pkg
 LOG="$HOME/tmp/`basename $0`-log.txt"
@@ -45,9 +50,8 @@ if [ ! $OB_DONE ]; then
     cmd="tar zxf $OB_VER.tar.gz?use_mirror=kent $OB_VER"  && run_cmd "$cmd" "Unpack"
   fi
   cd "$HOME/tmp/$OB_VER">>$LOG 2>/dev/null
-
-  cmd="./configure --prefix=$OB_DEST" && run_cmd "$cmd" "Configure"
-  cmd="make" && run_cmd "$cmd" "Make"
+  cmd="$CMAKE -DCMAKE_INSTALL_PREFIX=$OB_DEST" && run_cmd "$cmd" "Configure"
+  cmd="make -j2" && run_cmd "$cmd" "Make"
   cmd="make install" && run_cmd "$cmd" "Install"
 fi
 
@@ -63,9 +67,6 @@ if [ ! -f "$OB_CONF" ]; then
   echo "if [ -z \"\$BABEL_DATADIR\" ]; then export BABEL_DATADIR=\"$OB_DEST/share/openbabel/$OB_NUM_VER\"; fi" >> "$OB_CONF"
   echo "if ! [ -d \"\$BABEL_DATADIR\" ]; then echo \"\$0: '\$BABEL_DATADIR' is not a directory!\"; fi" >> "$OB_CONF"
 
-  echo "if echo \"\$RUBYLIB\" | grep -v \"$OB_DEST_BINDINGS\">/dev/null 2>&1; then export RUBYLIB=\"$OB_DEST_BINDINGS:\$RUBYLIB\"; fi" >> "$RUBY_CONF"
-  echo "if ! [ -d \"$OB_DEST_BINDINGS\" ]; then echo \"\$0: '$OB_DEST_BINDINGS' is not a directory!\"; fi" >> "$RUBY_CONF"
-
   echo "Openbabel configuration has been stored in '$OB_CONF'."
   if ! grep "$OB_CONF" $OT_UI_CONF >/dev/null 2>&1 ; then
     echo ". \"$OB_CONF\"" >> $OT_UI_CONF
@@ -73,28 +74,3 @@ if [ ! -f "$OB_CONF" ]; then
 
 fi
 
-echo "Bindings:"
-OB_DONE=false
-. "$OT_UI_CONF"
-mkdir -p "$OB_DEST_BINDINGS">/dev/null 2>&1
-if [ ! -d "$OB_DEST_BINDINGS" ]; then
-  echo "Install directory '$OB_DEST_BINDINGS' is not available! Aborting..."
-  exit 1
-else
-  if [ "`ls $OB_DEST_BINDINGS | wc -l`" -gt 0 ]; then
-    OB_DONE=true
-  fi
-fi
-
-if ! $OB_DONE ; then
- OB_SRC_DIR="$HOME/tmp/$OB_VER/scripts/ruby/"
- cd "$OB_SRC_DIR"
- cmd="ruby extconf.rb --with-openbabel-include=$OB_DEST/include/openbabel-2.0 --with-openbabel-lib=$OB_DEST/lib" && run_cmd "$cmd" "Code"
- cmd="make" && run_cmd "$cmd" "Make"
- cmd="cp openbabel.so $OB_DEST_BINDINGS" && run_cmd "$cmd" "Install"
- cmd="ln -sf $OB_DEST_BINDINGS/openbabel.so $RUBY_DEST/lib/ruby/site_ruby/1.8/`uname -m`-linux/" && run_cmd "$cmd" "Link"
- cd "$DIR"
- . "`pwd`/utils.sh"
- cmd="ruby test-ob-rb.rb" && run_cmd "$cmd" "Load"
-fi
-