X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=build_configure;h=758502e19cca50fd12b868bf51cd2b8683f1368e;hb=d5f570a507f393d4bc424c30de4e7bd75e7005cc;hp=0b64f0aef949778271984b650698a88a4795511a;hpb=45d7bfb5fc937a754579b6d55234bd2351ce75c6;p=modules%2Fmed.git

diff --git a/build_configure b/build_configure
index 0b64f0aef..758502e19 100755
--- a/build_configure
+++ b/build_configure
@@ -20,6 +20,12 @@ if test ! -d "${KERNEL_ROOT_DIR}"; then
     exit
 fi
 
+# Test if the KERNEL_SRC is set correctly
+
+#if test ! -d "${KERNEL_SRC}"; then
+#    echo "failed : KERNEL_SRC variable is not correct !"
+#    exit
+#fi
 ########################################################################
 # find_in - utility function
 #
@@ -97,6 +103,13 @@ then
 fi
 chmod u-w configure.in.base 
 
+if [ -e "${CONF_DIR}/salome_adm" ] ; then
+    \rm -f ${CONF_DIR}/salome_adm
+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}/.' >> configure.in_tmp1
 
 echo  "" >> configure.in_tmp1
 echo "AC_OUTPUT([ \\" >> configure.in_tmp1
@@ -106,25 +119,44 @@ echo "AC_OUTPUT([ \\" >> configure.in_tmp1
 # These files MUST be on top of AC_OUTPUT list so we
 # put them "manually"
 #
-
-echo "	${KERNEL_ROOT_DIR}/salome_adm/unix/SALOMEconfig.h \\" >> configure.in_tmp1
-echo "	${KERNEL_ROOT_DIR}/salome_adm/unix/F77config.h \\" >> configure.in_tmp1
-echo "	${KERNEL_ROOT_DIR}/salome_adm/unix/sstream \\" >> configure.in_tmp1
-echo "	${KERNEL_ROOT_DIR}/salome_adm/unix/depend \\" >> configure.in_tmp1
-echo "	${KERNEL_ROOT_DIR}/salome_adm/unix/make_omniorb \\" >> configure.in_tmp1
-echo "	${KERNEL_ROOT_DIR}/salome_adm/unix/envScript \\" >> configure.in_tmp1
-echo "	${KERNEL_ROOT_DIR}/salome_adm/unix/make_commence \\" >> configure.in_tmp1
-echo "	${KERNEL_ROOT_DIR}/salome_adm/unix/make_conclude \\" >> configure.in_tmp1
-echo "	${KERNEL_ROOT_DIR}/salome_adm/unix/make_module \\" >> configure.in_tmp1
+# Attention, l'ordre d'entrée des fichiers doit être choisi avec
+# précision
+#
+echo "	./salome_adm/unix/SALOMEconfig.h \\" >> configure.in_tmp1
+echo "	./salome_adm/unix/F77config.h \\" >> configure.in_tmp1
+echo "	./salome_adm/unix/sstream \\" >> configure.in_tmp1
+
+echo "	./salome_adm/unix/depend \\" >> configure.in_tmp1
+echo "	./adm_local/unix/make_omniorb \\" >> configure.in_tmp1
+echo "	./salome_adm/unix/envScript \\" >> configure.in_tmp1
+echo "	./salome_adm/unix/make_module \\" >> configure.in_tmp1
+
+# _CS_gbo Pour assurer ls construction correct de la chaîne de
+# dépendance, il apparaît nécessaire de surcharger le make_conclude
+# (resp. make_commence) pardéfaut, c'est à dire le make_conclude de
+# salome_adm, par le make_conclude (resp. make_commence) du module,
+# c'est à dire le make_conclude (resp. make_commence) du répertoire
+# adm_local
+echo "	./adm_local/unix/make_commence \\" >> configure.in_tmp1
+echo "	./adm_local/unix/make_conclude \\" >> configure.in_tmp1
 
 \rm -f configure.in_tmp2 configure.in_tmp3
 touch configure.in_tmp2
+
 find_in . configure.in_tmp2
-sed '/^.*salome_adm/d' configure.in_tmp2 >  configure.in_tmp3
-sed '/configure.in/d' configure.in_tmp3 >  configure.in_tmp2
-sed 's/.in / /' configure.in_tmp2 >> configure.in_tmp1
+
+# _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' \
+    -e '/configure.in/d'         \
+    -e '/^     \.\/adm_local/d'  \
+    -e 's/.in / /' configure.in_tmp2 >> configure.in_tmp1
 
 echo  "])" >> configure.in_tmp1
+
+# delete the link created for AC_OUTPUT
+echo "" >> configure.in_tmp1
+#echo 'rm -f ${ROOT_SRCDIR}/salome_adm' >> configure.in_tmp1
 \mv configure.in_tmp1 configure.in_new
 \rm  -f configure.in_tmp2 configure.in_tmp3
 
@@ -180,7 +212,7 @@ else
 	echo -n "Creating 'configure' script ...  "
 fi
 
-aclocal --acdir=${KERNEL_ROOT_DIR}/salome_adm/unix/config_files
+aclocal --acdir=adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files
 if autoconf
 then
 	echo "done"