Update to modify la files for vtk, libxml, metis and scotch

diff --git a/config_files/common.sh b/config_files/common.sh
index 45603ea845e3f56d626d7f42ab83487db0f299a2..9b4e548053f54d480d98724534819a4973e9807d 100755 (executable)
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -614,13 +614,6 @@ if [ "$l" != "X" ] ; then
            sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*${mod}[^[:space:]/]*/lib% \1${moddir}/lib%g" $l > $l"_"
            mv -f $l"_" $l
        fi
-       if test ${mod} = "YACS" ; then
-       # 3. process libxml dependencies
-       libxmldir=`printenv LIBXML_DIR`/lib
-       if [ ! -d ${libxmldir} ] ; then libxmldir=`printenv  LIBXML_DIR`/lib ; fi
-       sed -e "s%\(.*\)\([[:space:]].*/lib/libxml2.la[[:space:]]\)\(.*\)%\1 ${libxmldir}/libxml2.la \3%g" $l > $l"_"
-       mv -f $l"_" $l  
-       fi
     done
     # 2. process CAS.CADE dependencies
     casdir=`printenv CASROOT`/lib
@@ -642,10 +635,14 @@ if [ "$l" != "X" ] ; then
        mv -f $l"_" $l
     fi
     # 4. process VTK dependencies
+    if test `uname -m` = "x86_64" ; then
+    vtkdir=`printenv VTKHOME`/lib64/vtk
+    else
     vtkdir=`printenv VTKHOME`/lib/vtk
+    fi
     if [ -n "${VTKHOME}" ] && [ -d "${vtkdir}" ] ; then
        # echo $l $VTKHOME $vtkdir
-       sed -e "s%-L[^[:space:]]*VTK[^[:space:]]*/lib/vtk%-L${vtkdir}%g" $l > $l"_"
+       sed -e "s%-L[^[:space:]]*VTK[^[:space:]]*/\(lib\|lib64\)/vtk%-L${vtkdir}%g" $l > $l"_"
        mv -f $l"_" $l
     fi
     # 5. process HDF dependencies
@@ -720,6 +717,27 @@ if [ "$l" != "X" ] ; then
     moddir=`printenv ${mod}_ROOT_DIR`
     sed -e "s%^libdir='[^[:space:]]*${mod}[^[:space:]]*/\(lib.*\)'%libdir='${moddir}/\1'%g" $l > $l"_"
     mv -f $l"_" $l
+
+    # 3. process libxml dependencies
+    libxmldir=`printenv LIBXML_DIR`/lib
+    if [ ! -d ${libxmldir} ] ; then libxmldir=`printenv  LIBXML_DIR`/lib ; fi
+    sed -e "s%\(.*\)\([[:space:]].*/lib/libxml2.la[[:space:]]\)\(.*\)%\1 ${libxmldir}/libxml2.la \3%g" \
+        -e "s%-L[^[:space:]]*libxml2[^[:space:]]*/lib%-L${libxmldir}%g" $l > $l"_"
+    mv -f $l"_" $l     
+
+    # 3. process metis dependencies
+    metisdir=`printenv METISDIR`
+    if [ ! -d ${metisdir} ] ; then metisdir=`printenv  METISDIR` ; fi
+    sed -e "s%-L[^[:space:]]*metis[^[:space:]]%-L${libxmldir}%g" $l > $l"_"
+    mv -f $l"_" $l     
+
+    # 3. process metis dependencies
+    scotchdir=`printenv SCOTCHDIR`/bin
+    if [ ! -d ${scotchdir} ] ; then scotchdir=`printenv SCOTCHDIR`/bin ; fi
+    sed    -e "s%-L[^[:space:]]*scotch[^[:space:]]*/bin%-L${scotchdir}%g" $l > $l"_"
+    mv -f $l"_" $l     
+
+
 fi
 done