NRI : Merge from V1_2.

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index 2435e1062f0bb65e92955d2fe354a6b04158ab7f..f6d5ea9cc2a4d41d62118b80436e0156807b90ae 100644 (file)
--- 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 e76e6eb954b10ab3332081399964e2a16581725f..212a37556a24f2ab891e0a58eac3a6c89761778b 100644 (file)
--- 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

diff --git a/src/ARCHIMEDE/Makefile.in b/src/ARCHIMEDE/Makefile.in
index c328fee69fe3dbc37430876dc0cc18e38399c918..b85b35997433c55c65a2a7eca38c9ab566ed4453 100644 (file)
--- a/src/ARCHIMEDE/Makefile.in
+++ b/src/ARCHIMEDE/Makefile.in
@@ -27,7 +27,7 @@
 #  $Header$
 
 top_srcdir=@top_srcdir@
-top_builddir=../../..
+top_builddir=../..
 srcdir=@srcdir@
 VPATH=.:@srcdir@:@top_srcdir@/idl
 

diff --git a/src/GEOM/Makefile.in b/src/GEOM/Makefile.in
index f51893f71b9054dd58d8a44959a17af616122f83..800efcb6eade5cd595a70d29047cac0de09db3ce 100644 (file)
--- a/src/GEOM/Makefile.in
+++ b/src/GEOM/Makefile.in
@@ -27,7 +27,7 @@
 #  $Header$
 
 top_srcdir=@top_srcdir@
-top_builddir=../../..
+top_builddir=../..
 srcdir=@srcdir@
 VPATH=.:@srcdir@:@top_srcdir@/idl
 

diff --git a/src/GEOMClient/Makefile.in b/src/GEOMClient/Makefile.in
index 739767985f2b661ade3121afbe51cd4d04f83f83..aed4bccb67777f413ead541c7bd0c0594f1934da 100644 (file)
--- a/src/GEOMClient/Makefile.in
+++ b/src/GEOMClient/Makefile.in
@@ -27,7 +27,7 @@
 #  $Header$
 
 top_srcdir=@top_srcdir@
-top_builddir=../../..
+top_builddir=../..
 srcdir=@srcdir@
 VPATH=.:@srcdir@:@top_srcdir@/idl
 

diff --git a/src/GEOMDS/Makefile.in b/src/GEOMDS/Makefile.in
index 273133be35862ef1002421384320b563bcb229f5..27834c28b2d6f881a5023ac8f9e5c4b2c98e4615 100644 (file)
--- a/src/GEOMDS/Makefile.in
+++ b/src/GEOMDS/Makefile.in
@@ -27,7 +27,7 @@
 #  $Header$
 
 top_srcdir=@top_srcdir@
-top_builddir=../../..
+top_builddir=../..
 srcdir=@srcdir@
 VPATH=.:@srcdir@:@top_srcdir@/idl
 

diff --git a/src/GEOMFiltersSelection/Makefile.in b/src/GEOMFiltersSelection/Makefile.in
index 38a4ba0e1f202077cb8d624ae7f06b6432f1bb65..0a4ac65f62ffc6f161b264d38c920bab68a15b2f 100644 (file)
--- a/src/GEOMFiltersSelection/Makefile.in
+++ b/src/GEOMFiltersSelection/Makefile.in
@@ -27,7 +27,7 @@
 #  $Header$
 
 top_srcdir=@top_srcdir@
-top_builddir=../../..
+top_builddir=../..
 srcdir=@srcdir@
 VPATH=.:@srcdir@:@top_srcdir@/idl
 

diff --git a/src/GEOMGUI/Makefile.in b/src/GEOMGUI/Makefile.in
index 9328d0999fe87acbd6c30c9a8068e3603dcc13d8..be0a495ef74b98b3224015054611546e4b7a6851 100644 (file)
--- a/src/GEOMGUI/Makefile.in
+++ b/src/GEOMGUI/Makefile.in
@@ -27,7 +27,7 @@
 #  $Header$
 
 top_srcdir=@top_srcdir@
-top_builddir=../../..
+top_builddir=../..
 srcdir=@srcdir@
 VPATH=.:@srcdir@:@top_srcdir@/idl
 
@@ -168,8 +168,8 @@ LIB_SERVER_IDL =
 
 # additionnal information to compil and link file
 
-CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES)
-CXXFLAGS += $(OCC_CXXFLAGS)
+CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
+CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
 
 LDFLAGS += -lOCCViewer -lVTKViewer -lSalomeObject -lSalomeGUI -lGEOMClient -lGEOMObject -lGEOMFiltersSelection -lGEOMSketcher $(OCC_KERNEL_LIBS) $(OCC_MODELER_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome
 

diff --git a/src/GEOM_SWIG/Makefile.in b/src/GEOM_SWIG/Makefile.in
index 02b5bd674d622f6680c394ef354ac6d33a4e5650..412bb23b141b814841143eb6e7967945b82f0536 100644 (file)
--- a/src/GEOM_SWIG/Makefile.in
+++ b/src/GEOM_SWIG/Makefile.in
@@ -27,7 +27,7 @@
 #  $Header$
 
 top_srcdir=@top_srcdir@
-top_builddir=../../..
+top_builddir=../..
 srcdir=@srcdir@
 VPATH=.:@srcdir@:@top_srcdir@/idl
 

diff --git a/src/OBJECT/Makefile.in b/src/OBJECT/Makefile.in
index 392aadacc1def451a5a92949be4a89f6f29cba0d..c3978f5ed914dfd24562dbddda1ddf4b5d6739d2 100644 (file)
--- a/src/OBJECT/Makefile.in
+++ b/src/OBJECT/Makefile.in
@@ -25,7 +25,7 @@
 #  Module : GEOM
 
 top_srcdir=@top_srcdir@
-top_builddir=../../..
+top_builddir=../..
 srcdir=@srcdir@
 VPATH=.:@srcdir@:@top_srcdir@/idl
 

diff --git a/src/PARTITION/Makefile.in b/src/PARTITION/Makefile.in
index b7834ca677f35cbeca98f78311551ad62551964d..a7a9fa34bf01caa7a8d1bef40e7cfc3fa2cf017e 100644 (file)
--- a/src/PARTITION/Makefile.in
+++ b/src/PARTITION/Makefile.in
@@ -27,7 +27,7 @@
 #  $Header$
 
 top_srcdir=@top_srcdir@
-top_builddir=../../..
+top_builddir=../..
 srcdir=@srcdir@
 VPATH=.:@srcdir@
 

diff --git a/src/SKETCHER/Makefile.in b/src/SKETCHER/Makefile.in
index e631aa7ac8e28f4e4f0a474ea38d15a39627d3a5..eedb7f2cd0e0d1baada0cf7f52d1b9fc87771e3f 100644 (file)
--- a/src/SKETCHER/Makefile.in
+++ b/src/SKETCHER/Makefile.in
@@ -27,7 +27,7 @@
 #  $Header$
 
 top_srcdir=@top_srcdir@
-top_builddir=../../..
+top_builddir=../..
 srcdir=@srcdir@
 VPATH=.:@srcdir@:@top_srcdir@/idl