X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=build_configure;h=163fcda082401e33b74180489ac2bf56cd8aac8c;hb=refs%2Ftags%2FV3_2_9rc1;hp=c70b9c22901b966bbe5af9de73c88a831b2c1ec7;hpb=f4fbc5bf62f5be9cad4d1c752bafc953c9c39509;p=modules%2Fgeom.git

diff --git a/build_configure b/build_configure
index c70b9c229..163fcda08 100755
--- a/build_configure
+++ b/build_configure
@@ -11,10 +11,10 @@
 
 ORIG_DIR=`pwd`
 CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"`
+GEOM_WITH_GUI="yes"
 
 ########################################################################
 # Test if the KERNEL_ROOT_DIR is set correctly
-
 if test ! -d "${KERNEL_ROOT_DIR}"; then
     echo "failed : KERNEL_ROOT_DIR variable is not correct !"
     exit
@@ -26,6 +26,28 @@ fi
 #    echo "failed : KERNEL_SRC variable is not correct !"
 #    exit
 #fi
+
+for option
+do
+  case $option in
+      -with-ihm | --with-ihm)
+          GEOM_WITH_GUI="yes"
+          break;;
+      -without-ihm | --without-ihm | -with-ihm=no | --with-ihm=no)
+          GEOM_WITH_GUI="no"
+          break;;
+  esac
+done
+
+########################################################################
+# Test if the GUI_ROOT_DIR is set correctly
+if test ${GEOM_WITH_GUI} = yes; then
+    if test ! -d "${GUI_ROOT_DIR}"; then
+        echo "failed : GUI_ROOT_DIR variable is not correct !"
+        exit
+    fi
+fi
+
 ########################################################################
 # find_in - utility function
 #
@@ -55,6 +77,7 @@ find_in()
 
   case $1 in
     */CVS) return ;;
+    */adm_local/*) return ;;
     *) ;;
   esac
 
@@ -103,9 +126,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}/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
@@ -120,24 +147,29 @@ 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:${ABS_CONF_DIR}/adm_local/unix/make_omniorb.in \\" >> configure.in_tmp1
 echo "	./salome_adm/unix/envScript \\" >> configure.in_tmp1
-echo "	./salome_adm/unix/make_commence \\" >> configure.in_tmp1
+echo "	./adm_local/unix/make_commence:${ABS_CONF_DIR}/adm_local/unix/make_commence.in \\" >> configure.in_tmp1
 echo "	./salome_adm/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 'rm -f ${ROOT_SRCDIR}/salome_adm' >> 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 +225,15 @@ else
 	echo -n "Creating 'configure' script ...  "
 fi
 
-aclocal --acdir=${KERNEL_ROOT_DIR}/salome_adm/unix/config_files
+if test ${GEOM_WITH_GUI} = yes; then
+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
+fi
+
+if test ${GEOM_WITH_GUI} = no; then
+aclocal -I adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files
+fi
+
 if autoconf
 then
 	echo "done"