Changing installation from 1.2.10 to 1.3.2 version of OpenFst.

git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@1681 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8

tools/INSTALL

@@ -67,15 +67,15 @@ to configure, if it's not already the default (g++ -v will tell you).
 (on cygwin you may have to install the g++-4.0 package and give the options CXX=g++-4.exe CC=gcc-4.exe to configure).
 
 
-wget http://openfst.cs.nyu.edu/twiki/pub/FST/FstDownload/openfst-1.2.10.tar.gz
+wget http://openfst.cs.nyu.edu/twiki/pub/FST/FstDownload/openfst-1.3.2.tar.gz
-tar -xovzf openfst-1.2.10.tar.gz   
+tar -xovzf openfst-1.3.2.tar.gz   
-for dir in openfst-1.2.10/{src/,}include/fst; do
+for dir in openfst-1.3.2/{src/,}include/fst; do
     ( [ -d $dir ] && cd $dir && patch -p0 -N <../../../../openfst.patch ) 
 done 
 rm openfst 2>/dev/null # Remove any existing link
-ln -s openfst-1.2.10 openfst
+ln -s openfst-1.3.2 openfst
  
-cd openfst-1.2.10
+cd openfst-1.3.2
 # Choose the correct configure statement:
 
 Linux or Darwin:

tools/Makefile

@@ -5,7 +5,7 @@ all: sph2pipe atlas clapack irstlm_tgt sclite_tgt openfst_tgt
 clean: openfst_cleaned sclite_cleaned  irstlm_cleaned
 
 openfst_cleaned:
-		$(MAKE) -C openfst-1.2.10 clean
+		$(MAKE) -C openfst-1.3.2 clean
 
 irstlm_cleaned:
 		$(MAKE) -C irstlm clean 
@@ -14,7 +14,7 @@ sclite_cleaned:
 		$(MAKE) -C sctk-2.4.0 clean
 
 distclean:
-		rm -rf openfst-1.2.10/
+		rm -rf openfst-1.3.2/
 		rm -rf sctk-2.4.0/
 		rm -rf ATLAS/
 		rm -rf CLAPACK_include/
@@ -23,32 +23,32 @@ distclean:
 		rm -rf sph2pipe_v2.5.tar.gz
 		rm -rf atlas3.8.3.tar.gz
 		rm -rf sctk-2.4.0-20091110-0958.tar.bz2
-		rm -rf openfst-1.2.10.tar.gz
+		rm -rf openfst-1.3.2.tar.gz
 		rm -f openfst
 
-		
 openfst_tgt: openfst_compiled
 
 .PHONY: openfst_compiled
-openfst_compiled: openfst-1.2.10/Makefile
+openfst_compiled: openfst-1.3.2/Makefile
-		cd openfst-1.2.10/; \
+		cd openfst-1.3.2/; \
 		$(MAKE) install
 
-openfst-1.2.10/Makefile: openfst-1.2.10/.patched
+openfst-1.3.2/Makefile: openfst-1.3.2/.patched
-		cd openfst-1.2.10/; \
+		cd openfst-1.3.2/; \
-		./configure --prefix=`pwd` --enable-static --disable-shared 
+		./configure --prefix=`pwd` --enable-static --disable-shared --enable-far --enable-ngram-fsts
 
-openfst-1.2.10/.patched: | openfst-1.2.10
+openfst-1.3.2/.patched: | openfst-1.3.2
-		-cd openfst-1.2.10/src/include/fst; \
+		-cd openfst-1.3.2/src/include/fst; \
 		patch -p0 -N < ../../../../openfst.patch;
 		touch $@ 	
 
-openfst-1.2.10: openfst-1.2.10.tar.gz
+openfst-1.3.2: openfst-1.3.2.tar.gz
-		tar xozf openfst-1.2.10.tar.gz
+		tar xozf openfst-1.3.2.tar.gz
-		-ln -s openfst-1.2.10 openfst 
+		-rm openfst
+		-ln -s openfst-1.3.2 openfst 
 
-openfst-1.2.10.tar.gz: 
+openfst-1.3.2.tar.gz: 
-		wget -T 10 -t 3 --no-check-certificate https://sourceforge.net/projects/kaldi/files/openfst-1.2.10.tar.gz
+		wget -T 10 -t 3 --no-check-certificate http://www.openfst.org/twiki/pub/FST/FstDownload/openfst-1.3.2.tar.gz
 
 sclite_tgt: sclite_compiled
 
@@ -137,5 +137,3 @@ sph2pipe_v2.5: sph2pipe_v2.5.tar.gz
 sph2pipe_v2.5.tar.gz:
 		wget -T 10 -t 3 http://merlin.fit.vutbr.cz/kaldi/sph2pipe_v2.5.tar.gz
 
-	 
-

tools/install.sh

@@ -172,24 +172,24 @@ fi
 (
   echo "****(6) Install openfst"
 
-  rm openfst-1.2.10.tar.gz 2>/dev/null
+  rm openfst-1.3.2.tar.gz 2>/dev/null
-  wget http://openfst.cs.nyu.edu/twiki/pub/FST/FstDownload/openfst-1.2.10.tar.gz || \
+  wget http://openfst.cs.nyu.edu/twiki/pub/FST/FstDownload/openfst-1.3.2.tar.gz || \
-   wget --no-check-certificate -T 10 -t 3 https://sourceforge.net/projects/kaldi/files/openfst-1.2.10.tar.gz
+   wget --no-check-certificate -T 10 -t 3 https://sourceforge.net/projects/kaldi/files/openfst-1.3.2.tar.gz
 
-  if [ ! -e openfst-1.2.10.tar.gz ]; then
+  if [ ! -e openfst-1.3.2.tar.gz ]; then
-    echo "****download openfst-1.2.10.tar.gz failed."
+    echo "****download openfst-1.3.2.tar.gz failed."
     exit 1
   else
-    tar -xovzf openfst-1.2.10.tar.gz   || exit 1
+    tar -xovzf openfst-1.3.2.tar.gz   || exit 1
-    ( cd openfst-1.2.10/src/include/fst && patch -p0 -N <../../../../openfst.patch )
+    ( cd openfst-1.3.2/src/include/fst && patch -p0 -N <../../../../openfst.patch )
     #ignore errors in the following; it's for robustness in case
     # someone follows these instructions after the installation of openfst.
-    ( cd openfst-1.2.10/include/fst && patch -p0 -N < ../../../openfst.patch )
+    ( cd openfst-1.3.2/include/fst && patch -p0 -N < ../../../openfst.patch )
     # Remove any existing link
     rm openfst 2>/dev/null
-    ln -s openfst-1.2.10 openfst
+    ln -s openfst-1.3.2 openfst
      
-    cd openfst-1.2.10
+    cd openfst-1.3.2
     # Choose the correct configure statement:
 
     # Linux or Darwin: