From c408b52137c74a95ba2c5769e2a1efdc8618563c Mon Sep 17 00:00:00 2001 From: nds Date: Fri, 3 Mar 2006 12:56:39 +0000 Subject: [PATCH] Change configuration --- adm_local/unix/config_files/check_GLViewer.m4 | 25 +++++++++++++++++++ .../unix/config_files/check_OCCViewer.m4 | 25 +++++++++++++++++++ .../unix/config_files/check_Plot2dViewer.m4 | 25 +++++++++++++++++++ .../unix/config_files/check_PyConsole.m4 | 25 +++++++++++++++++++ .../unix/config_files/check_SalomeObject.m4 | 25 +++++++++++++++++++ .../config_files/check_SupervGraphViewer.m4 | 25 +++++++++++++++++++ .../unix/config_files/check_VTKViewer.m4 | 25 +++++++++++++++++++ ...heck_full_GUI.m4 => check_corba_in_GUI.m4} | 8 +++--- ...isable_Corba.m4 => check_disable_Corba.m4} | 2 +- 9 files changed, 180 insertions(+), 5 deletions(-) create mode 100644 adm_local/unix/config_files/check_GLViewer.m4 create mode 100644 adm_local/unix/config_files/check_OCCViewer.m4 create mode 100644 adm_local/unix/config_files/check_Plot2dViewer.m4 create mode 100644 adm_local/unix/config_files/check_PyConsole.m4 create mode 100644 adm_local/unix/config_files/check_SalomeObject.m4 create mode 100644 adm_local/unix/config_files/check_SupervGraphViewer.m4 create mode 100644 adm_local/unix/config_files/check_VTKViewer.m4 rename adm_local/unix/config_files/{check_full_GUI.m4 => check_corba_in_GUI.m4} (92%) rename adm_local/unix/config_files/{disable_Corba.m4 => check_disable_Corba.m4} (95%) diff --git a/adm_local/unix/config_files/check_GLViewer.m4 b/adm_local/unix/config_files/check_GLViewer.m4 new file mode 100644 index 000000000..90a304173 --- /dev/null +++ b/adm_local/unix/config_files/check_GLViewer.m4 @@ -0,0 +1,25 @@ +# +# Check configure option --disable-glViewer=[yes|no|DIR] taking into account that +# DISABLE_GLVIEWER may be already set during build_configure, +# Set DISABLE_GLVIEWER to yes|no +# +# Author : Edawrd AGAPOV (OCC, 2005) +# + +AC_DEFUN([CHECK_GLVIEWER],[ + +AC_ARG_WITH(glViewer, + [ --disable-glViewer default=no ], + disable_glViewer="$withval",disable_glViewer="${DISABLE_GLVIEWER}") + +case $disable_glViewer in + yes) +# AC_MSG_RESULT(************************************************) +# AC_MSG_RESULT(******* DISABLE GLViewer configuration *****) +# AC_MSG_RESULT(************************************************) + DISABLE_GLVIEWER="yes" + AC_SUBST(DISABLE_GLVIEWER) +esac + + +])dnl diff --git a/adm_local/unix/config_files/check_OCCViewer.m4 b/adm_local/unix/config_files/check_OCCViewer.m4 new file mode 100644 index 000000000..cae33b971 --- /dev/null +++ b/adm_local/unix/config_files/check_OCCViewer.m4 @@ -0,0 +1,25 @@ +# +# Check configure option --disable-occViewer=[yes|no|DIR] taking into account that +# DISABLE_OCCVIEWER may be already set during build_configure, +# Set DISABLE_OCCVIEWER to yes|no +# +# Author : Edawrd AGAPOV (OCC, 2005) +# + +AC_DEFUN([CHECK_OCCVIEWER],[ + +AC_ARG_WITH(occViewer, + [ --disable-occViewer default=no ], + disable_occViewer="$withval",disable_occViewer="${DISABLE_OCCVIEWER}") + +case $disable_occViewer in + yes) +# AC_MSG_RESULT(************************************************) +# AC_MSG_RESULT(***** DISABLE OCCViewer configuration ******) +# AC_MSG_RESULT(************************************************) + DISABLE_OCCVIEWER="yes" + AC_SUBST(DISABLE_OCCVIEWER) +esac + + +])dnl diff --git a/adm_local/unix/config_files/check_Plot2dViewer.m4 b/adm_local/unix/config_files/check_Plot2dViewer.m4 new file mode 100644 index 000000000..a8fb1ad85 --- /dev/null +++ b/adm_local/unix/config_files/check_Plot2dViewer.m4 @@ -0,0 +1,25 @@ +# +# Check configure option --disable-plot2dViewer=[yes|no|DIR] taking into account that +# DISABLE_PLOT2DVIEWER may be already set during build_configure, +# Set DISABLE_PLOT2DVIEWER to yes|no +# +# Author : Edawrd AGAPOV (OCC, 2005) +# + +AC_DEFUN([CHECK_PLOT2DVIEWER],[ + +AC_ARG_WITH(plot2dViewer, + [ --disable-plot2dViewer default=no ], + disable_plot2dViewer="$withval",disable_plot2dViewer="${DISABLE_PLOT2DVIEWER}") + +case $disable_plot2dViewer in + yes) +# AC_MSG_RESULT(************************************************) +# AC_MSG_RESULT(*** DISABLE Plot2dViewer configuration *****) +# AC_MSG_RESULT(************************************************) + DISABLE_PLOT2DVIEWER="yes" + AC_SUBST(DISABLE_PLOT2DVIEWER) +esac + + +])dnl diff --git a/adm_local/unix/config_files/check_PyConsole.m4 b/adm_local/unix/config_files/check_PyConsole.m4 new file mode 100644 index 000000000..503646f84 --- /dev/null +++ b/adm_local/unix/config_files/check_PyConsole.m4 @@ -0,0 +1,25 @@ +# +# Check configure option --disable-pyConsole=[yes|no|DIR] taking into account that +# DISABLE_PYCONSOLE may be already set during build_configure, +# Set DISABLE_PYCONSOLE to yes|no +# +# Author : Edawrd AGAPOV (OCC, 2005) +# + +AC_DEFUN([CHECK_PYCONSOLE],[ + +AC_ARG_WITH(pyConsole, + [ --disable-pyConsole default=no ], + disable_pyConsole="$withval",disable_pyConsole="${DISABLE_PYCONSOLE}") + +case $disable_pyConsole in + yes) +# AC_MSG_RESULT(************************************************) +# AC_MSG_RESULT(***** DISABLE PyConsole configuration ******) +# AC_MSG_RESULT(************************************************) + DISABLE_PYCONSOLE="yes" + AC_SUBST(DISABLE_PYCONSOLE) +esac + + +])dnl diff --git a/adm_local/unix/config_files/check_SalomeObject.m4 b/adm_local/unix/config_files/check_SalomeObject.m4 new file mode 100644 index 000000000..453dbd7ab --- /dev/null +++ b/adm_local/unix/config_files/check_SalomeObject.m4 @@ -0,0 +1,25 @@ +# +# Check configure option --disable-salomeObject=[yes|no|DIR] taking into account that +# DISABLE_SALOMEOBJECT may be already set during build_configure, +# Set DISABLE_SALOMEOBJECT to yes|no +# +# Author : Edawrd AGAPOV (OCC, 2005) +# + +AC_DEFUN([CHECK_SALOMEOBJECT],[ + +AC_ARG_WITH(salomeObject, + [ --disable-salomeObject default=no ], + disable_salomeObject="$withval",disable_salomeObject="${DISABLE_SALOMEOBJECT}") + +case $disable_salomeObject in + yes) +# AC_MSG_RESULT(************************************************) +# AC_MSG_RESULT(*** DISABLE Salome object configuration ****) +# AC_MSG_RESULT(************************************************) + DISABLE_SALOMEOBJECT="yes" + AC_SUBST(DISABLE_SALOMEOBJECT) +esac + + +])dnl diff --git a/adm_local/unix/config_files/check_SupervGraphViewer.m4 b/adm_local/unix/config_files/check_SupervGraphViewer.m4 new file mode 100644 index 000000000..455f02136 --- /dev/null +++ b/adm_local/unix/config_files/check_SupervGraphViewer.m4 @@ -0,0 +1,25 @@ +# +# Check configure option --disable-supervGraphViewer=[yes|no|DIR] taking into account that +# DISABLE_SUPERVGRAPHVIEWER may be already set during build_configure, +# Set DISABLE_SUPERVGRAPHVIEWER to yes|no +# +# Author : Edawrd AGAPOV (OCC, 2005) +# + +AC_DEFUN([CHECK_SUPERVGRAPHVIEWER],[ + +AC_ARG_WITH(supervGraphViewer, + [ --disable-supervGraphViewer default=no ], + disable_supervGraphViewer="$withval",disable_supervGraphViewer="${DISABLE_SUPERVGRAPHVIEWER}") + +case $disable_supervGraphViewer in + yes) +# AC_MSG_RESULT(************************************************) +# AC_MSG_RESULT(******* DISABLE SupervGraphViewer configuration ********) +# AC_MSG_RESULT(************************************************) + DISABLE_SUPERVGRAPHVIEWER="yes" + AC_SUBST(DISABLE_SUPERVGRAPHVIEWER) +esac + + +])dnl diff --git a/adm_local/unix/config_files/check_VTKViewer.m4 b/adm_local/unix/config_files/check_VTKViewer.m4 new file mode 100644 index 000000000..c2adb23b9 --- /dev/null +++ b/adm_local/unix/config_files/check_VTKViewer.m4 @@ -0,0 +1,25 @@ +# +# Check configure option --disable-vtkViewer=[yes|no|DIR] taking into account that +# DISABLE_VTKVIEWER may be already set during build_configure, +# Set DISABLE_VTKVIEWER to yes|no +# +# Author : Edawrd AGAPOV (OCC, 2005) +# + +AC_DEFUN([CHECK_VTKVIEWER],[ + +AC_ARG_WITH(vtkViewer, + [ --disable-vtkViewer default=no ], + disable_vtkViewer="$withval",disable_vtkViewer="${DISABLE_VTKVIEWER}") + +case $disable_vtkViewer in + yes) +# AC_MSG_RESULT(************************************************) +# AC_MSG_RESULT(***** DISABLE VTK Viewer configuration *****) +# AC_MSG_RESULT(************************************************) + DISABLE_VTKVIEWER="yes" + AC_SUBST(DISABLE_VTKVIEWER) +esac + + +])dnl diff --git a/adm_local/unix/config_files/check_full_GUI.m4 b/adm_local/unix/config_files/check_corba_in_GUI.m4 similarity index 92% rename from adm_local/unix/config_files/check_full_GUI.m4 rename to adm_local/unix/config_files/check_corba_in_GUI.m4 index 44f8247ae..007dfc6c5 100755 --- a/adm_local/unix/config_files/check_full_GUI.m4 +++ b/adm_local/unix/config_files/check_corba_in_GUI.m4 @@ -3,12 +3,12 @@ # Author : Marc Tajchman (CEA, 2002) #------------------------------------------------------------ -AC_DEFUN([CHECK_FULL_GUI],[ +AC_DEFUN([CHECK_CORBA_IN_GUI],[ AC_CHECKING(for full SalomeGUI) SalomeGUI_ok=no -FULL_GUI="no" +CORBA_IN_GUI="no" AC_ARG_WITH(gui, --with-salome_gui=DIR root directory path of full SALOME GUI installation, @@ -38,7 +38,7 @@ fi if test -f ${SALOME_GUI_DIR}/lib/salome/libSalomeApp.so ; then SalomeGUI_ok=yes - FULL_GUI=yes + CORBA_IN_GUI=yes AC_MSG_RESULT(Using SALOME GUI distribution in ${SALOME_GUI_DIR}) if test "x$GUI_ROOT_DIR" == "x" ; then @@ -47,7 +47,7 @@ if test -f ${SALOME_GUI_DIR}/lib/salome/libSalomeApp.so ; then else AC_MSG_WARN("Cannot find compiled full SALOME GUI distribution") fi -AC_SUBST(FULL_GUI) +AC_SUBST(CORBA_IN_GUI) AC_MSG_RESULT(for full SALOME GUI: $SalomeGUI_ok) diff --git a/adm_local/unix/config_files/disable_Corba.m4 b/adm_local/unix/config_files/check_disable_Corba.m4 similarity index 95% rename from adm_local/unix/config_files/disable_Corba.m4 rename to adm_local/unix/config_files/check_disable_Corba.m4 index f2f5e9d06..c7b73cb7e 100644 --- a/adm_local/unix/config_files/disable_Corba.m4 +++ b/adm_local/unix/config_files/check_disable_Corba.m4 @@ -6,7 +6,7 @@ # Author : Edawrd AGAPOV (OCC, 2005) # -AC_DEFUN([DISABLE_CORBA],[ +AC_DEFUN([CHECK_DISABLE_CORBA],[ AC_ARG_WITH(corba, [ --disable-corba default=no ], -- 2.39.2