 -else
 -  echo "OPENFST_GE_10400 = 0" >> kaldi.mk
 -fi
-+# OPENFST_VER="${OPENFST_VER:-`grep 'PACKAGE_VERSION' $FSTROOT/Makefile | sed -e 's:.*= ::'`}"
-+# echo "OPENFST_VER = $OPENFST_VER" >> kaldi.mk
-+# OPENFST_VER_NUM=`echo $OPENFST_VER | sed 's/\./ /g' | xargs printf "%d%02d%02d"`
-+# if [ $OPENFST_VER_NUM -ge 10400 ]; then
-+  # echo "OPENFST_GE_10400 = 1" >> kaldi.mk
-+  # echo "EXTRA_CXXFLAGS += -DHAVE_OPENFST_GE_10400 -std=c++0x" >> kaldi.mk
-+# else
-+  # echo "OPENFST_GE_10400 = 0" >> kaldi.mk
-+# fi
  
  # Most of the OS-specific steps below will append to kaldi.mk
  echo "Doing OS specific configurations ..."
-@@ -851,9 +851,9 @@ if [ "`uname`" == "Darwin"  ]; then
+@@ -851,9 +293,6 @@ if [ "`uname`" == "Darwin"  ]; then
    if [ ! -e /System/Library/Frameworks/Accelerate.framework ]; then
      failure "Need the Accelerate.framework to compile on Darwin."
    fi
 -  if [ ! -f $FSTROOT/lib/libfst.a ]; then
 -    failure "Static OpenFST library not found:  See ../tools/INSTALL"
 -  fi
-+  # if [ ! -f $FSTROOT/lib/libfst.a ]; then
-+  #   failure "Static OpenFST library not found:  See ../tools/INSTALL"
-+  # fi
    # posix_memalign and gcc -rdynamic options not present on OS X 10.5.*
    osx_ver=`sw_vers | grep ProductVersion | awk '{print $2}' | awk '{split($0,a,"\."); print a[1] "." a[2]; }'`
    echo "Configuring for OS X version $osx_ver ..."
-@@ -899,19 +899,19 @@ if [ "`uname -o`" == "Cygwin"  ]; then
+@@ -899,141 +338,9 @@ if [ "`uname -o`" == "Cygwin"  ]; then
  fi
  
  if [ "`uname`" == "Linux" ]; then

-  fi
-  echo OPENFSTLIBS = $OPENFSTLIBS >> kaldi.mk
-  echo OPENFSTLDFLAGS = $OPENFSTLDFLAGS >> kaldi.mk
+  # if  $static_fst ; then
+  #     OPENFSTLIBS="$FSTROOT/lib/libfst.a"
+  #     fst_type='a'
+  # else
+  #     OPENFSTLIBS="-L${FSTROOT}/lib -lfst"
+  #     OPENFSTLDFLAGS="-Wl,-rpath=${FSTROOT}/lib"
+  #     fst_type='so'
+  # fi
+  # if [ ! -f "$FSTROOT/lib/libfst.${fst_type}" ]; then
+  #   failure "Static=[$static_fst] OpenFST library not found:  See ../tools/INSTALL"
+  # fi
+  # echo OPENFSTLIBS = $OPENFSTLIBS >> kaldi.mk
+  # echo OPENFSTLDFLAGS = $OPENFSTLDFLAGS >> kaldi.mk
 
   echo "On Linux: Checking for linear algebra header files ..."
   if [ "$MATHLIB" == "ATLAS" ]; then
diff --git src/makefiles/darwin_10_10.mk src/makefiles/darwin_10_10.mk
index 4314397..f13befa 100644
--- src/makefiles/darwin_10_10.mk

 
 #endif  // KALDI_BASE_KALDI_TYPES_H_
diff --git src/configure src/configure
index 6ee1f64..f551c44 100755
--- src/configure
+++ src/configure
@@ -57,11 +57,6 @@ if ! [ -x "$PWD/configure" ]; then
   exit 1
 fi
 
-## Default locations for FST and linear algebra libraries.
-MATHLIB='ATLAS'
-ATLASROOT=`rel2abs ../tools/ATLAS/`
-FSTROOT=`rel2abs ../tools/openfst`
-
 # Avoid using any variables that are set in the shell.
 unset MKLROOT
 unset CLAPACKROOT
@@ -79,7 +74,7 @@ threaded_atlas=false #  By default, use the un-threaded version of ATLAS.
 threaded_math=${threaded_atlas}
 static_math=false
 static_fst=false
