From 00f94324319c4873f7d8b31ccc80d78a22d0eb96 Mon Sep 17 00:00:00 2001
From: nri <nri@opencascade.com>
Date: Thu, 10 Jul 2003 14:28:33 +0000
Subject: [PATCH] NRI : Merge from V1_2.

---
 adm_local/unix/make_commence.in      |  2 +-
 configure.in.base                    | 26 +++++++++++++-------------
 src/ARCHIMEDE/Makefile.in            |  2 +-
 src/GEOM/Makefile.in                 |  2 +-
 src/GEOMClient/Makefile.in           |  2 +-
 src/GEOMDS/Makefile.in               |  2 +-
 src/GEOMFiltersSelection/Makefile.in |  2 +-
 src/GEOMGUI/Makefile.in              |  6 +++---
 src/GEOM_SWIG/Makefile.in            |  2 +-
 src/OBJECT/Makefile.in               |  2 +-
 src/PARTITION/Makefile.in            |  2 +-
 src/SKETCHER/Makefile.in             |  2 +-
 12 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index 2435e1062..f6d5ea9cc 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 e76e6eb95..212a37556 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
diff --git a/src/ARCHIMEDE/Makefile.in b/src/ARCHIMEDE/Makefile.in
index c328fee69..b85b35997 100644
--- 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 f51893f71..800efcb6e 100644
--- 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 739767985..aed4bccb6 100644
--- 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 273133be3..27834c28b 100644
--- 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 38a4ba0e1..0a4ac65f6 100644
--- 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 9328d0999..be0a495ef 100644
--- 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 02b5bd674..412bb23b1 100644
--- 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 392aadacc..c3978f5ed 100644
--- 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 b7834ca67..a7a9fa34b 100644
--- 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 e631aa7ac..eedb7f2cd 100644
--- 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
 
-- 
2.39.2