From 160656fdfc417ed31be5052d43701e7fdfc4ee91 Mon Sep 17 00:00:00 2001
From: rey jean-Francois <jean-francois.rey@univ-avignon.fr>
Date: Tue, 13 Aug 2013 16:43:22 +0200
Subject: [PATCH] update

---
 README     |  7 +++++++
 install.sh | 21 ++++++++++++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/README b/README
index 87a9df7..44b42fa 100644
--- a/README
+++ b/README
@@ -39,6 +39,7 @@ GNU Toolchain
         and debian packages
 
         Compiling, linking, and building applications.
+        (g++ will be needed if you install scoring tools)
 
 
 avconv (libav-tools >= 0.8)
@@ -90,6 +91,12 @@ Tomcat ( >= 7.0.0)
 
     Apache Tomcat is an open source software implementation of the Java Servlet and JavaServer Pages technologies.    
 
+libxml2-dev ( >= 2.7 ) [needed for scoring only]
+    Available from http://www.xmlsoft.org/
+    and debian packages
+
+    Libxml2 is the XML C parser and toolkit.
+
 INSTALL
 -------
 
diff --git a/install.sh b/install.sh
index dde2708..c8fa546 100755
--- a/install.sh
+++ b/install.sh
@@ -70,6 +70,19 @@ then
 fi
 echo -e "cc \t ${txtgrn}OK${txtrst}"
 
+
+## C++
+if [ $SCORING -eq 1 ]
+then
+    test=$(whereis g++)
+    if [ "$test" == "g++:" ]
+    then
+        echo -e "${txtred}ERROR${txtrst} g++ not found\n You have to install g++\n sudo apt-get install g++"
+        exit 1;
+    fi
+    echo -e "g++ \t ${txtgrn}OK${txtrst}"
+fi
+
 ## AVCONV
 test=$(whereis avconv)
 if [ "$test" == "avconv:" ]
@@ -194,18 +207,20 @@ then
 
     if [ $SCORING -eq 1 ] 
     then 
-        tar xvzf $OTMEDIA_HOME/tools/CRF++-0.58.tar.gz -C $OTMEDIA_HOME/tools/
+        echo -e "\t${txtblu}Install CRF++${txtrst}\n"
+        tar -xvzf "$OTMEDIA_HOME/tools/CRF++-0.58.tar.gz" -C "$OTMEDIA_HOME/tools/"
         cd $OTMEDIA_HOME/tools/CRF++-0.58
         ./configure --prefix="$OTMEDIA_HOME/tools/install"
         make
         make install
-        cd $OLDPATH
+        echo -e "\t${txtblu}Install lia_ne${txtrst}\n"
         export PATH=$PATH:$OTMEDIA_HOME/tools/install/bin
         export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OTMEDIA_HOME/tools/install/lib
         export LIA_NE=$OTMEDIA_HOME/tools/lia_ltbox/lia_ne_v2.2
         cd $LIA_NE
+        mkdir $LIA_NE/bin 2> /dev/null
         make all
-        cd $OLDPATH
+        cd $OTMEDIA_HOME
     fi
 
     ### SOLR DB ###
-- 
1.8.2.3