Join modifications from branch BR_SUPERV_CCRT_V4_0

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index 328bf27b45a37070623bd46ef9748c6df6218a80..bc5cc9ed900c8896b46cd5c30c456d8836ca1703 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -275,6 +275,7 @@ ac_cxx_partial_specialization.m4  python.m4                         \
 ac_cxx_typename.m4                check_pthreads.m4  check_cas.m4      \
 ac_cc_warnings.m4                 check_swig.m4 
 
+ifeq ($(SUPERV_WITH_GUI),yes)
 ACLOCAL_GUI = \
 check_vtk.m4                     check_opengl.m4    check_qt.m4       \
 check_GUI.m4                      check_corba_in_GUI.m4 
@@ -283,3 +284,12 @@ $(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/conf
                           $(ACLOCAL_GUI:%=@GUI_ROOT_DIR@/adm_local/unix/config_files/%)
        cd $(top_srcdir) ; 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
+endif
+
+ifeq ($(SUPERV_WITH_GUI),no)
+$(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 -I adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_file
+s
+endif
+

diff --git a/build_configure b/build_configure
index 95905061b6bdc51f4992545dad31cec230a47611..2acc679e27d2411dc7e85a775bc2379b32bc279b 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -12,6 +12,23 @@
 ORIG_DIR=`pwd`
 CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"`
 
+########################################################################
+# Check --with-kernel option
+
+SUPERV_WITH_GUI="yes"
+
+for option
+do
+  case $option in
+      -with-ihm | --with-ihm)
+          SUPERV_WITH_GUI="yes"
+          break;;
+      -without-ihm | --without-ihm | -with-ihm=no | --with-ihm=no)
+          SUPERV_WITH_GUI="no"
+          break;;
+  esac
+done
+
 ########################################################################
 # Test if the KERNEL_ROOT_DIR is set correctly
 
@@ -29,9 +46,11 @@ fi
 ########################################################################
 # Test if the GUI_ROOT_DIR is set correctly
 
-if test ! -d "${GUI_ROOT_DIR}"; then
+if test ${SUPERV_WITH_GUI} = yes; then
+  if test ! -d "${GUI_ROOT_DIR}"; then
     echo "failed : GUI_ROOT_DIR variable is not correct !"
     exit
+  fi
 fi
 
 ########################################################################
@@ -211,8 +230,13 @@ else
        echo -n "Creating 'configure' script ...  "
 fi
 
-aclocal -I adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
+if test ${SUPERV_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
+else
+  aclocal -I adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files
+fi
+
 if autoconf
 then
        echo "done"

diff --git a/configure.in.base b/configure.in.base
index e1989590590d2fc7ac9129b85e54d6ea8ace05c2..e2adf524ea3f73e0b8f37ab9d2b0ab7ce07d31d9 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -204,14 +204,6 @@ AC_SUBST_FILE(CORBA)
 corba=make_$ORB
 CORBA=adm_local/unix/$corba
 
-echo
-echo ---------------------------------------------
-echo testing openGL
-echo ---------------------------------------------
-echo
-
-CHECK_OPENGL
-
 echo
 echo ---------------------------------------------
 echo testing QT
@@ -220,21 +212,41 @@ echo
 
 CHECK_QT
 
-echo
-echo ---------------------------------------------
-echo testing MSG2QM
-echo ---------------------------------------------
-echo
+dnl
+dnl ---------------------------------------------
+dnl testing WITHIHM
+dnl ---------------------------------------------
+dnl
 
-CHECK_MSG2QM
+CHECK_WITHIHM
 
-echo
-echo ---------------------------------------------
-echo testing VTK
-echo ---------------------------------------------
-echo
+if test "X$WITHIHM" = "Xyes"; then
+
+  echo
+  echo ---------------------------------------------
+  echo testing openGL
+  echo ---------------------------------------------
+  echo
+  
+  CHECK_OPENGL
 
-CHECK_VTK
+  echo
+  echo ---------------------------------------------
+  echo testing MSG2QM
+  echo ---------------------------------------------
+  echo
+
+  CHECK_MSG2QM
+
+  echo
+  echo ---------------------------------------------
+  echo testing VTK
+  echo ---------------------------------------------
+  echo
+
+  CHECK_VTK
+
+fi
 
 echo
 echo ---------------------------------------------
@@ -268,25 +280,28 @@ echo
 
 CHECK_HTML_GENERATORS
 
-echo
-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 SUPERV module necessary full GUI !"
-  exit
+if test "X$WITHIHM" = "Xyes"; then
+ 
+  echo
+  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 SUPERV module necessary full GUI !"
+    exit
+  fi
 fi
 
 echo ---------------------------------------------
@@ -303,7 +318,12 @@ echo ---------------------------------------------
 echo
 
 echo Configure
-variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok Kernel_ok"
+if test "X$WITHIHM" = "Xyes"; then
+  variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok Kernel_ok"
+fi
+if test "X$WITHIHM" = "Xno"; then
+  variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok qt_ok hdf5_ok omniORB_ok boost_ok occ_ok Kernel_ok"
+fi
 
 for var in $variables
 do

diff --git a/src/GraphBase/Makefile.in b/src/GraphBase/Makefile.in
index 8cc88a7939aa1939c80441e4eeb6c9a60ca4fc23..13d38b015aaf9c4fc5a2915449e8ccc0b8d420c6 100644 (file)
--- a/src/GraphBase/Makefile.in
+++ b/src/GraphBase/Makefile.in
@@ -99,8 +99,7 @@ BIN = SuperVisionBase_CheckOfUndefined
 BIN_SRC = 
 BIN_SERVER_IDL = 
 
-CPPFLAGS+= $(PYTHON_INCLUDES) $(QT_MT_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) \
-       $(KERNEL_CXXFLAGS)
+CPPFLAGS+= $(PYTHON_INCLUDES) $(QT_MT_INCLUDES) $(KERNEL_CXXFLAGS)
 CXXFLAGS+= -g -D__x86__ -D__linux__ -ftemplate-depth-42 -Wall \
        $(KERNEL_CXXFLAGS)
 
@@ -109,8 +108,7 @@ ifeq ($(OS),REDHAT)
 endif
 
 LDFLAGS+= $(SUPERV_LDFLAGS) $(CORBA_LIBS) -lSalomeNS -lSalomeLifeCycleCORBA -lOpUtil -lSALOMELocalTrace \
-       -lc $(PYTHON_LIBS) $(QT_MT_LIBS) $(OGL_LIBS) \
-       $(KERNEL_LDFLAGS)
+       -lc $(PYTHON_LIBS) $(QT_MT_LIBS) $(KERNEL_LDFLAGS)
 LDFLAGSFORBIN=$(LDFLAGS) -lSalomeContainer -lSalomeResourcesManager -lRegistry -lSalomeNotification -lSALOMEBasics
 //LIBS += -Xlinker -export-dynamic $(PYTHON_LIBS)
 

diff --git a/src/GraphEditor/Makefile.in b/src/GraphEditor/Makefile.in
index 341562f16f204e52f023e687b8b95161844eb215..87bfd0e84757c077a79ca908fa7d71b1eb88c5b5 100644 (file)
--- a/src/GraphEditor/Makefile.in
+++ b/src/GraphEditor/Makefile.in
@@ -58,12 +58,11 @@ LIB_CLIENT_IDL = SALOME_ModuleCatalog.idl \
 BIN_SRC = 
 BIN_SERVER_IDL = 
 
-CPPFLAGS+= $(PYTHON_INCLUDES) $(QT_MT_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) \
-       $(KERNEL_CXXFLAGS)
+CPPFLAGS+= $(PYTHON_INCLUDES) $(QT_MT_INCLUDES) $(KERNEL_CXXFLAGS)
 CXXFLAGS+= -g -D__x86__ -D__linux__ -ftemplate-depth-42 -Wall \
        $(KERNEL_CXXFLAGS)
 LDFLAGS+= -lSalomeNS -lSalomeLifeCycleCORBA -lSalomeSuperVisionBase -lOpUtil -lSALOMELocalTrace \
-       -lc $(QT_MT_LIBS) $(OGL_LIBS) $(KERNEL_LDFLAGS)
+       -lc $(QT_MT_LIBS) $(KERNEL_LDFLAGS)
 #LIBS += -Xlinker -export-dynamic $(PYTHON_LIBS)
 
 

diff --git a/src/GraphExecutor/Makefile.in b/src/GraphExecutor/Makefile.in
index 1d5776561719ccbc2d928c6864a8c43d31cd0a67..81151cb65e242e71d842ced837347a13b887f976 100644 (file)
--- a/src/GraphExecutor/Makefile.in
+++ b/src/GraphExecutor/Makefile.in
@@ -63,8 +63,7 @@ LIB_CLIENT_IDL = SALOME_ModuleCatalog.idl \
 BIN_SRC = 
 BIN_SERVER_IDL = 
 
-CPPFLAGS+= $(PYTHON_INCLUDES) $(QT_MT_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(OCC_INCLUDES) \
-       $(KERNEL_CXXFLAGS)
+CPPFLAGS+= $(PYTHON_INCLUDES) $(QT_MT_INCLUDES) $(OCC_INCLUDES) $(KERNEL_CXXFLAGS)
 CXXFLAGS+= -g -D__x86__ -D__linux__ -ftemplate-depth-42 -Wall \
        $(KERNEL_CXXFLAGS)
 
@@ -73,8 +72,7 @@ ifeq ($(OS),REDHAT)
 endif
 
 LDFLAGS+= -export-dynamic -lSalomeNS -lSalomeLifeCycleCORBA -lSalomeSuperVisionBase -lSalomeSuperVisionEditor -lOpUtil -lSALOMELocalTrace\
-       -lc $(QT_MT_LIBS) $(OGL_LIBS) \
-       $(KERNEL_LDFLAGS)
+       -lc $(QT_MT_LIBS) $(KERNEL_LDFLAGS)
 #LIBS += -Xlinker -export-dynamic $(PYTHON_LIBS)
 
 

diff --git a/src/Makefile.in b/src/Makefile.in
index d31285fe16a2317f137db9169b868519944adfda..f600625a710dbf7ab67853c58c8d63dfb0228c0f 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -31,6 +31,10 @@ VPATH=.:@srcdir@
 
 @COMMENCE@
 
-SUBDIRS = GraphBase GraphEditor GraphExecutor Supervision SUPERVGUI
+SUBDIRS = GraphBase GraphEditor GraphExecutor Supervision
+ifeq (@WITHIHM@,yes)
+  SUBDIRS+= SUPERVGUI
+endif
+
 
 @MODULE@

diff --git a/src/Supervision/Makefile.in b/src/Supervision/Makefile.in
index a60c80edf96bb0cf96653e185e012be3036abd7d..640c9e89f2239cb837991aa3cf1fac2536768f32 100755 (executable)
--- a/src/Supervision/Makefile.in
+++ b/src/Supervision/Makefile.in
@@ -88,7 +88,7 @@ BIN = SuperV_Server_omniORB4 \
 BIN_SRC = 
 BIN_SERVER_IDL = 
 
-CPPFLAGS+= $(PYTHON_INCLUDES) $(QT_MT_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(OCC_INCLUDES) $(BOOST_CPPFLAGS)\
+CPPFLAGS+= $(PYTHON_INCLUDES) $(QT_MT_INCLUDES) $(OCC_INCLUDES) $(BOOST_CPPFLAGS)\
        $(KERNEL_CXXFLAGS)
 CXXFLAGS += -g -D__x86__ -D__linux__ -ftemplate-depth-42 -Wall \
        $(KERNEL_CXXFLAGS) $(SUPERV_LDFLAGS)