X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=build_configure;h=d3294fb598984b68abfa9d9457bb0f874b8c2ece;hb=e6f13b80bae82ebd123dd6485d0bdc832fabfd16;hp=259f89c54e148ec21766c3ff9facb17d5d904ae0;hpb=bd16254ad1298b6f145dc0e1b965b0e48864d9ca;p=modules%2Fkernel.git

diff --git a/build_configure b/build_configure
index 259f89c54..d3294fb59 100755
--- a/build_configure
+++ b/build_configure
@@ -28,8 +28,11 @@ CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"`
 
 find_in()
 {
-  local i
-  local f=$2
+#CCRT
+  #local i
+  i=0
+  #local f=$2
+  f=$2
 
 # if the first argument is not a directory, returns
 
@@ -79,9 +82,13 @@ 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 
+#CCRT
+#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 ..."
         chmod u-w configure.in.base 
@@ -89,6 +96,11 @@ then
 fi
 chmod u-w configure.in.base 
 
+#############################################
+echo '' >> configure.in_tmp1
+echo 'export TEMPO=${KERNEL_ROOT_DIR}' >> configure.in_tmp1
+echo 'export KERNEL_ROOT_DIR=${ROOT_SRCDIR}' >> configure.in_tmp1
+#############################################
 
 echo  "" >> configure.in_tmp1
 echo "AC_OUTPUT([ \\" >> configure.in_tmp1
@@ -99,24 +111,30 @@ echo "AC_OUTPUT([ \\" >> configure.in_tmp1
 # put them "manually"
 #
 
-echo "	./adm/unix/SALOMEconfig.h \\" >> configure.in_tmp1
-echo "	./adm/unix/F77config.h \\" >> configure.in_tmp1
-echo "	./adm/unix/sstream \\" >> configure.in_tmp1
-echo "	./adm/unix/depend \\" >> configure.in_tmp1
-echo "	./adm/unix/make_omniorb \\" >> configure.in_tmp1
-echo "	./adm/unix/envScript \\" >> configure.in_tmp1
-echo "	./adm/unix/make_commence \\" >> configure.in_tmp1
-echo "	./adm/unix/make_conclude \\" >> configure.in_tmp1
-echo "	./adm/unix/make_module \\" >> configure.in_tmp1
+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 "	./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 "	./salome_adm/unix/make_module \\" >> configure.in_tmp1
+echo "  ./salome_adm/Makefile \\" >> configure.in_tmp1
 
 \rm -f configure.in_tmp2 configure.in_tmp3
 touch configure.in_tmp2
 find_in . configure.in_tmp2
-sed '/^...adm/d' configure.in_tmp2 >  configure.in_tmp3
-sed '/configure.in/d' configure.in_tmp3 >  configure.in_tmp2
+sed '/^...salome_adm/d' configure.in_tmp2 >  configure.in_tmp3
+sed '/configure.in/d;/make_config.in/d' configure.in_tmp3 >  configure.in_tmp2
 sed 's/.in / /' configure.in_tmp2 >> configure.in_tmp1
 
 echo  "])" >> configure.in_tmp1
+
+#############################################
+echo 'export KERNEL_ROOT_DIR=${TEMPO}' >> configure.in_tmp1
+#############################################
+
 \mv configure.in_tmp1 configure.in_new
 \rm  -f configure.in_tmp2 configure.in_tmp3
 
@@ -138,9 +156,13 @@ then
 	fi
 else
 	echo -n "Updating 'configure.in' file ... "
-	if ! \cp configure.in configure.in_old >& /dev/null
+#CCRT
+#	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"
 		echo -n "Continue (you will not be able to revert) - (Y/N) ? "
@@ -172,7 +194,7 @@ else
 	echo -n "Creating 'configure' script ...  "
 fi
 
-aclocal --acdir=adm/unix/config_files
+aclocal --acdir=adm_local/unix/config_files -I salome_adm/unix/config_files
 if autoconf
 then
 	echo "done"
@@ -180,6 +202,23 @@ else
 	echo "failed (check file permissions and/or user quotas ...)"
 fi
 
+###############################################################
+# Creating make_config
+#
+if test -f make_config
+then
+	echo -n "Updating 'make_config' script ...  "
+else
+	echo -n "Creating 'make_config' script ...  "
+fi
+
+if autoconf -o make_config make_config.in
+then
+	echo "done"
+else
+	echo "failed (check file permissions and/or user quotas ...)"
+fi
+
 cd ${ORIG_DIR}
 
 echo