SALOME 6.5.0 preparation: correct la files modification procedure for graphvix (freet...

diff --git a/config_Red_Hat_Enterprise_WS_4_64bit.xml b/config_Red_Hat_Enterprise_WS_4_64bit.xml
index d68e4ce21ed062d925c6fe20181c3a445c07196d..019dac9885a2a3c58bd4320246bc6808aa9d6e0a 100755 (executable)
--- a/config_Red_Hat_Enterprise_WS_4_64bit.xml
+++ b/config_Red_Hat_Enterprise_WS_4_64bit.xml
@@ -1158,6 +1158,7 @@
       <dep>tcltk</dep>
       <dep>Swig</dep>
       <dep>expat</dep>
+      <dep>freetype</dep>
     </product>
     <product name="Doxygen">
       <dep>Graphviz</dep>

diff --git a/config_files/graphviz.sh b/config_files/graphviz.sh
index d3e3f6282fe9d7a3ad37632910362d9ac8568f6b..85867a38f5c81c2d2efbee5aa1f7ececfaf75176 100755 (executable)
--- a/config_files/graphviz.sh
+++ b/config_files/graphviz.sh
@@ -131,12 +131,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