X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=configure.ac;h=7f5e389b66336dfdb537322d361ff6210c50e11c;hp=63eca7ec2128e5be8427033d338a0b710db85b6b;hb=c484895a0f9fb64623948e6f83e04847362cb9e7;hpb=79b1ac2b6df9117f16f11d444b1f165d477a1813 diff --git a/configure.ac b/configure.ac index 63eca7ec2..7f5e389b6 100644 --- a/configure.ac +++ b/configure.ac @@ -1,19 +1,36 @@ +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com # # Author : Marc Tajchman (CEA) # Date : 28/06/2001 # Modified by : Patrick GOLDBRONN (CEA) # Modified by : Marc Tajchman (CEA) # Modified by : Alexander BORODIN (OCN) - autotools usage -# # Created from configure.in.base # - - -AC_INIT([Salome2 Project SMESH module], [4.1.1], [webmaster.salome@opencascade.com], [salome]) -AC_CONFIG_AUX_DIR(salome_adm/unix/config_files) +AC_INIT([Salome2 Project SMESH module], [5.1.3], [webmaster.salome@opencascade.com], [SalomeSMESH]) +AC_CONFIG_AUX_DIR(adm_local/unix/config_files) AC_CANONICAL_HOST AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([-Wno-portability]) XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'` AC_SUBST(XVERSION) @@ -64,12 +81,13 @@ echo AC_PROG_MAKE_SET AC_PROG_INSTALL +AC_LOCAL_INSTALL dnl dnl libtool macro check for CC, LD, NM, LN_S, RANLIB, STRIP + pour les librairies dynamiques ! echo echo --------------------------------------------- -echo Coniguring production +echo Configuring production echo --------------------------------------------- echo AC_ENABLE_DEBUG(yes) @@ -90,7 +108,7 @@ dnl Fix up the INSTALL macro if it s a relative path. We want the dnl full-path to the binary instead. case "$INSTALL" in *install-sh*) - INSTALL='\${ROOT_BUILDDIR}'/salome_adm/unix/config_files/install-sh + INSTALL='\${ROOT_BUILDDIR}'/adm_local/unix/config_files/install-sh ;; esac @@ -123,6 +141,7 @@ AC_PROG_FC AC_FC_LIBRARY_LDFLAGS if test "X$FC" != "X" ; then fortran_ok=yes + F77=$FC fi dnl AM_CONDITIONAL( USE_GFORTRAN, [test "$F77" = "gfortran"]) @@ -194,22 +213,6 @@ echo ENABLE_PTHREADS -SMESH_WITH_GUI=yes - -AM_CONDITIONAL(SMESH_ENABLE_GUI, [test "${SMESH_WITH_GUI}" = "yes"]) - -if test "${SMESH_WITH_GUI}" = "yes"; then - -echo -echo --------------------------------------------- -echo testing msg2qm -echo --------------------------------------------- -echo - -CHECK_MSG2QM - -fi - if test "x${GUI_DISABLE_CORBA}" != "xyes" ; then echo echo --------------------------------------------- @@ -249,8 +252,34 @@ dnl CHECK_MICO fi +echo +echo --------------------------------------------- +echo Testing GUI +echo --------------------------------------------- +echo + +CHECK_GUI_MODULE + +gui_ok=no +if test "${SalomeGUI_need}" != "no" -a "${FullGUI_ok}" = "yes" ; then + gui_ok=yes +fi + +AM_CONDITIONAL(SMESH_ENABLE_GUI, [test "${gui_ok}" = "yes"]) + +if test "${SalomeGUI_need}" == "yes"; then + if test "${FullGUI_ok}" != "yes"; then + AC_MSG_WARN(For configure SMESH module necessary full GUI!) + fi +elif test "${SalomeGUI_need}" == "auto"; then + if test "${FullGUI_ok}" != "yes"; then + AC_MSG_WARN(Full GUI not found. Build will be done without GUI!) + fi +elif test "${SalomeGUI_need}" == "no"; then + echo Build without GUI option has been chosen +fi -if test "${SMESH_WITH_GUI}" = "yes"; then +if test "${gui_ok}" = "yes"; then echo echo --------------------------------------------- echo testing openGL @@ -274,26 +303,6 @@ if test "${SMESH_WITH_GUI}" = "yes"; then echo CHECK_VTK - - 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 SMESH module necessary full GUI !" - exit - fi fi echo @@ -320,7 +329,7 @@ echo CHECK_CAS -if test "${SMESH_WITH_GUI}" = "yes"; then +if test "${gui_ok}" = "yes"; then echo echo --------------------------------------------- @@ -373,12 +382,13 @@ echo --------------------------------------------- echo echo Configure -if test "${SMESH_WITH_GUI}" = "yes"; then -variables="cc_ok fortran_ok boost_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 qwt_ok Kernel_ok Geom_ok Med_ok" -fi -if test "${SMESH_WITH_GUI}" = "no"; then -variables="cc_ok fortran_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok Geom_ok Med_ok" +if test "${gui_ok}" = "yes"; then + variables="cc_ok fortran_ok boost_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 qwt_ok Kernel_ok Geom_ok Med_ok gui_ok" +elif test "${SalomeGUI_need}" != "no"; then + variables="cc_ok fortran_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok Geom_ok Med_ok gui_ok" +else + variables="cc_ok fortran_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok Geom_ok Med_ok" fi for var in $variables @@ -408,86 +418,60 @@ dnl AM_CONDITIONAL(ENABLE_OCCVIEWER, [test "$DISABLE_OCCVIEWER" = no]) dnl AM_CONDITIONAL(ENABLE_VTKVIEWER, [test "$DISABLE_VTKVIEWER" = no]) dnl AM_CONDITIONAL(ENABLE_SALOMEOBJECT, [test "$DISABLE_SALOMEOBJECT" = no]) -echo -echo --------------------------------------------- -echo copying resource files, shell scripts, and -echo xml files -echo --------------------------------------------- -echo - - -dnl copy shells and utilities contained in the bin directory -dnl excluding .in files (treated in AC-OUTPUT below) and CVS -dnl directory - -mkdir -p bin/salome -cd bin/salome - -for i in $ROOT_SRCDIR/bin/* -do - local_bin=`echo $i | sed -e "s,$ROOT_SRCDIR,.,"` - case "$local_bin" in - *.in | *~) ;; - ./bin/CVS | ./bin/salome) ;; - *) $INSTALL $i . ; echo $local_bin ;; - esac -done -cd $ROOT_BUILDDIR - echo echo --------------------------------------------- echo generating Makefiles and configure files echo --------------------------------------------- echo -AC_OUTPUT_COMMANDS([ \ - chmod +x ./bin/*; \ - chmod +x ./bin/salome/*; \ -]) +#AC_OUTPUT_COMMANDS([ \ +# chmod +x ./bin/*; \ +# chmod +x ./bin/salome/*; \ +#]) # This list is initiated using autoscan and must be updated manually # when adding a new file .in to manage. When you execute # autoscan, the Makefile list is generated in the output file configure.scan. # This could be helpfull to update de configuration. AC_OUTPUT([ \ - ./salome_adm/unix/SALOMEconfig.h \ - ./adm_local/Makefile \ - ./adm_local/unix/Makefile \ - ./adm_local/unix/config_files/Makefile \ - ./bin/VERSION \ - ./bin/Makefile \ - ./SMESH_version.h \ - ./doc/Makefile \ - ./doc/salome/Makefile \ - ./doc/salome/gui/Makefile \ - ./doc/salome/gui/SMESH/doxyfile \ - ./doc/salome/gui/SMESH/doxyfile_py \ - ./doc/salome/tui/Makefile \ - ./doc/salome/tui/SMESH/doxyfile \ - ./doc/salome/tui/SMESH/sources/static/tree.js \ - ./src/Makefile \ - ./src/Controls/Makefile \ - ./src/Driver/Makefile \ - ./src/DriverDAT/Makefile \ - ./src/DriverMED/Makefile \ - ./src/DriverSTL/Makefile \ - ./src/DriverUNV/Makefile \ - ./src/MEFISTO2/Makefile \ - ./src/OBJECT/Makefile \ - ./src/SMDS/Makefile \ - ./src/SMESH/Makefile \ - ./src/SMESHClient/Makefile \ - ./src/SMESHDS/Makefile \ - ./src/SMESHFiltersSelection/Makefile \ - ./src/SMESHGUI/Makefile \ - ./src/SMESH_I/Makefile \ - ./src/SMESH_SWIG/Makefile \ - ./src/SMESH_SWIG_WITHIHM/Makefile \ - ./src/StdMeshers/Makefile \ - ./src/StdMeshersGUI/Makefile \ - ./src/StdMeshers_I/Makefile \ - ./resources/Makefile \ - ./resources/SMESHCatalog.xml \ - ./idl/Makefile \ + adm_local/Makefile \ + adm_local/cmake_files/Makefile \ + adm_local/unix/Makefile \ + adm_local/unix/config_files/Makefile \ + bin/VERSION \ + bin/Makefile \ + SMESH_version.h \ + doc/Makefile \ + doc/salome/Makefile \ + doc/salome/gui/Makefile \ + doc/salome/gui/SMESH/Makefile \ + doc/salome/gui/SMESH/doxyfile \ + doc/salome/gui/SMESH/doxyfile_py \ + doc/salome/tui/Makefile \ + doc/salome/tui/doxyfile \ + src/Makefile \ + src/Controls/Makefile \ + src/Driver/Makefile \ + src/DriverDAT/Makefile \ + src/DriverMED/Makefile \ + src/DriverSTL/Makefile \ + src/DriverUNV/Makefile \ + src/MEFISTO2/Makefile \ + src/OBJECT/Makefile \ + src/SMDS/Makefile \ + src/SMESH/Makefile \ + src/SMESHClient/Makefile \ + src/SMESHDS/Makefile \ + src/SMESHFiltersSelection/Makefile \ + src/SMESHGUI/Makefile \ + src/SMESH_I/Makefile \ + src/SMESH_SWIG/Makefile \ + src/SMESH_SWIG_WITHIHM/Makefile \ + src/StdMeshers/Makefile \ + src/StdMeshersGUI/Makefile \ + src/StdMeshers_I/Makefile \ + resources/Makefile \ + resources/SMESHCatalog.xml \ + idl/Makefile \ Makefile ])