X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=build_configure;h=066fad9c08789c4b4ad1a30e9d49173505e5842b;hb=e848f45eaaeafaf91c9a77c7379cb357dac13f0c;hp=b884b17573c5c091aecfa41db38e610a7ee25b16;hpb=6b471bcc54cbeb90f0d977323db8c76d3d2cce09;p=modules%2Fsmesh.git

diff --git a/build_configure b/build_configure
index b884b1757..066fad9c0 100755
--- a/build_configure
+++ b/build_configure
@@ -11,6 +11,7 @@
 
 ORIG_DIR=`pwd`
 CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"`
+SMESH_WITH_GUI="yes"
 
 ########################################################################
 # Test if the KERNEL_ROOT_DIR is set correctly
@@ -26,6 +27,45 @@ fi
 #    echo "failed : KERNEL_SRC variable is not correct !"
 #    exit
 #fi
+
+for option
+do
+  case $option in
+      -with-ihm | --with-ihm)
+          SMESH_WITH_GUI="yes"
+          break;;
+      -without-ihm | --without-ihm | -with-ihm=no | --with-ihm=no)
+          SMESH_WITH_GUI="no"
+          break;;
+  esac
+done
+
+########################################################################
+# Test if the GUI_ROOT_DIR is set correctly
+
+if test ${SMESH_WITH_GUI} = yes; then
+    if test ! -d "${GUI_ROOT_DIR}"; then
+        echo "failed : GUI_ROOT_DIR variable is not correct !"
+        exit
+    fi
+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
+
+########################################################################
+# Test if the GEOM_ROOT_DIR is set correctly
+
+if test ! -d "${GEOM_ROOT_DIR}"; then
+    echo "failed : GEOM_ROOT_DIR variable is not correct !"
+    exit
+fi
+
 ########################################################################
 # find_in - utility function
 #
@@ -125,10 +165,10 @@ 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 "	./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 "	./adm_local/unix/make_commence \\" >> configure.in_tmp1
-echo "	./adm_local/unix/make_conclude \\" >> configure.in_tmp1
+echo "	./adm_local/unix/make_commence:${ABS_CONF_DIR}/adm_local/unix/make_commence.in \\" >> configure.in_tmp1
+echo "	./adm_local/unix/make_conclude:${ABS_CONF_DIR}/adm_local/unix/make_conclude.in \\" >> configure.in_tmp1
 echo "	./salome_adm/unix/make_module \\" >> configure.in_tmp1
 
 \rm -f configure.in_tmp2 configure.in_tmp3
@@ -203,7 +243,19 @@ else
 	echo -n "Creating 'configure' script ...  "
 fi
 
-aclocal --acdir=adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files
+if test ${SMESH_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 \
+                                       -I ${MED_ROOT_DIR}/adm_local/unix/config_files \
+                                       -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files
+fi
+
+if test ${SMESH_WITH_GUI} = no; then
+aclocal -I adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
+                                       -I ${MED_ROOT_DIR}/adm_local/unix/config_files \
+                                       -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files
+fi
+
 if autoconf
 then
 	echo "done"