X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=d7a8fb327b48537a820cf7fb9d5c4cad9a59f86d;hb=9f6e75062d55374dba79325732b37d4018da35d3;hp=61386b2a10929e86c664ad3c73de032be22ce303;hpb=16f91b82f447624718787d47955b307588fa9fa8;p=modules%2Fgeom.git diff --git a/configure.ac b/configure.ac index 61386b2a1..d7a8fb327 100644 --- a/configure.ac +++ b/configure.ac @@ -1,20 +1,20 @@ -# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # -# 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) @@ -24,7 +24,7 @@ # Modified by : Alexander BORODIN (OCN) - autotools usage # Created from configure.in.base # -AC_INIT([Salome2 Project GEOM module], [6.2.0], [webmaster.salome@opencascade.com], [SalomeGEOM]) +AC_INIT([Salome2 Project GEOM module], [6.6.0], [webmaster.salome@opencascade.com], [SalomeGEOM]) AC_CONFIG_AUX_DIR(adm_local/unix/config_files) AC_CANONICAL_HOST AC_CANONICAL_TARGET @@ -33,6 +33,8 @@ AM_INIT_AUTOMAKE([tar-pax -Wno-portability]) XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'` AC_SUBST(XVERSION) +VERSION_DEV=0 +AC_SUBST(VERSION_DEV) # set up MODULE_NAME variable for dynamic construction of directories (resources, etc.) MODULE_NAME=geom @@ -331,6 +333,17 @@ 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 @@ -345,24 +358,77 @@ echo Summary echo --------------------------------------------- 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 sphinx_ok Kernel_ok gui_ok" -elif test "${SalomeGUI_need}" != "no"; then - 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 Kernel_ok gui_ok" +if test "${SalomeGUI_need}" == "no"; then + echo "* Configuration options (without GUI):" else - 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 Kernel_ok" + echo "* Configuration options:" +fi +echo + +obligatory_vars="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 sphinx_ok Kernel_ok" +optional_vars="opencv_ok" +gui_vars="OpenGL_ok qt_ok gui_ok" + +### +# mandatory products +### + +echo "--- Mandatory products:" + +missing_obligatory=no +for var in $obligatory_vars +do + eval toto=\$$var + if test x$toto == "x"; then toto="no" ; fi + if test x$toto == "xno"; then missing_obligatory=yes ; fi + printf " %10s : " `echo \$var | sed -e "s,_ok,,"` + eval echo \$$var + #fi +done +if test x$missing_obligatory == "xyes"; then + AC_MSG_ERROR([one or more obligatory product is missing]) fi -for var in $variables +### +# gui products +### + +if test "${SalomeGUI_need}" == "yes"; then + # SALOME GUI is mandatory + if test "${gui_ok}" != "yes"; then + AC_MSG_ERROR([SALOME GUI is missing]) + fi +fi + +if test "${SalomeGUI_need}" != "no"; then + echo "--- GUI products (optional):" + + for var in $gui_vars + do + eval toto=\$$var + if test x$toto == "x"; then toto="no"; fi + printf " %10s : " `echo \$var | sed -e "s,_ok,,"` + eval echo \$toto + done +fi + +### +# optional products +### + +echo "--- Other products (optional):" + +for var in $optional_vars do - printf " %10s : " `echo \$var | sed -e "s,_ok,,"` - eval echo \$$var + eval toto=\$$var + if test x$toto != "x"; then + printf " %10s : " `echo \$var | sed -e "s,_ok,,"` + eval echo \$$var + fi done echo -echo "Default ORB : $DEFAULT_ORB" +echo "* Default ORB : $DEFAULT_ORB" echo dnl We don t need to say when we re entering directories if we re using @@ -383,17 +449,15 @@ echo # chmod +x ./bin/*; \ #]) +AC_HACK_LIBTOOL AC_CONFIG_COMMANDS([hack_libtool],[ sed -i "s%^CC=\"\(.*\)\"%hack_libtool (){ \n\ - if test \"\$(echo \$[@] | grep -E '\\\-L/usr/lib(/../lib)?(64)? ')\" == \"\" \n\ - then\n\ - cmd=\"\1 \$[@]\"\n\ - else\n\ - cmd=\"\1 \"\`echo \$[@] | sed -r -e 's|(.*)-L/usr/lib(/../lib)?(64)? (.*)|\\\1\\\4 -L/usr/lib\\\3|g'\`\n\ - fi\n\ - \$cmd\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 @@ -410,6 +474,7 @@ AC_OUTPUT([ \ GEOM_version.h \ doc/Makefile \ doc/docutils/Makefile \ + doc/docutils/conf.py \ doc/salome/Makefile \ doc/salome/gui/Makefile \ doc/salome/gui/GEOM/Makefile \ @@ -417,6 +482,7 @@ AC_OUTPUT([ \ 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 \ @@ -437,6 +503,7 @@ AC_OUTPUT([ \ src/GEOMBase/Makefile \ src/GEOMClient/Makefile \ src/GEOMFiltersSelection/Makefile \ + src/Material/Makefile \ src/GEOMGUI/Makefile \ src/GEOMImpl/Makefile \ src/GEOMToolsGUI/Makefile \ @@ -463,10 +530,13 @@ AC_OUTPUT([ \ 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 \ ])