X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=build_configure;h=9df6be15c1fee731fb5ac19edec32744064eea67;hp=4edf6f44d32945cc71e51109226ecd3f92692245;hb=7ba3124c8a4ba32308bbc40957ee9246374aa590;hpb=0b959120c59670d73c0a1f6d46bfa72a6ceb49cf

diff --git a/build_configure b/build_configure
index 4edf6f44d..9df6be15c 100755
--- a/build_configure
+++ b/build_configure
@@ -55,6 +55,7 @@ find_in()
 
   case $1 in
     */CVS) return ;;
+	*/adm_local/*) return ;;
     *) ;;
   esac
 
@@ -103,6 +104,10 @@ 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}/salome_adm' >> configure.in_tmp1
@@ -120,23 +125,28 @@ 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 "	./salome_adm/unix/make_omniorb \\" >> 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_commence \\" >> configure.in_tmp1
-echo "	./salome_adm/unix/make_conclude \\" >> configure.in_tmp1
+echo "	./adm_local/unix/make_commence \\" >> configure.in_tmp1
+echo "	./adm_local/unix/make_conclude \\" >> configure.in_tmp1
 echo "	./salome_adm/unix/make_module \\" >> 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
+sed -e '/^...salome_adm/d' configure.in_tmp2 >  configure.in_tmp3
+sed -e '/^...adm_local.unix.make_omniorb/d' configure.in_tmp3 > configure.in_tmp2
+sed -e '/^...adm_local.unix.make_commence/d' configure.in_tmp2 > configure.in_tmp3
+sed -e '/configure.in/d' configure.in_tmp3 >  configure.in_tmp2
+sed -e 's/.in / /' configure.in_tmp2 >>  configure.in_tmp1
+#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
 
 echo  "])" >> configure.in_tmp1
 
 # delete the link created for AC_OUTPUT
-#echo "" >> configure.in_tmp1
+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
@@ -193,7 +203,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"