X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=929a9190b0e7e4d50507c224f08378c758903e46;hb=35bb93a206728fca2a4053e19711b494393204df;hp=4d5fa551deb7cf2a9f02e444e940a0bdd678b883;hpb=c812e7b365308ef8bd9369db492cd465b3b0c9bc;p=modules%2Fgeom.git diff --git a/configure.ac b/configure.ac index 4d5fa551d..929a9190b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,24 +1,22 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2011 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 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. # -# 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 # -# 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 +# 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) @@ -26,11 +24,11 @@ # Modified by : Alexander BORODIN (OCN) - autotools usage # Created from configure.in.base # -AC_INIT([Salome2 Project GEOM module], [5.1.1], [webmaster.salome@opencascade.com], [SalomeGEOM]) -AC_CONFIG_AUX_DIR(salome_adm/unix/config_files) +AC_INIT([Salome2 Project GEOM module], [6.4.0], [webmaster.salome@opencascade.com], [SalomeGEOM]) +AC_CONFIG_AUX_DIR(adm_local/unix/config_files) AC_CANONICAL_HOST AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE([tar-pax]) +AM_INIT_AUTOMAKE([tar-pax -Wno-portability]) XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'` @@ -82,6 +80,7 @@ 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 ! @@ -108,7 +107,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 @@ -147,7 +146,15 @@ dnl testing MPICH dnl --------------------------------------------- dnl -CHECK_MPICH +dnl CHECK_MPICH + +echo +echo --------------------------------------------- +echo testing MPI +echo --------------------------------------------- +echo + +CHECK_MPI echo echo --------------------------------------------- @@ -275,15 +282,15 @@ if test "${gui_ok}" = "yes"; then echo CHECK_QT +fi - echo - echo --------------------------------------------- - echo testing VTK - echo --------------------------------------------- - echo +echo +echo --------------------------------------------- +echo testing VTK +echo --------------------------------------------- +echo - CHECK_VTK -fi +CHECK_VTK echo echo --------------------------------------------- @@ -309,6 +316,19 @@ echo CHECK_CAS +echo "OCC_VERSION_DEVELOPMENT = ${OCC_VERSION_DEVELOPMENT}" +NMTDS_VAR=NMTDS +NMTTools_VAR=NMTTools +GEOMAlgo_VAR=GEOMAlgo +if test "${OCC_VERSION_DEVELOPMENT}" == "1"; then + NMTDS_VAR=NMTDS_NEW + NMTTools_VAR=NMTTools_NEW + GEOMAlgo_VAR=GEOMAlgo_NEW +fi +AC_SUBST(NMTDS_VAR) +AC_SUBST(NMTTools_VAR) +AC_SUBST(GEOMAlgo_VAR) + echo echo --------------------------------------------- echo Testing html generators @@ -317,6 +337,24 @@ echo CHECK_HTML_GENERATORS +echo +echo --------------------------------------------- +echo testing sphinx +echo --------------------------------------------- +echo +CHECK_SPHINX + +echo +echo --------------------------------------------- +echo testing Opencv +echo --------------------------------------------- +echo +CHECK_OPENCV +if test "${opencv_ok}" = "yes"; then + AC_DEFINE_UNQUOTED(WITH_OPENCV,${WITH_OPENCV}) +fi + + echo echo --------------------------------------------- echo Testing Kernel @@ -334,11 +372,11 @@ echo echo Configure if test "${gui_ok}" = "yes"; then - variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok Kernel_ok gui_ok" + variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok sphinx_ok opencv_ok Kernel_ok gui_ok" elif test "${SalomeGUI_need}" != "no"; then - variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok Kernel_ok gui_ok" + variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok opencv_ok Kernel_ok gui_ok" else - variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok Kernel_ok" + variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok opencv_ok Kernel_ok" fi for var in $variables @@ -369,70 +407,97 @@ echo # chmod +x ./bin/*; \ #]) +AC_HACK_LIBTOOL +AC_CONFIG_COMMANDS([hack_libtool],[ +sed -i "s%^CC=\"\(.*\)\"%hack_libtool (){ \n\ + $(pwd)/hack_libtool \1 \"\$[@]\" \n\ +}\n\ +CC=\"hack_libtool\"%g" libtool +sed -i "s%\(\s*\)for searchdir in \$newlib_search_path \$lib_search_path \$sys_lib_search_path \$shlib_search_path; do%\1searchdirs=\"\$newlib_search_path \$lib_search_path \$sys_lib_search_path \$shlib_search_path\"\n\1for searchdir in \$searchdirs; do%g" libtool +sed -i "s%\(\s*\)searchdirs=\"\$newlib_search_path \$lib_search_path \(.*\)\"%\1searchdirs=\"\$newlib_search_path \$lib_search_path\"\n\1sss_beg=\"\"\n\1sss_end=\"\2\"%g" libtool +sed -i "s%\(\s*\)\(for searchdir in \$searchdirs; do\)%\1for sss in \$searchdirs; do\n\1 if ! test -d \$sss; then continue; fi\n\1 ssss=\$(cd \$sss; pwd)\n\1 if test \"\$ssss\" != \"\" \&\& test -d \$ssss; then\n\1 case \$ssss in\n\1 /usr/lib | /usr/lib64 ) ;;\n\1 * ) sss_beg=\"\$sss_beg \$ssss\" ;;\n\1 esac\n\1 fi\n\1done\n\1searchdirs=\"\$sss_beg \$sss_end\"\n\1\2%g" libtool +],[]) + # 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/cmake_files/Makefile \ - ./adm_local/unix/Makefile \ - ./adm_local/unix/config_files/Makefile \ - ./bin/VERSION \ - ./bin/Makefile \ - ./GEOM_version.h \ - ./doc/Makefile \ - ./doc/salome/Makefile \ - ./doc/salome/gui/Makefile \ - ./doc/salome/gui/GEOM/Makefile \ - ./doc/salome/gui/GEOM/doxyfile \ - ./doc/salome/gui/GEOM/doxyfile_py \ - ./doc/salome/gui/GEOM/doxyfile_tui \ - ./doc/salome/tui/Makefile \ - ./doc/salome/tui/doxyfile \ - ./src/Makefile \ - ./src/ARCHIMEDE/Makefile \ - ./src/BREPExport/Makefile \ - ./src/BREPImport/Makefile \ - ./src/BasicGUI/Makefile \ - ./src/BlocksGUI/Makefile \ - ./src/BooleanGUI/Makefile \ - ./src/BuildGUI/Makefile \ - ./src/DisplayGUI/Makefile \ - ./src/DlgRef/Makefile \ - ./src/EntityGUI/Makefile \ - ./src/GEOM/Makefile \ - ./src/GEOMAlgo/Makefile \ - ./src/GEOMBase/Makefile \ - ./src/GEOMClient/Makefile \ - ./src/GEOMFiltersSelection/Makefile \ - ./src/GEOMGUI/Makefile \ - ./src/GEOMImpl/Makefile \ - ./src/GEOMToolsGUI/Makefile \ - ./src/GEOM_I/Makefile \ - ./src/GEOM_I_Superv/Makefile \ - ./src/GEOM_SWIG/Makefile \ - ./src/GEOM_SWIG_WITHIHM/Makefile \ - ./src/GenerationGUI/Makefile \ - ./src/GroupGUI/Makefile \ - ./src/IGESExport/Makefile \ - ./src/IGESImport/Makefile \ - ./src/MeasureGUI/Makefile \ - ./src/NMTDS/Makefile \ - ./src/NMTTools/Makefile \ - ./src/OBJECT/Makefile \ - ./src/OperationGUI/Makefile \ - ./src/PrimitiveGUI/Makefile \ - ./src/RepairGUI/Makefile \ - ./src/SKETCHER/Makefile \ - ./src/STEPExport/Makefile \ - ./src/STEPImport/Makefile \ - ./src/STLExport/Makefile \ - ./src/ShHealOper/Makefile \ - ./src/TransformationGUI/Makefile \ - ./resources/Makefile \ - ./resources/GEOMCatalog.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 \ + GEOM_version.h \ + doc/Makefile \ + doc/docutils/Makefile \ + doc/docutils/conf.py \ + doc/salome/Makefile \ + doc/salome/gui/Makefile \ + doc/salome/gui/GEOM/Makefile \ + doc/salome/gui/GEOM/doxyfile \ + doc/salome/gui/GEOM/doxyfile_py \ + doc/salome/gui/GEOM/doxyfile_tui \ + doc/salome/gui/GEOM/static/header.html \ + doc/salome/gui/GEOM/static/header_py.html \ + doc/salome/tui/Makefile \ + doc/salome/tui/doxyfile \ + doc/salome/tui/static/header.html \ + src/Makefile \ + src/AdvancedGUI/Makefile \ + src/ARCHIMEDE/Makefile \ + src/BREPExport/Makefile \ + src/BREPImport/Makefile \ + src/BasicGUI/Makefile \ + src/BlocksGUI/Makefile \ + src/BooleanGUI/Makefile \ + src/BuildGUI/Makefile \ + src/DisplayGUI/Makefile \ + src/DlgRef/Makefile \ + src/EntityGUI/Makefile \ + src/GEOM/Makefile \ + src/GEOMAlgo/Makefile \ + src/GEOMAlgo_NEW/Makefile \ + src/GEOMBase/Makefile \ + src/GEOMClient/Makefile \ + src/GEOMFiltersSelection/Makefile \ + src/Material/Makefile \ + src/GEOMGUI/Makefile \ + src/GEOMImpl/Makefile \ + src/GEOMToolsGUI/Makefile \ + src/GEOM_I/Makefile \ + src/GEOM_I_Superv/Makefile \ + src/GEOM_SWIG/Makefile \ + src/GEOM_SWIG_WITHIHM/Makefile \ + src/GEOM_PY/Makefile \ + src/GEOM_PY/structelem/Makefile \ + src/GenerationGUI/Makefile \ + src/GroupGUI/Makefile \ + src/IGESExport/Makefile \ + src/IGESImport/Makefile \ + src/MeasureGUI/Makefile \ + src/NMTDS/Makefile \ + src/NMTDS_NEW/Makefile \ + src/NMTTools/Makefile \ + src/NMTTools_NEW/Makefile \ + src/OBJECT/Makefile \ + src/OCC2VTK/Makefile \ + src/OperationGUI/Makefile \ + src/PrimitiveGUI/Makefile \ + src/RepairGUI/Makefile \ + src/SKETCHER/Makefile \ + src/STEPExport/Makefile \ + src/STEPImport/Makefile \ + src/STLExport/Makefile \ + src/ShHealOper/Makefile \ + src/ShapeRecognition/Makefile \ + src/TransformationGUI/Makefile \ + src/VTKExport/Makefile \ + resources/Makefile \ + resources/GEOMCatalog.xml \ + resources/SalomeApp.xml \ + resources/Plugin \ + idl/Makefile \ Makefile \ ])