  fi
  echo "CONFIGURE_VERSION := $CONFIGURE_VERSION" >> kaldi.mk
 -echo "FSTROOT = $FSTROOT" >> kaldi.mk
-+# echo "FSTROOT = $FSTROOT" >> kaldi.mk
- 
- # Check installed OpenFst version and add C++11 flags if OpenFst >= 1.4
+-
+-# Check installed OpenFst version and add C++11 flags if OpenFst >= 1.4
 -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"`

 
 ifndef OPENBLASLIBS
 $(error OPENBLASLIBS not defined.)
@@ -20,7 +20,6 @@ CXXFLAGS = -msse -msse2 -Wall -I.. \
       -Wno-sign-compare -Wno-unused-local-typedefs -Winit-self \
       -DHAVE_EXECINFO_H=1 -rdynamic -DHAVE_CXXABI_H \
       -DHAVE_OPENBLAS -I $(OPENBLASROOT)/include \
-      -I $(FSTROOT)/include \
       $(EXTRA_CXXFLAGS) \
       -g # -O0 -DKALDI_PARANOID 
 
@@ -28,8 +27,8 @@ ifeq ($(KALDI_FLAVOR), dynamic)
 CXXFLAGS += -fPIC
 endif
 

 
 #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
