Minor changes

[tools/install.git] / config_files / graphviz.sh

diff --git a/config_files/graphviz.sh b/config_files/graphviz.sh
index d3e3f6282fe9d7a3ad37632910362d9ac8568f6b..d640428c56e22589841a65401fe97c0fd4379c19 100755 (executable)
--- a/config_files/graphviz.sh
+++ b/config_files/graphviz.sh
@@ -6,7 +6,7 @@
 #  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 #  Project   : SALOME
 #  Module    : Installation Wizard
-#  Copyright : 2002-2012 CEA
+#  Copyright : 2002-2013 CEA
 #
 #  This script is the part of the SALOME installation procedure.
 #
@@ -15,7 +15,7 @@
 #
 # graphviz version
 #
-GRAPHVIZ_VERSION=2.28.0
+GRAPHVIZ_VERSION=2.30.0
 
 check_version()
 {
@@ -38,6 +38,7 @@ print_env_bin()
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export GRAPHVIZHOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export GRAPHVIZ_ROOT_DIR=\${GRAPHVIZHOME}
 export PATH=\${GRAPHVIZHOME}/bin:\${PATH}
 export LD_LIBRARY_PATH=\${GRAPHVIZHOME}/lib:\${GRAPHVIZHOME}/lib/graphviz:\${LD_LIBRARY_PATH}
 ##
@@ -84,8 +85,11 @@ install_source
 cd ${PRODUCT_SRC_DIR}
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-sed -i 's%PYTHON_LIBS="\(.*\)"%PYTHON_LIBS="-L\$PYTHON_PREFIX/lib \1"%g' configure
-sed -i "s%echo 'puts \[info tclversion\]' | \$TCLSH%echo 'puts \[info tclversion\]' | \$TCLSH 2>/dev/null | grep -E '^[0-9.]+$'%g" configure
+local patch_build_procedure=1
+if [ "${patch_build_procedure}" = "1" ] ; then
+    sed -i 's%PYTHON_LIBS="\(.*\)"%PYTHON_LIBS="-L\$PYTHON_PREFIX/lib \1"%g' configure
+    sed -i "s%echo 'puts \[info tclversion\]' | \$TCLSH%echo 'puts \[info tclversion\]' | \$TCLSH 2>/dev/null | grep -E '^[0-9.]+$'%g" configure
+fi
 
 CONFIGURE_FLAGS="--disable-rpath -without-qt"
 if [ "${EXPAT_ROOT}" != "" ] ; then
@@ -94,6 +98,10 @@ fi
 if test `uname -m` == "x86_64" ; then
     CONFIGURE_FLAGS="${CONFIGURE_FLAGS} CFLAGS=-m64 CXXFLAGS=-m64"
 fi
+local without_cgraph=1
+if [ "${without_cgraph}" = "1" ] ; then
+    CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --with-cgraph=no"
+fi
 
 check_job ${PRODUCT_DIR}/CONFIGURE.LOG configure --prefix=${PRODUCT_DIR} ${CONFIGURE_FLAGS}
 
@@ -131,12 +139,15 @@ cd $ldir
 
 for l in X `find $ldir -name "*.la"`; do
     if [ "$l" != "X" ] ; then
-        pydir="" ; tcldir=""
+        pydir="" ; tcldir="" ; freetypedir="" ;
         if [ -n "${PYTHONROOT}" ] ; then pydir=${PYTHONROOT} ; fi
         if [ -n "${TCLHOME}" ] ; then tcldir=${TCLHOME} ; fi
+        if [ -n "${FREETYPEDIR}" ] ; then freetypedir=${FREETYPEDIR} ; fi
+
         sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*${PRODUCT}% \1${PRODUCT_DIR}%g" \
             -e "s%[[:space:]]\(-L\)\?[^[:space:]]*Python[^[:space:]]*/lib% \1${pydir}/lib%g" \
-            -e "s%[[:space:]]\(-L\)\?[^[:space:]]*tcltk[^[:space:]]*/lib% \1${tcldir}/lib%g" $l > $l"_"
+            -e "s%[[:space:]]\(-L\)\?[^[:space:]]*tcltk[^[:space:]]*/lib% \1${tcldir}/lib%g" \
+           -e "s%[[:space:]]\(-L\)\?[^[:space:]]*freetype[^[:space:]]*/lib\(/libfreetype\.la\)% \1${freetypedir}/lib\2%g" $l > $l"_"
         chmod -f --reference=$l $l"_"
         mv -f $l"_" $l