From: nri <nri@opencascade.com>
Date: Wed, 16 Jul 2003 11:30:07 +0000 (+0000)
Subject: NRI : Merge from V1_2.
X-Git-Tag: V_02092003~4
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=af1230f1f6a6fc72e7a0ba9371a3c984eedad129;p=modules%2Fsuperv.git

NRI : Merge from V1_2.
---

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index 2435e10..f6d5ea9 100644
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -144,7 +144,7 @@ CORBA_INCLUDES    = @CORBA_INCLUDES@
 CORBA_LIBS        = @CORBA_LIBS@
 CORBA_CXXFLAGS    = @CORBA_CXXFLAGS@
 
-IDLCXXFLAGS = @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl -I$(KERNEL_ROOT_DIR)/idl/salome
+IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl -I$(KERNEL_ROOT_DIR)/idl/salome
 IDLPYFLAGS  = @IDLPYFLAGS@
 
 IDL = @IDL@
diff --git a/configure.in.base b/configure.in.base
index e76e6eb..212a375 100644
--- a/configure.in.base
+++ b/configure.in.base
@@ -140,13 +140,13 @@ echo
 
 CHECK_PYTHON
 
-echo
-echo ---------------------------------------------
-echo testing java
-echo ---------------------------------------------
-echo
+dnl echo
+dnl echo ---------------------------------------------
+dnl echo testing java
+dnl echo ---------------------------------------------
+dnl echo
 
-CHECK_JAVA
+dnl CHECK_JAVA
 
 echo
 echo ---------------------------------------------
@@ -172,13 +172,13 @@ echo
 
 CHECK_OMNIORB
 
-echo
-echo ---------------------------------------------
-echo testing mico
-echo ---------------------------------------------
-echo
+dnl echo
+dnl echo ---------------------------------------------
+dnl echo testing mico
+dnl echo ---------------------------------------------
+dnl echo
 
-CHECK_MICO
+dnl CHECK_MICO
 
 echo
 echo ---------------------------------------------
@@ -264,7 +264,7 @@ echo ---------------------------------------------
 echo
 
 echo Configure
-variables="cc_ok lex_yacc_ok python_ok java_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok med2_ok omniORB_ok mico_ok occ_ok doxygen_ok graphviz_ok Kernel_ok"
+variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok med2_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok"
 
 for var in $variables
 do