Join modifications for CCRT by Jean Rahuel.

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index 8a907ac9e004198c5ac89786a30537cfb797cd4b..492d000b76a7660484b7e49ef5d44b237907b3a2 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -266,6 +266,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 ($(GEOM_WITH_GUI),yes)
 ACLOCAL_GUI = \
 check_vtk.m4                     check_opengl.m4    check_qt.m4        \
 check_GUI.m4                     check_corba_in_GUI.m4
@@ -274,3 +275,11 @@ $(top_srcdir)/aclocal.m4: $(ACLOCAL_KERNEL:%=@KERNEL_ROOT_DIR@/salome_adm/unix/c
                           $(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 ($(GEOM_WITH_GUI),no)
+ACLOCAL_GUI = check_qt.m4
+
+$(top_srcdir)/aclocal.m4: $(ACLOCAL_KERNEL:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \
+       cd $(top_srcdir) ; aclocal -I adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files
+endif

diff --git a/build_configure b/build_configure
index 7e516789c110504c8d98dac8b4c646cadc13dc18..163fcda082401e33b74180489ac2bf56cd8aac8c 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -11,6 +11,7 @@
 
 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
@@ -25,11 +26,26 @@ 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 ! -d "${GUI_ROOT_DIR}"; then
-    echo "failed : GUI_ROOT_DIR variable is not correct !"
-    exit
+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
 
 ########################################################################
@@ -209,8 +225,15 @@ else
        echo -n "Creating 'configure' script ...  "
 fi
 
+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"

diff --git a/configure.in.base b/configure.in.base
index f3281e0fc039c1b6f11f2217f3340f7cd74ac8b8..c441bcb31892ff0fa74c515cb113f22c85df4a24 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -120,6 +120,14 @@ dnl
 
 AC_CXX_HAVE_SSTREAM
 
+dnl
+dnl ---------------------------------------------
+dnl testing WITHIHM
+dnl ---------------------------------------------
+dnl
+
+CHECK_WITHIHM
+
 dnl
 dnl ---------------------------------------------
 dnl testing MPICH
@@ -200,13 +208,15 @@ AC_SUBST_FILE(CORBA)
 corba=make_$ORB
 CORBA=adm_local/unix/$corba
 
-echo
-echo ---------------------------------------------
-echo testing openGL
-echo ---------------------------------------------
-echo
+if test "X$WITHIHM" = "Xyes"; then
+       echo
+       echo ---------------------------------------------
+       echo testing openGL
+       echo ---------------------------------------------
+       echo
 
-CHECK_OPENGL
+       CHECK_OPENGL
+fi
 
 echo
 echo ---------------------------------------------
@@ -224,13 +234,15 @@ echo
 
 CHECK_MSG2QM
 
-echo
-echo ---------------------------------------------
-echo testing VTK
-echo ---------------------------------------------
-echo
+if test "X$WITHIHM" = "Xyes"; then
+       echo
+       echo ---------------------------------------------
+       echo testing VTK
+       echo ---------------------------------------------
+       echo
 
-CHECK_VTK
+       CHECK_VTK
+fi
 
 echo
 echo ---------------------------------------------
@@ -264,24 +276,26 @@ echo
 
 CHECK_HTML_GENERATORS
 
-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 GEOM module necessary full GUI !"
-  exit
+if test "X$WITHIHM" = "Xyes"; then
+       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 GEOM module necessary full GUI !"
+       exit
+       fi
 fi
 
 echo

diff --git a/src/Makefile.in b/src/Makefile.in
index a337bb8c5fbb7bec8f7fb134f7390495b84344fd..c3f92245f3d608949abad591e035bb230e667f3e 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -32,6 +32,12 @@ VPATH=.:@srcdir@
 
 @COMMENCE@
 
-SUBDIRS = OBJECT ARCHIMEDE NMTDS NMTTools NMTAlgo GEOMAlgo SKETCHER GEOM BREPExport BREPImport IGESExport IGESImport STEPExport STEPImport ShHealOper GEOMImpl GEOM_I GEOMClient DlgRef GEOMFiltersSelection GEOMGUI GEOMBase GEOMToolsGUI DisplayGUI BasicGUI PrimitiveGUI GenerationGUI EntityGUI BuildGUI BooleanGUI TransformationGUI OperationGUI RepairGUI MeasureGUI GroupGUI BlocksGUI GEOM_I_Superv GEOM_SWIG STLExport
+#SUBDIRS = OBJECT ARCHIMEDE NMTDS NMTTools NMTAlgo GEOMAlgo SKETCHER GEOM BREPExport BREPImport IGESExport IGESImport STEPExport STEPImport ShHealOper GEOMImpl GEOM_I GEOMClient DlgRef GEOMFiltersSelection GEOMGUI GEOMBase GEOMToolsGUI DisplayGUI BasicGUI PrimitiveGUI GenerationGUI EntityGUI BuildGUI BooleanGUI TransformationGUI OperationGUI RepairGUI MeasureGUI GroupGUI BlocksGUI GEOM_I_Superv GEOM_SWIG STLExport
+
+SUBDIRS = ARCHIMEDE NMTDS NMTTools NMTAlgo GEOMAlgo SKETCHER GEOM BREPExport BREPImport IGESExport IGESImport STEPExport STEPImport ShHealOper GEOMImpl GEOM_I GEOMClient GEOM_I_Superv GEOM_SWIG STLExport
+
+ifeq (@WITHIHM@,yes)
+  SUBDIRS+= OBJECT DlgRef GEOMFiltersSelection GEOMGUI GEOMBase GEOMToolsGUI DisplayGUI BasicGUI PrimitiveGUI GenerationGUI EntityGUI BuildGUI BooleanGUI TransformationGUI OperationGUI RepairGUI MeasureGUI GroupGUI BlocksGUI GEOM_SWIG_WITHIHM
+endif
 
 @MODULE@