Join modifications from branch V3_1_0_For_CCRT

[samples/component.git] / build_configure

diff --git a/build_configure b/build_configure
index eb80d899d6bf848927bde2b264182bb6991b1ed4..8dc1b2dbf325381acbcc5a7c0b9bbb5e83e05bb6 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 #
 # Tool for updating list of .in file for the SALOME project 
@@ -26,6 +26,22 @@ fi
 #    echo "failed : KERNEL_SRC variable is not correct !"
 #    exit
 #fi
+########################################################################
+# Test if the GUI_ROOT_DIR is set correctly
+
+if test ! -d "${GUI_ROOT_DIR}"; then
+    echo "failed : GUI_ROOT_DIR variable is not correct !"
+    exit
+fi
+
+########################################################################
+# Test if the MED_ROOT_DIR is set correctly
+
+if test ! -d "${MED_ROOT_DIR}"; then
+    echo "failed : MED_ROOT_DIR variable is not correct !"
+    exit
+fi
+
 ########################################################################
 # find_in - utility function
 #
@@ -42,8 +58,8 @@ fi
 
 find_in()
 {
-  local i
-  local f=$2
+  i=0
+  f=$2
 
 # if the first argument is not a directory, returns
 
@@ -55,6 +71,7 @@ find_in()
 
   case $1 in
     */CVS) return ;;
+    */adm_local/*) return ;;
     *) ;;
   esac
 
@@ -93,8 +110,10 @@ ABS_CONF_DIR=`pwd`
 # Common part of the configure.in file
 #
 chmod u+w configure.in.base
-if ! \cp -f configure.in.base configure.in_tmp1 
+if \cp -f configure.in.base configure.in_tmp1 
 then
+        echo
+else
        echo
        echo "error : can't create files in" ${CONF_DIR}
        echo "aborting ..."
@@ -109,7 +128,7 @@ fi
 
 # make a link allowing AC_OUTPUT to find the salome_adm/.../*.in  files
 echo "" >> configure.in_tmp1
-echo 'ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/salome_adm' >> configure.in_tmp1
+echo 'ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1
 
 echo  "" >> configure.in_tmp1
 echo "AC_OUTPUT([ \\" >> configure.in_tmp1
@@ -147,9 +166,8 @@ find_in . configure.in_tmp2
 
 # _CS_gbo_100204 Mise à jour du filtre pour prise en compte des
 # restrictions imposées par les versions récente de autoconf.
-    sed -e '/^ \.\/salome_adm/d' \
+    sed -e '/^...salome_adm/d' \
        -e '/configure.in/d'      \
-       -e '/^  \.\/adm_local/d'  \
        -e 's/.in / /' configure.in_tmp2 >> configure.in_tmp1
 
 echo  "])" >> configure.in_tmp1
@@ -178,8 +196,10 @@ then
        fi
 else
        echo -n "Updating 'configure.in' file ... "
-       if ! \cp configure.in configure.in_old >& /dev/null
+       if \cp configure.in configure.in_old >& /dev/null
        then
+                echo
+       else
                echo
                echo
                echo "Can't backup previous configure.in"
@@ -212,7 +232,9 @@ else
        echo -n "Creating 'configure' script ...  "
 fi
 
-aclocal --acdir=adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files
+aclocal -I adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
+                                       -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \
+                                       -I ${MED_ROOT_DIR}/adm_local/unix/config_files
 if autoconf
 then
        echo "done"