From: vsr <vsr@opencascade.com>
Date: Mon, 29 May 2006 13:05:05 +0000 (+0000)
Subject: Fix GUI compilation problem in light mode (without CORBA):
X-Git-Tag: V3_2_0rc~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0d9cc7e7b8f6dabd47c59372a1bb15aad04fc288;p=modules%2Fgui.git

Fix GUI compilation problem in light mode (without CORBA):
- replace --disable-corba option by --disable-corba-gen (as in KERNEL)
- KERNEL module still should be checked
---

diff --git a/adm_local/unix/config_files/check_disable_Corba.m4 b/adm_local/unix/config_files/check_disable_Corba.m4
index c7b73cb7e..5c777c3c1 100644
--- a/adm_local/unix/config_files/check_disable_Corba.m4
+++ b/adm_local/unix/config_files/check_disable_Corba.m4
@@ -9,7 +9,7 @@
 AC_DEFUN([CHECK_DISABLE_CORBA],[
 
 AC_ARG_WITH(corba,
-	    [  --disable-corba default=no ],
+	    [  --disable-corba-gen default=no ],
 	    disable_corba="$withval",disable_corba="${GUI_DISABLE_CORBA}")
 
 case $disable_corba in
diff --git a/configure.in.base b/configure.in.base
index 0fbcf69ca..4b7af75f9 100644
--- a/configure.in.base
+++ b/configure.in.base
@@ -29,7 +29,7 @@ AC_SUBST(VERSION)
 AC_SUBST(XVERSION)
 
 ########################################################################
-# Check --disable-corba option
+# Check --disable-corba-gen and other --disable-* options
 
 GUI_DISABLE_CORBA="no"
 DISABLE_PYCONSOLE="no"
@@ -43,7 +43,7 @@ DISABLE_SALOMEOBJECT="no"
 for option
 do
   case $option in
-      -disable-corba=yes | --disable-corba=yes | -disable-corba | --disable-corba)
+      -disable-corba-gen=yes | --disable-corba-gen=yes | -disable-corba-gen | --disable-corba-gen)
           GUI_DISABLE_CORBA="yes";;
       -disable-pyConsole=yes | --disable-pyConsole=yes | -disable-pyConsole | --disable-pyConsole)
           DISABLE_PYCONSOLE="yes";;
@@ -436,14 +436,12 @@ echo
 
 CHECK_HTML_GENERATORS
 
-if test "$GUI_DISABLE_CORBA" == "no"; then 
-  echo
-  echo ---------------------------------------------
-  echo Testing Kernel
-  echo ---------------------------------------------
-  echo
-  CHECK_KERNEL
-fi
+echo
+echo ---------------------------------------------
+echo Testing Kernel
+echo ---------------------------------------------
+echo
+CHECK_KERNEL
 
 echo
 echo ---------------------------------------------