Join modifications from branch OCC_development_for_3_2_0a2

diff --git a/Makefile.in b/Makefile.in
index 30d76084b9dde318123ef5b80766931ad23d06be..33913b7b3ad08bfa2abbd1c5a20d21af12db8504 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,7 +13,7 @@ VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl
 
 @COMMENCE@
 
-SUBDIRS = idl src
+SUBDIRS = idl src adm_local
 
 RESOURCES_FILES = PYHELLOCatalog.xml PYHELLO.png PYHELLO_en.xml \
                   ExecPYHELLO.png

diff --git a/adm_local/Makefile.in b/adm_local/Makefile.in
new file mode 100644 (file)
index 0000000..9b5e810
--- /dev/null
+++ b/adm_local/Makefile.in
@@ -0,0 +1,41 @@
+# source path
+top_srcdir=@top_srcdir@
+top_builddir=..
+srcdir=@srcdir@
+VPATH=.:$(srcdir)/adm_local
+
+
+all: resources
+
+install:
+       cp -rf @top_srcdir@/adm_local @prefix@
+
+bin:
+
+resources :
+       cp -rf @top_srcdir@/adm_local $(top_builddir)
+
+inc:
+
+lib:
+
+depend:
+
+depend_idl:
+
+install-end:
+
+install-include:
+
+install-bin:
+
+uninstall:
+
+uninstall-idl:
+
+distclean:
+
+clean:
+
+distclean-other:
+

diff --git a/adm_local/unix/config_files/check_PYHELLO.m4 b/adm_local/unix/config_files/check_PYHELLO.m4
new file mode 100755 (executable)
index 0000000..6cb9c9d
--- /dev/null
+++ b/adm_local/unix/config_files/check_PYHELLO.m4
@@ -0,0 +1,53 @@
+#  Check availability of PYHELLO binary distribution
+#
+#  Author : Marc Tajchman (CEA, 2002)
+#------------------------------------------------------------
+
+AC_DEFUN([CHECK_PYHELLO],[
+
+AC_CHECKING(for PyHello)
+
+PyHello_ok=no
+
+AC_ARG_WITH(pyHello,
+           --with-py-hello=DIR root directory path of PYHELLO installation,
+           PYHELLO_DIR="$withval",PYHELLO_DIR="")
+
+if test "x$PYHELLO_DIR" = "x" ; then
+
+# no --with-py-hello option used
+
+  if test "x$PYHELLO_ROOT_DIR" != "x" ; then
+
+    # PYHELLO_ROOT_DIR environment variable defined
+    PYHELLO_DIR=$PYHELLO_ROOT_DIR
+
+  else
+
+    # search PyHello binaries in PATH variable
+    AC_PATH_PROG(TEMP, PYHELLOGUI.py)
+    if test "x$TEMP" != "x" ; then
+      PYHELLO_BIN_DIR=`dirname $TEMP`
+      PYHELLO_DIR=`dirname $PYHELLO_BIN_DIR`
+    fi
+
+  fi
+#
+fi
+
+if test -f ${PYHELLO_DIR}/bin/salome/PYHELLOGUI.py  ; then
+  PyHello_ok=yes
+  AC_MSG_RESULT(Using PYHELLO distribution in ${PYHELLO_DIR})
+
+  if test "x$PYHELLO_ROOT_DIR" == "x" ; then
+    PYHELLO_ROOT_DIR=${PYHELLO_DIR}
+  fi
+  AC_SUBST(PYHELLO_ROOT_DIR)
+else
+  AC_MSG_WARN("Cannot find compiled PYHELLO distribution")
+fi
+  
+AC_MSG_RESULT(for PYHELLO: $PyHello_ok)
+ 
+])dnl
+ 

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index 623267d618e251d9346bb8fce71c416956700311..e6c484b72a3bed924fcc017999e782d3b3aa41b0 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -239,13 +239,20 @@ $(top_srcdir)/configure.in: $(top_srcdir)/configure.in.base
 
 
 ACLOCAL_SRC = \
-ac_cxx_bool.m4                    check_corba.m4     check_vtk.m4      \
+ac_cxx_bool.m4                    check_corba.m4                       \
 ac_cxx_depend_flag.m4             check_hdf5.m4      enable_pthreads.m4        \
 ac_cxx_mutable.m4                 check_mico.m4      libtool.m4                \
 ac_cxx_namespaces.m4              check_omniorb.m4   pyembed.m4                \
-ac_cxx_partial_specialization.m4  check_opengl.m4    python.m4         \
+ac_cxx_partial_specialization.m4  python.m4                            \
 ac_cxx_typename.m4                check_pthreads.m4  check_cas.m4      \
-ac_cc_warnings.m4                 check_qt.m4        check_swig.m4 
+ac_cc_warnings.m4                 check_swig.m4 
 
-$(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%)
+ACLOCAL_GUI = \
+check_vtk.m4                      check_opengl.m4    check_qt.m4        \
+check_GUI.m4                      check_corba_in_GUI.m4
+
+$(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \
+                          $(ACLOCAL_GUI:%=@GUI_ROOT_DIR@/adm_local/unix/config_files/%)
        cd $(top_srcdir) ; aclocal --acdir=adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files
+                                                                      -I @GUI_ROOT_DIR@/adm_local/unix/config_files
+

diff --git a/build_configure b/build_configure
index 573a23bb35af1e8270d77d38ce2ac26d6eaea717..f2ef6da018628081bf187daec392f125c572a2fd 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -20,6 +20,14 @@ if test ! -d "${KERNEL_ROOT_DIR}"; then
     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
 #
@@ -49,6 +57,7 @@ find_in()
 
   case $1 in
     */CVS) return ;;
+    */adm_local/*) return ;;
     *) ;;
   esac
 
@@ -128,9 +137,9 @@ echo "./salome_adm/unix/make_module \\" >> configure.in_tmp1
 touch configure.in_tmp2
 find_in . configure.in_tmp2
 
-sed -e '/^.\/salome_adm/d'    \
+sed -e '/^...salome_adm/d'    \
     -e '/configure.in/d'      \
-    -e '/^.\/adm_local/d'   \
+    -e '/^...adm_local/d'   \
     -e 's/.in / /'            \
     configure.in_tmp2  >>  configure.in_tmp1
 
@@ -194,7 +203,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"

diff --git a/configure.in.base b/configure.in.base
index 9eaef0a03b5ce2536dc1897c896cf754b8c87c73..ec8d23d7ad1c9dccc6e66547c492e21a0ff9ca8c 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -123,6 +123,26 @@ echo
 
 CHECK_MSG2QM
 
+echo
+echo ---------------------------------------------
+echo Testing GUI
+echo ---------------------------------------------
+echo
+
+CHECK_SALOME_GUI
+
+echo
+echo ---------------------------------------------
+echo Testing full GUI
+echo ---------------------------------------------
+echo
+
+CHECK_CORBA_IN_GUI
+if test "x${CORBA_IN_GUI}" != "xyes"; then
+  echo "failed : For configure PYHELLO1 module necessary full GUI !"
+  exit
+fi
+
 echo
 echo ---------------------------------------------
 echo Testing Kernel