X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=0d8ccea930ab25269f48bc1d3ceefb74a88f4051;hb=9b6ad17519dd085b1aa8ec1ce33aa5bcb8349bde;hp=be5ecf1a03ea42930c2295d4c77dc9f7abcf9a17;hpb=56c0e22521b867a17e36cb08f3ac37b58e100120;p=samples%2Fsierpinsky.git diff --git a/configure.ac b/configure.ac index be5ecf1..0d8ccea 100644 --- a/configure.ac +++ b/configure.ac @@ -1,25 +1,37 @@ +# Copyright (C) 2005-2013 OPEN CASCADE # -# PLEASE DO NOT MODIFY configure.in FILE +# 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. # -# ALL CHANGES WILL BE DISCARDED BY THE NEXT -# build_configure COMMAND +# 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. # -# CHANGES MUST BE MADE IN configure.in.base FILE +# 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 # + +# PLEASE DO NOT MODIFY configure.in FILE +# ALL CHANGES WILL BE DISCARDED BY THE NEXT +# build_configure COMMAND +# CHANGES MUST BE MADE IN configure.in.base FILE # Author : Marc Tajchman (CEA) # Date : 28/06/2001 # Modified by : Patrick GOLDBRONN (CEA) # Modified by : Marc Tajchman (CEA) -# # Created from configure.in.base # - -AC_INIT([Salome2 Project SIERPINSKY module],[4.1.1], [webmaster.salome@opencascade.com], [salome]) -AC_CONFIG_AUX_DIR(salome_adm/unix/config_files) +AC_INIT([Salome2 Project SIERPINSKY module],[6.6.0], [webmaster.salome@opencascade.com], [SalomeSIERPINSKY]) +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) @@ -27,6 +39,8 @@ AC_SUBST(XVERSION) # set up MODULE_NAME variable for dynamic construction of directories (resources, etc.) MODULE_NAME=sierpinsky AC_SUBST(MODULE_NAME) +VERSION_DEV=1 +AC_SUBST(VERSION_DEV) dnl dnl Initialize source and build root directories @@ -67,6 +81,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 ! @@ -88,7 +103,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='\${KERNEL_ROOT_DIR}'/salome_adm/unix/config_files/install-sh + INSTALL='\${KERNEL_ROOT_DIR}'/adm_local/unix/config_files/install-sh ;; esac @@ -121,11 +136,12 @@ AC_CXX_HAVE_SSTREAM dnl dnl --------------------------------------------- -dnl testing MPICH +dnl testing MPI dnl --------------------------------------------- dnl -CHECK_MPICH +dnl CHECK_MPICH +CHECK_MPI echo echo --------------------------------------------- @@ -217,14 +233,6 @@ echo CHECK_QT -echo -echo --------------------------------------------- -echo testing msg2qm -echo --------------------------------------------- -echo - -CHECK_MSG2QM - echo echo --------------------------------------------- echo testing VTK @@ -251,11 +259,11 @@ CHECK_BOOST echo echo --------------------------------------------- -echo testing MED2 +echo testing MED3 echo --------------------------------------------- echo -CHECK_MED2 +CHECK_MED3 echo echo --------------------------------------------- @@ -317,14 +325,6 @@ echo CHECK_MED -echo -echo --------------------------------------------- -echo testing MED2 -echo --------------------------------------------- -echo - -CHECK_MED2 - echo echo --------------------------------------------- echo Testing Visu @@ -349,7 +349,7 @@ echo echo Configure variables="cc_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok -OpenGL_ok qt_ok msg2qm_ok vtk_ok hdf5_ok med2_ok omniORB_ok occ_ok doxygen_ok graphviz_ok gd_ok Kernel_ok Med_ok Visu_ok Randomizer_ok" +OpenGL_ok qt_ok vtk_ok hdf5_ok med3_ok omniORB_ok occ_ok doxygen_ok graphviz_ok gd_ok Kernel_ok Med_ok Visu_ok Randomizer_ok" for var in $variables do @@ -378,22 +378,34 @@ AC_OUTPUT_COMMANDS([ \ 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/unix/Makefile \ - ./adm_local/unix/config_files/Makefile \ - ./bin/VERSION \ - ./bin/Makefile \ - ./src/Makefile \ - ./src/Sierpinsky/Makefile \ - ./src/SierpinskyGUI/Makefile \ - ./resources/Makefile \ - ./resources/SIERPINSKYCatalog.xml \ - ./idl/Makefile \ + adm_local/Makefile \ + adm_local/unix/Makefile \ + adm_local/unix/config_files/Makefile \ + bin/VERSION \ + bin/Makefile \ + src/Makefile \ + src/Sierpinsky/Makefile \ + src/SierpinskyGUI/Makefile \ + resources/Makefile \ + resources/SIERPINSKYCatalog.xml \ + resources/SalomeApp.xml \ + idl/Makefile \ + SIERPINSKY_version.h \ Makefile \ ])