Join modifications from branch OCC_development_for_3_2_0a2

[samples/light.git] / adm_local / unix / make_commence.in

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index 4ece646866d03f4d8ff27d73d9349053a58acbbe..a2e0a8cdaa9ce7b29d511a471025cdc23e6829f4 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -1,6 +1,8 @@
 # common directories to put headerfiles
 inc_builddir=$(top_builddir)/include/salome
 
+GUI_DISABLE_CORBA=@GUI_DISABLE_CORBA@
+
 @SET_MAKE@
 SHELL=@SHELL@
 
@@ -131,52 +133,52 @@ SWIG       = @SWIG@
 SWIG_FLAGS = @SWIG_FLAGS@ -I$(inc_builddir) -I$(srcdir) -I.
 
 # OMNIORB
+#
+#OMNIORB_ROOT        = @OMNIORB_ROOT@
+#OMNIORB_INCLUDES    = @OMNIORB_INCLUDES@
+#OMNIORB_LIBS        = @OMNIORB_LIBS@
+#OMNIORB_CXXFLAGS    = @OMNIORB_CXXFLAGS@
 
-OMNIORB_ROOT        = @OMNIORB_ROOT@
-OMNIORB_INCLUDES    = @OMNIORB_INCLUDES@
-OMNIORB_LIBS        = @OMNIORB_LIBS@
-OMNIORB_CXXFLAGS    = @OMNIORB_CXXFLAGS@
-
-OMNIORB_IDL         = @OMNIORB_IDL@
-OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@
-OMNIORB_IDLPYFLAGS  = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/salome/idl \
-       -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome
+#OMNIORB_IDL         = @OMNIORB_IDL@
+#OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@
+#OMNIORB_IDLPYFLAGS  = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/salome/idl \
+#      -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome
 
-OMNIORB_IDL_CLN_H   = @OMNIORB_IDL_CLN_H@
-OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@
-OMNIORB_IDL_CLN_OBJ = @OMNIORB_IDL_CLN_OBJ@
+#OMNIORB_IDL_CLN_H   = @OMNIORB_IDL_CLN_H@
+#OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@
+#OMNIORB_IDL_CLN_OBJ = @OMNIORB_IDL_CLN_OBJ@
 
-OMNIORB_IDL_SRV_H   = @OMNIORB_IDL_SRV_H@
-OMNIORB_IDL_SRV_CXX = @OMNIORB_IDL_SRV_CXX@
-OMNIORB_IDL_SRV_OBJ = @OMNIORB_IDL_SRV_OBJ@
+#OMNIORB_IDL_SRV_H   = @OMNIORB_IDL_SRV_H@
+#OMNIORB_IDL_SRV_CXX = @OMNIORB_IDL_SRV_CXX@
+#OMNIORB_IDL_SRV_OBJ = @OMNIORB_IDL_SRV_OBJ@
 
 # Default ORB
 
-CORBA_ROOT        = @CORBA_ROOT@
-CORBA_INCLUDES    = @CORBA_INCLUDES@
-CORBA_LIBS        = @CORBA_LIBS@
-CORBA_CXXFLAGS    = @CORBA_CXXFLAGS@
+#CORBA_ROOT        = @CORBA_ROOT@
+#CORBA_INCLUDES    = @CORBA_INCLUDES@
+#CORBA_LIBS        = @CORBA_LIBS@
+#CORBA_CXXFLAGS    = @CORBA_CXXFLAGS@
 
-IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl/salome \
-       -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome
-IDLPYFLAGS  = @IDLPYFLAGS@
+#IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl/salome \
+#      -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome
+#IDLPYFLAGS  = @IDLPYFLAGS@
 
-IDL = @IDL@
+#IDL = @IDL@
 
-IDL_CLN_H   = @IDL_CLN_H@
-IDL_CLN_CXX = @IDL_CLN_CXX@
-IDL_CLN_OBJ = @IDL_CLN_OBJ@
+#IDL_CLN_H   = @IDL_CLN_H@
+#IDL_CLN_CXX = @IDL_CLN_CXX@
+#IDL_CLN_OBJ = @IDL_CLN_OBJ@
 
-IDL_SRV_H   = @IDL_SRV_H@
-IDL_SRV_CXX = @IDL_SRV_CXX@
-IDL_SRV_OBJ = @IDL_SRV_OBJ@
+#IDL_SRV_H   = @IDL_SRV_H@
+#IDL_SRV_CXX = @IDL_SRV_CXX@
+#IDL_SRV_OBJ = @IDL_SRV_OBJ@
 
-CPPFLAGS+= $(CORBA_INCLUDES) 
-CXXFLAGS+= $(CORBA_CXXFLAGS)
+#CPPFLAGS+= $(CORBA_INCLUDES) 
+#CXXFLAGS+= $(CORBA_CXXFLAGS)
 
 # add corba libs when link salome application ! 
 #LDFLAGS+= $(CORBA_LIBS)
-LIBS+=$(CORBA_LIBS)
+#LIBS+=$(CORBA_LIBS)
 
 DOXYGEN = @DOXYGEN@
 
@@ -253,13 +255,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                                                         \
 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_namespaces.m4              pyembed.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
+
+ACLOCAL_GUI = \
+check_vtk.m4                     check_opengl.m4    check_qt.m4        \
+check_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
 
-$(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%)
-       cd $(top_srcdir) ; aclocal --acdir=adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files