Join modifications from branch OCC_development_for_3_2_0a2

[samples/light.git] / build_configure

diff --git a/build_configure b/build_configure
index ab0f71c250133d9e861ce295c209abcca9d944ed..3571d17baadf8733ba076b8a09b192ecc981d586 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -48,6 +48,14 @@ fi
 #    echo "failed : KERNEL_SRC variable is not correct !"
 #    exit
 #fi
+########################################################################
+# Test if the GUI_ROOT_DIR is set correctly
+
+if test ! -d "${GUI_ROOT_DIR}"; then
+    echo "failed : GUI_ROOT_DIR variable is not correct !"
+    exit
+fi
+
 ########################################################################
 # find_in - utility function
 #
@@ -77,6 +85,7 @@ find_in()
 
   case $1 in
     */CVS) return ;;
+    */adm_local/*) return ;;
     *) ;;
   esac
 
@@ -151,7 +160,7 @@ 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 \\" >> configure.in_tmp1
 echo " ./salome_adm/unix/envScript \\" >> configure.in_tmp1
 echo " ./salome_adm/unix/make_module \\" >> configure.in_tmp1
 
@@ -162,7 +171,6 @@ echo "      ./salome_adm/unix/make_module \\" >> configure.in_tmp1
 # c'est à dire le make_conclude (resp. make_commence) du répertoire
 # adm_local
 echo " ./adm_local/unix/make_commence \\" >> configure.in_tmp1
-echo " ./salome_adm/unix/make_conclude \\" >> configure.in_tmp1
 
 \rm -f configure.in_tmp2 configure.in_tmp3
 touch configure.in_tmp2
@@ -173,7 +181,6 @@ find_in . configure.in_tmp2
 # 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
@@ -238,7 +245,8 @@ else
        echo -n "Creating 'configure' script ...  "
 fi
 
-aclocal --acdir=adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files
+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
 if autoconf
 then
        echo "done"