Join modifications from branch OCC_development_for_3_2_0a2

[samples/light.git] / configure.in.base

diff --git a/configure.in.base b/configure.in.base
index f5e5582598d742fcb970cdb844286529b9ac3b77..e1c2367a528d206ab15f0015665496077f646b4f 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -45,6 +45,13 @@ AC_SUBST(PACKAGE)
 VERSION=0.0.1
 AC_SUBST(VERSION)
 
+dnl
+dnl Initialize disable corba variable
+dnl
+
+GUI_DISABLE_CORBA=yes
+CHECK_DISABLE_CORBA
+
 dnl
 dnl Initialize source and build root directories
 dnl
@@ -201,13 +208,13 @@ dnl echo
 
 dnl CHECK_JAVA
 
-echo
-echo ---------------------------------------------
-echo testing swig
-echo ---------------------------------------------
-echo
-
-CHECK_SWIG
+#echo
+#echo ---------------------------------------------
+#echo testing swig
+#echo ---------------------------------------------
+#echo
+#
+#CHECK_SWIG
 
 echo
 echo ---------------------------------------------
@@ -217,13 +224,13 @@ echo
 
 ENABLE_PTHREADS
 
-echo
-echo ---------------------------------------------
-echo testing omniORB
-echo ---------------------------------------------
-echo
-
-CHECK_OMNIORB
+#echo
+#echo ---------------------------------------------
+#echo testing omniORB
+#echo ---------------------------------------------
+#echo
+#
+#CHECK_OMNIORB
 
 dnl echo
 dnl echo ---------------------------------------------
@@ -233,18 +240,18 @@ dnl echo
 
 dnl CHECK_MICO
 
-echo
-echo ---------------------------------------------
-echo default ORB : omniORB
-echo ---------------------------------------------
-echo
+#echo
+#echo ---------------------------------------------
+#echo default ORB : omniORB
+#echo ---------------------------------------------
+#echo
 
-DEFAULT_ORB=omniORB
-CHECK_CORBA
+#DEFAULT_ORB=omniORB
+#CHECK_CORBA
 
-AC_SUBST_FILE(CORBA)
-corba=make_$ORB
-CORBA=adm_local/unix/$corba
+#AC_SUBST_FILE(CORBA)
+#corba=make_$ORB
+#CORBA=adm_local/unix/$corba
 
 echo
 echo ---------------------------------------------
@@ -325,7 +332,8 @@ echo ---------------------------------------------
 echo
 
 echo Configure
-variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok SalomeGUI_ok"
+#variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok SalomeGUI_ok"
+variables="cc_ok lex_yacc_ok python_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok occ_ok doxygen_ok graphviz_ok Kernel_ok SalomeGUI_ok"
 
 for var in $variables
 do
@@ -333,14 +341,15 @@ do
    eval echo \$$var
 done
 
-echo
-echo "Default ORB   : $DEFAULT_ORB"
-echo
+#echo
+#echo "Default ORB   : $DEFAULT_ORB"
+#echo
 
 dnl generals files which could be included in every makefile
 
 AC_SUBST_FILE(COMMENCE) COMMENCE=adm_local/unix/make_commence
-AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/make_conclude
+AC_SUBST_FILE(CONCLUDE) CONCLUDE=${GUI_ROOT_DIR}/adm_local/unix/make_conclude
+#AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/make_conclude
 AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/make_module
 
 dnl les dependences