From efbb2bbc7a51fd4d03afa79a3ace8a59e3330042 Mon Sep 17 00:00:00 2001 From: nds Date: Thu, 9 Mar 2006 07:11:43 +0000 Subject: [PATCH] Changed in configuration scripts --- Makefile.in | 2 +- adm_local/unix/config_files/check_GUI.m4 | 61 ----------------------- adm_local/unix/config_files/check_Med.m4 | 45 ----------------- adm_local/unix/config_files/check_VISU.m4 | 53 ++++++++++++++++++++ adm_local/unix/make_commence.in | 16 ++++-- build_configure | 4 +- configure.in.base | 20 ++++++++ 7 files changed, 88 insertions(+), 113 deletions(-) delete mode 100755 adm_local/unix/config_files/check_GUI.m4 delete mode 100644 adm_local/unix/config_files/check_Med.m4 create mode 100755 adm_local/unix/config_files/check_VISU.m4 diff --git a/Makefile.in b/Makefile.in index 519f470b..a2d20a32 100644 --- a/Makefile.in +++ b/Makefile.in @@ -14,7 +14,7 @@ VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl: @COMMENCE@ -SUBDIRS = idl src doc +SUBDIRS = idl src doc adm_local BIN_SCRIPT= \ VERSION diff --git a/adm_local/unix/config_files/check_GUI.m4 b/adm_local/unix/config_files/check_GUI.m4 deleted file mode 100755 index d2c8eb8a..00000000 --- a/adm_local/unix/config_files/check_GUI.m4 +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -# -#------------------------------------------------------------ -# Check availability of Salome binary distribution -# -# Author : Marc Tajchman (CEA, 2002) -#------------------------------------------------------------ - -AC_DEFUN([CHECK_SALOME_GUI],[ - -AC_CHECKING(for SalomeGUI) - -SalomeGUI_ok=yes - -AC_ARG_WITH(gui, - --with-salome_gui=DIR root directory path of SALOME GUI installation, - SALOME_GUI_DIR="$withval",SALOME_GUI_DIR="") - -if test "x$SALOME_GUI_DIR" = "x" ; then - if test "x$GUI_ROOT_DIR" != "x" ; then - SALOME_GUI_DIR=$GUI_ROOT_DIR - else - # search Salome binaries in PATH variable - AC_PATH_PROG(TEMP, libSalomeApp.so) - if test "x$TEMP" != "x" ; then - SALOME_GUI_DIR=`dirname $TEMP` - else - fi - fi -fi - -if test -f ${SALOME_GUI_DIR}/lib/salome/libSalomeApp.so ; then - SalomeGUI_ok=yes - AC_MSG_RESULT(Using SALOME GUI distribution in ${SALOME_GUI_DIR}) - GUI_ROOT_DIR=${SALOME_GUI_DIR} - AC_SUBST(GUI_ROOT_DIR) -else - AC_MSG_WARN("Cannot find compiled SALOME GUI distribution") -fi - -AC_MSG_RESULT(for SALOME GUI: $SalomeGUI_ok) - -])dnl - diff --git a/adm_local/unix/config_files/check_Med.m4 b/adm_local/unix/config_files/check_Med.m4 deleted file mode 100644 index 727bf438..00000000 --- a/adm_local/unix/config_files/check_Med.m4 +++ /dev/null @@ -1,45 +0,0 @@ -# Check availability of Med binary distribution -# -# Author : Nicolas REJNERI (OPEN CASCADE, 2003) -# - -AC_DEFUN([CHECK_MED],[ - -AC_CHECKING(for Med) - -Med_ok=no - -AC_ARG_WITH(med, - [ --with-med=DIR root directory path of MED installation ], - MED_DIR="$withval",MED_DIR="") - -if test "x$MED_DIR" == "x" ; then - -# no --with-med-dir option used - - if test "x$MED_ROOT_DIR" != "x" ; then - - # MED_ROOT_DIR environment variable defined - MED_DIR=$MED_ROOT_DIR - - fi -# -fi - -if test -f ${MED_DIR}/idl/salome/MED.idl ; then - Med_ok=yes - AC_MSG_RESULT(Using Med module distribution in ${MED_DIR}) - - if test "x$MED_ROOT_DIR" == "x" ; then - MED_ROOT_DIR=${MED_DIR} - fi - AC_SUBST(MED_ROOT_DIR) - -else - AC_MSG_WARN("Cannot find Med module sources") -fi - -AC_MSG_RESULT(for Med: $Med_ok) - -])dnl - diff --git a/adm_local/unix/config_files/check_VISU.m4 b/adm_local/unix/config_files/check_VISU.m4 new file mode 100755 index 00000000..89452f7a --- /dev/null +++ b/adm_local/unix/config_files/check_VISU.m4 @@ -0,0 +1,53 @@ +# Check availability of VISU binary distribution +# +# Author : Marc Tajchman (CEA, 2002) +#------------------------------------------------------------ + +AC_DEFUN([CHECK_VISU],[ + +AC_CHECKING(for Visu) + +Visu_ok=no + +AC_ARG_WITH(gui, + --with-visu=DIR root directory path of VISU installation, + VISU_DIR="$withval",VISU_DIR="") + +if test "x$VISU_DIR" = "x" ; then + +# no --with-visu option used + + if test "x$VISU_ROOT_DIR" != "x" ; then + + # VISU_ROOT_DIR environment variable defined + VISU_DIR=$VISU_ROOT_DIR + + else + + # search VISU binaries in PATH variable + AC_PATH_PROG(TEMP, libVISU.so) + if test "x$TEMP" != "x" ; then + VISU_BIN_DIR=`dirname $TEMP` + VISU_DIR=`dirname $VISU_BIN_DIR` + fi + + fi +# +fi + +if test -f ${VISU_DIR}/lib/salome/libVISU.so ; then + Visu_ok=yes + AC_MSG_RESULT(Using VISU distribution in ${VISU_DIR}) + + if test "x$VISU_ROOT_DIR" == "x" ; then + VISU_ROOT_DIR=${VISU_DIR} + fi + AC_SUBST(VISU_ROOT_DIR) +else + AC_MSG_WARN("Cannot find compiled VISU distribution") +fi + +AC_MSG_RESULT(for VISU: $Visu_ok) + +])dnl + diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in index a143c7bb..b1ea1d4e 100644 --- a/adm_local/unix/make_commence.in +++ b/adm_local/unix/make_commence.in @@ -249,13 +249,19 @@ $(top_srcdir)/configure.in: $(top_srcdir)/configure.in.base ACLOCAL_SRC = \ -ac_cxx_bool.m4 check_corba.m4 check_vtk.m4 \ +ac_cxx_bool.m4 check_corba.m4 \ ac_cxx_depend_flag.m4 check_hdf5.m4 enable_pthreads.m4 \ ac_cxx_mutable.m4 check_mico.m4 libtool.m4 \ ac_cxx_namespaces.m4 check_omniorb.m4 pyembed.m4 \ -ac_cxx_partial_specialization.m4 check_opengl.m4 python.m4 \ +ac_cxx_partial_specialization.m4 python.m4 \ ac_cxx_typename.m4 check_pthreads.m4 check_cas.m4 \ -ac_cc_warnings.m4 check_qt.m4 check_swig.m4 +ac_cc_warnings.m4 check_swig.m4 -$(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) - cd $(top_srcdir) ; aclocal --acdir=adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files +ACLOCAL_GUI = \ +check_vtk.m4 check_opengl.m4 check_qt.m4 \ +check_GUI.m4 check_corba_in_GUI.m4 + +$(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \ + $(ACLOCAL_GUI:%=@GUI_ROOT_DIR@/adm_local/unix/config_files/%) + cd $(top_srcdir) ; aclocal --acdir=adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files \ + -I @GUI_ROOT_DIR@/adm_local/unix/config_files diff --git a/build_configure b/build_configure index 05354d02..01986747 100755 --- a/build_configure +++ b/build_configure @@ -204,7 +204,9 @@ else echo -n "Creating 'configure' script ... " fi -aclocal --acdir=adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files +aclocal --acdir=adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ + -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \ + -I ${GUI_ROOT_DIR}/adm_local/unix/config_files if autoconf then echo "done" diff --git a/configure.in.base b/configure.in.base index 1396ae1e..e4b35d6e 100644 --- a/configure.in.base +++ b/configure.in.base @@ -266,6 +266,26 @@ echo CHECK_HTML_GENERATORS +echo +echo --------------------------------------------- +echo Testing GUI +echo --------------------------------------------- +echo + +CHECK_SALOME_GUI + +echo +echo --------------------------------------------- +echo Testing full GUI +echo --------------------------------------------- +echo + +CHECK_CORBA_IN_GUI +if test "x${CORBA_IN_GUI}" != "xyes"; then + echo "failed : For configure VISU module necessary full GUI !" + exit +fi + echo echo --------------------------------------------- echo Testing Kernel -- 2.39.2