From: nri Date: Wed, 9 Jul 2003 17:15:40 +0000 (+0000) Subject: NRI : bad merge. X-Git-Tag: V1_4_0~56 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a4db557dd98b7c91ebe17f5a6f06f4a7706dfd2d;p=modules%2Fkernel.git NRI : bad merge. --- diff --git a/salome_adm/unix/toto b/salome_adm/unix/toto deleted file mode 100644 index 022922c33..000000000 --- a/salome_adm/unix/toto +++ /dev/null @@ -1,1338 +0,0 @@ -Only in /Salome2/KERNEL_SRC/salome_adm/unix/: CVS -diff -r ./Doxyfile /Salome2/KERNEL_SRC/salome_adm/unix/Doxyfile -1,21d0 -< # 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 -< # -< # -< -diff -r ./F77config.h.in /Salome2/KERNEL_SRC/salome_adm/unix/F77config.h.in -1,21d0 -< /*---------------------------------------------------------------------------------- -< 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 -< ------------------------------------------------------------------------------------*/ -< -diff -r ./SALOMEconfig.h.in /Salome2/KERNEL_SRC/salome_adm/unix/SALOMEconfig.h.in -1,21d0 -< /*---------------------------------------------------------------------------------- -< 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 -< ------------------------------------------------------------------------------------*/ -< -Only in /Salome2/KERNEL_SRC/salome_adm/unix/config_files: CVS -diff -r ./config_files/ac_cc_warnings.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/ac_cc_warnings.m4 -1,2c1 -< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS ---- -> dnl Synopsis -4,22c3 -< dnl This library is free software; you can redistribute it and/or -< dnl modify it under the terms of the GNU Lesser General Public -< dnl License as published by the Free Software Foundation; either -< dnl version 2.1 of the License. -< dnl -< dnl This library is distributed in the hope that it will be useful, -< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -< dnl Lesser General Public License for more details. -< dnl -< dnl You should have received a copy of the GNU Lesser General Public -< dnl License along with this library; if not, write to the Free Software -< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -< dnl -< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -< dnl -< dnl -< dnl -< dnl Synopsis : AC_CC_WARNINGS([ANSI]) ---- -> dnl AC_CC_WARNINGS([ANSI]) -24c5 -< dnl Version : 1.1 (2000/12/31) ---- -> dnl Version -26c7 -< dnl Author : Ville Laurikari ---- -> dnl 1.1 (2000/12/31) -28c9,13 -< dnl Description : ---- -> dnl Author -> dnl -> dnl Ville Laurikari -> dnl -> dnl Description -119c104 -< ]) ---- -> ]) -\ No newline at end of file -diff -r ./config_files/ac_cxx_bool.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/ac_cxx_bool.m4 -1,21d0 -< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -< dnl -< dnl This library is free software; you can redistribute it and/or -< dnl modify it under the terms of the GNU Lesser General Public -< dnl License as published by the Free Software Foundation; either -< dnl version 2.1 of the License. -< dnl -< dnl This library is distributed in the hope that it will be useful, -< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -< dnl Lesser General Public License for more details. -< dnl -< dnl You should have received a copy of the GNU Lesser General Public -< dnl License along with this library; if not, write to the Free Software -< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -< dnl -< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -< dnl -< dnl -< dnl -29c8 -< dnl @version $Id$ ---- -> dnl @version $Id$ -diff -r ./config_files/ac_cxx_depend_flag.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/ac_cxx_depend_flag.m4 -1,21d0 -< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -< dnl -< dnl This library is free software; you can redistribute it and/or -< dnl modify it under the terms of the GNU Lesser General Public -< dnl License as published by the Free Software Foundation; either -< dnl version 2.1 of the License. -< dnl -< dnl This library is distributed in the hope that it will be useful, -< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -< dnl Lesser General Public License for more details. -< dnl -< dnl You should have received a copy of the GNU Lesser General Public -< dnl License along with this library; if not, write to the Free Software -< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -< dnl -< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -< dnl -< dnl -< dnl -27c6 -< dnl @version $Id$ ---- -> dnl @version $Id$ -diff -r ./config_files/ac_cxx_have_sstream.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/ac_cxx_have_sstream.m4 -1,21d0 -< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -< dnl -< dnl This library is free software; you can redistribute it and/or -< dnl modify it under the terms of the GNU Lesser General Public -< dnl License as published by the Free Software Foundation; either -< dnl version 2.1 of the License. -< dnl -< dnl This library is distributed in the hope that it will be useful, -< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -< dnl Lesser General Public License for more details. -< dnl -< dnl You should have received a copy of the GNU Lesser General Public -< dnl License along with this library; if not, write to the Free Software -< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -< dnl -< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -< dnl -< dnl -< dnl -27c6 -< dnl @version $Id$ ---- -> dnl @version $Id$ -diff -r ./config_files/ac_cxx_mutable.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/ac_cxx_mutable.m4 -1,21d0 -< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -< dnl -< dnl This library is free software; you can redistribute it and/or -< dnl modify it under the terms of the GNU Lesser General Public -< dnl License as published by the Free Software Foundation; either -< dnl version 2.1 of the License. -< dnl -< dnl This library is distributed in the hope that it will be useful, -< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -< dnl Lesser General Public License for more details. -< dnl -< dnl You should have received a copy of the GNU Lesser General Public -< dnl License along with this library; if not, write to the Free Software -< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -< dnl -< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -< dnl -< dnl -< dnl -28c7 -< dnl @version $Id$ ---- -> dnl @version $Id$ -diff -r ./config_files/ac_cxx_namespaces.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/ac_cxx_namespaces.m4 -1,21d0 -< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -< dnl -< dnl This library is free software; you can redistribute it and/or -< dnl modify it under the terms of the GNU Lesser General Public -< dnl License as published by the Free Software Foundation; either -< dnl version 2.1 of the License. -< dnl -< dnl This library is distributed in the hope that it will be useful, -< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -< dnl Lesser General Public License for more details. -< dnl -< dnl You should have received a copy of the GNU Lesser General Public -< dnl License along with this library; if not, write to the Free Software -< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -< dnl -< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -< dnl -< dnl -< dnl -27c6 -< dnl @version $Id$ ---- -> dnl @version $Id$ -diff -r ./config_files/ac_cxx_partial_specialization.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/ac_cxx_partial_specialization.m4 -1,21d0 -< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -< dnl -< dnl This library is free software; you can redistribute it and/or -< dnl modify it under the terms of the GNU Lesser General Public -< dnl License as published by the Free Software Foundation; either -< dnl version 2.1 of the License. -< dnl -< dnl This library is distributed in the hope that it will be useful, -< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -< dnl Lesser General Public License for more details. -< dnl -< dnl You should have received a copy of the GNU Lesser General Public -< dnl License along with this library; if not, write to the Free Software -< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -< dnl -< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -< dnl -< dnl -< dnl -27c6 -< dnl @version $Id$ ---- -> dnl @version $Id$ -30d8 -< -diff -r ./config_files/ac_cxx_typename.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/ac_cxx_typename.m4 -1,22c1 -< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -< dnl -< dnl This library is free software; you can redistribute it and/or -< dnl modify it under the terms of the GNU Lesser General Public -< dnl License as published by the Free Software Foundation; either -< dnl version 2.1 of the License. -< dnl -< dnl This library is distributed in the hope that it will be useful, -< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -< dnl Lesser General Public License for more details. -< dnl -< dnl You should have received a copy of the GNU Lesser General Public -< dnl License along with this library; if not, write to the Free Software -< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -< dnl -< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -< dnl -< dnl -< dnl -< ddnl @synopsis AC_CXX_TYPENAME ---- -> dnl @synopsis AC_CXX_TYPENAME -26c5 -< dnl @version $Id$ ---- -> dnl @version $Id$ -Only in /Salome2/KERNEL_SRC/salome_adm/unix/config_files: check_Kernel.m4 -diff -r ./config_files/check_Salome.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_Salome.m4 -1,18c1 -< # 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 -20,21c3 -< #------------------------------------------------------------ -< # Check availability of Salome binary distribution ---- -> # Author : Marc Tajchman (CEA, 2002) -23,24d4 -< # Author : Marc Tajchman (CEA, 2002) -< #------------------------------------------------------------ -diff -r ./config_files/check_cas.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_cas.m4 -1,21d0 -< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -< dnl -< dnl This library is free software; you can redistribute it and/or -< dnl modify it under the terms of the GNU Lesser General Public -< dnl License as published by the Free Software Foundation; either -< dnl version 2.1 of the License. -< dnl -< dnl This library is distributed in the hope that it will be useful, -< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -< dnl Lesser General Public License for more details. -< dnl -< dnl You should have received a copy of the GNU Lesser General Public -< dnl License along with this library; if not, write to the Free Software -< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -< dnl -< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -< dnl -< dnl -< dnl -83c62 -< CPPFLAGS="$CPPFLAGS -DLIN -DLINTEL -DCSFDB -DNO_CXX_EXCEPTION -DNo_exception -I$CASROOT/inc" ---- -> CPPFLAGS="$CPPFLAGS -DLIN -DLINTEL -DCSFDB -DNO_CXX_EXCEPTION -DNo_exception -I$CASROOT/inc -Wno-deprecated" -101c80 -< CPPFLAGS="$CPPFLAGS $CAS_CPPFLAGS" ---- -> CPPFLAGS="$CPPFLAGS $CAS_CPPFLAGS -Wno-deprecated" -diff -r ./config_files/check_corba.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_corba.m4 -1,20d0 -< # 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 -< # -< # -diff -r ./config_files/check_f77.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_f77.m4 -1,21d0 -< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -< dnl -< dnl This library is free software; you can redistribute it and/or -< dnl modify it under the terms of the GNU Lesser General Public -< dnl License as published by the Free Software Foundation; either -< dnl version 2.1 of the License. -< dnl -< dnl This library is distributed in the hope that it will be useful, -< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -< dnl Lesser General Public License for more details. -< dnl -< dnl You should have received a copy of the GNU Lesser General Public -< dnl License along with this library; if not, write to the Free Software -< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -< dnl -< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -< dnl -< dnl -< dnl -diff -r ./config_files/check_hdf5.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_hdf5.m4 -1,20d0 -< # 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 -< # -< # -diff -r ./config_files/check_htmlgen.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_htmlgen.m4 -1,2d0 -< dnl Copyright (C) 2003 CEA/DEN, EDF R&D -< -diff -r ./config_files/check_java.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_java.m4 -1,21d0 -< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -< dnl -< dnl This library is free software; you can redistribute it and/or -< dnl modify it under the terms of the GNU Lesser General Public -< dnl License as published by the Free Software Foundation; either -< dnl version 2.1 of the License. -< dnl -< dnl This library is distributed in the hope that it will be useful, -< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -< dnl Lesser General Public License for more details. -< dnl -< dnl You should have received a copy of the GNU Lesser General Public -< dnl License along with this library; if not, write to the Free Software -< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -< dnl -< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -< dnl -< dnl -< dnl -diff -r ./config_files/check_med2.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_med2.m4 -1,22d0 -< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -< dnl -< dnl This library is free software; you can redistribute it and/or -< dnl modify it under the terms of the GNU Lesser General Public -< dnl License as published by the Free Software Foundation; either -< dnl version 2.1 of the License. -< dnl -< dnl This library is distributed in the hope that it will be useful, -< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -< dnl Lesser General Public License for more details. -< dnl -< dnl You should have received a copy of the GNU Lesser General Public -< dnl License along with this library; if not, write to the Free Software -< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -< dnl -< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -< dnl -< dnl -< dnl -< -diff -r ./config_files/check_mico.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_mico.m4 -1,21d0 -< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -< dnl -< dnl This library is free software; you can redistribute it and/or -< dnl modify it under the terms of the GNU Lesser General Public -< dnl License as published by the Free Software Foundation; either -< dnl version 2.1 of the License. -< dnl -< dnl This library is distributed in the hope that it will be useful, -< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -< dnl Lesser General Public License for more details. -< dnl -< dnl You should have received a copy of the GNU Lesser General Public -< dnl License along with this library; if not, write to the Free Software -< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -< dnl -< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -< dnl -< dnl -< dnl -diff -r ./config_files/check_mpich.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_mpich.m4 -1,22d0 -< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -< dnl -< dnl This library is free software; you can redistribute it and/or -< dnl modify it under the terms of the GNU Lesser General Public -< dnl License as published by the Free Software Foundation; either -< dnl version 2.1 of the License. -< dnl -< dnl This library is distributed in the hope that it will be useful, -< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -< dnl Lesser General Public License for more details. -< dnl -< dnl You should have received a copy of the GNU Lesser General Public -< dnl License along with this library; if not, write to the Free Software -< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -< dnl -< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -< dnl -< dnl -< dnl -< -diff -r ./config_files/check_omniorb.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_omniorb.m4 -40d39 -< dnl OMNIORB_INCLUDES="-I$OMNIORB_ROOT/include -I$OMNIORB_ROOT/include/omniORB4 -I$OMNIORB_ROOT/include/COS" -82,83d80 -< dnl omniORB_ok=yes -< -114,115d110 -< -< dnl omniORB_ok=yes -124d118 -< dnl OMNIORB_LIBS="$OMNIORB_LDFLAGS -lomniORB4 -lomniDynamic4 -lomnithread -lCOS4 -lCOSDynamic4" -140d133 -< omniORB_ok=yes -156c149 -< OMNIORB_IDLCXXFLAGS="-I$OMNIORB_ROOT/idl" ---- -> OMNIORB_IDLCXXFLAGS="-bcxx -I$OMNIORB_ROOT/idl" -diff -r ./config_files/check_opengl.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_opengl.m4 -1,21d0 -< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -< dnl -< dnl This library is free software; you can redistribute it and/or -< dnl modify it under the terms of the GNU Lesser General Public -< dnl License as published by the Free Software Foundation; either -< dnl version 2.1 of the License. -< dnl -< dnl This library is distributed in the hope that it will be useful, -< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -< dnl Lesser General Public License for more details. -< dnl -< dnl You should have received a copy of the GNU Lesser General Public -< dnl License along with this library; if not, write to the Free Software -< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -< dnl -< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -< dnl -< dnl -< dnl -diff -r ./config_files/check_pthreads.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_pthreads.m4 -1,21d0 -< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -< dnl -< dnl This library is free software; you can redistribute it and/or -< dnl modify it under the terms of the GNU Lesser General Public -< dnl License as published by the Free Software Foundation; either -< dnl version 2.1 of the License. -< dnl -< dnl This library is distributed in the hope that it will be useful, -< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -< dnl Lesser General Public License for more details. -< dnl -< dnl You should have received a copy of the GNU Lesser General Public -< dnl License along with this library; if not, write to the Free Software -< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -< dnl -< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -< dnl -< dnl -< dnl -29c8 -< dnl@id $Id$ ---- -> dnl@id $Id$ -diff -r ./config_files/check_pyqt.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_pyqt.m4 -1d0 -< dnl Copyright (C) 2003 CEA/DEN, EDF R&D -8c7 -< pyqt_ok=yes ---- -> pyqt_ok=no -10c9,14 -< dnl were is pyqt ? ---- -> PYTHON_SITE_PACKPYQT=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages -> AC_CHECK_FILES($PYTHON_SITE_PACKPYQT/qt.py $PYTHON_SITE_PACKPYQT/libqtcmodule.so,pyqt_ok=yes,pyqt_ok=no) -> if test "x$pyqt_ok" = xyes ; then -> PYQT_INCLUDES="-I $PYTHON_SITE_PACKPYQT" -> PYQT_LIBS="-L$PYTHON_SITE_PACKPYQT -lqtcmodule" -> fi -12,16c16,25 -< AC_ARG_WITH(pyqt, -< [ --with-pyqt=DIR root directory path to PyQt installation ], -< [PYQTDIR="$withval" -< AC_MSG_RESULT("select $withval as path to PyQt") -< ]) ---- -> if test "x$pyqt_ok" = xyes ; then -> AC_CHECK_FILES(/usr/share/sip/qt/qtmod.sip,pyqt_ok=yes,pyqt_ok=no) -> if test "x$pyqt_ok" = xyes ; then -> PYQT_SIPS="/usr/share/sip/qt" -> fi -> AC_SUBST(PYQT_INCLUDES) -> AC_SUBST(PYQT_LIBS) -> AC_SUBST(PYQT_SIPS) -> AC_MSG_RESULT(yes) -> else -18,22c27 -< AC_ARG_WITH(pyqt_sips, -< [ --with-pyqt_sips=DIR a directory path to PyQt sips installation ], -< [PYQT_SIPS="$withval" -< AC_MSG_RESULT("select $withval as path to PyQt sips") -< ]) ---- -> dnl were is pyqt ? -23a29,89 -> if test -z $PYQTDIR; then -> AC_MSG_WARN(You must provide PYQTDIR variable) -> else -> pyqt_ok=yes -> fi -> -> version=`python -c "import qt;print qt.PYQT_VERSION"` -> case "$version" in -> 3.2*) -> pyqt_vers=old ;; -> 3.3*) -> pyqt_vers=old ;; -> 3.4*) -> pyqt_vers=new ;; -> 3.5*) -> pyqt_vers=new ;; -> *) -> pyqt_vers=no ;; -> esac -> -> if test "x$pyqt_ok" = xno -o ! -d "$PYQTDIR" ; then -> AC_MSG_RESULT(no) -> AC_MSG_WARN(pyqt not found) -> else -> -> pyqt_ok=no -> -> if test "x$pyqt_vers" = "xold" -> then -> AC_CHECK_FILES("$PYQTDIR"/qt.py "$PYQTDIR"/libqtcmodule.so,pyqt_ok=yes,pyqt_ok=no) -> if test "x$pyqt_ok" = xno -o ! -d "$PYQTDIR"/sip ; then -> AC_MSG_RESULT(no) -> AC_MSG_WARN(pyqt not found) -> else -> PYQT_ROOT=$PYQTDIR -> PYQT_INCLUDES="-I$PYQTDIR/sip" -> PYQT_LIBS="-L${PYTHON_PREFIX}/lib/python${PYTHON_VERSION}/site-packages -L$PYQTDIR -lqtcmodule" -> AC_SUBST(PYQT_ROOT) -> AC_SUBST(PYQT_INCLUDES) -> AC_SUBST(PYQT_LIBS) -> AC_MSG_RESULT(yes) -> fi -> fi -> -> if test "x$pyqt_vers" = "xnew" -> then -> AC_CHECK_FILES("$PYQTDIR"/lib/qt.py "$PYQTDIR"/lib/libqtcmodule.so,pyqt_ok=yes,pyqt_ok=no) -> if test "x$pyqt_ok" = xno ; then -> AC_MSG_RESULT(no) -> AC_MSG_WARN(pyqt not found) -> else -> PYQT_ROOT=$PYQTDIR -> PYQT_INCLUDES="-I$PYQTDIR/sip" -> PYQT_LIBS="-L$PYQTDIR/lib -lqtcmodule" -> AC_SUBST(PYQT_ROOT) -> AC_SUBST(PYQT_INCLUDES) -> AC_SUBST(PYQT_LIBS) -> AC_MSG_RESULT(yes) -> fi -> fi -> fi -25c91 -< AC_ARG_WITH(pyuic, ---- -> AC_ARG_WITH(pyuic, -28a95,96 -> ], [ -> AC_PATH_PROG(PYUIC, pyuic) -30a99,110 -> if test "x$PYUIC" = "x" -> then -> pyqt_ok=no -> AC_MSG_RESULT(pyuic not in PATH variable) -> else -> if test -z $PYQT_SIPS; then -> AC_MSG_WARN(You must provide PYQT_SIPS variable) -> pyqt_ok=no -> else -> PYQT_SIPS=${PYQT_SIPS} -> fi -> fi -32,46c112,113 -< if test -z $PYQTDIR; then -< PYQTDIR="/usr/lib/python${PYTHON_VERSION}/site-packages" -< else -< if test -z $PYQT_SIPS; then -< PYQT_SIPS="$PYQTDIR/sip" -< fi -< if test -z $PYUIC; then -< AC_CHECK_FILE("$PYQTDIR/pyuic",pyqt_ok=yes,pyqt_ok=no) -< if test "x$pyqt_ok" = xyes ; then -< PYUIC="$PYQTDIR/pyuic" -< else -< AC_PATH_PROG(PYUIC, pyuic) -< fi -< fi -< fi ---- -> AC_SUBST(PYUIC) -> AC_SUBST(PYQT_SIPS) -48,49c115 -< if test -z $PYQT_SIPS; then -< PYQT_SIPS="/usr/share/sip/qt" ---- -> AC_MSG_RESULT(for pyqt: $pyqt_ok) -51,96d116 -< -< if test -z $PYUIC; then -< PYUIC="/usr/bin/pyuic" -< fi -< -< AC_CHECK_FILES("$PYQTDIR/qt.py","$PYQTDIR/qt/qt.py",pyqt_ok=yes,pyqt_ok=no) -< if test "x$pyqt_ok" = xno ; then -< AC_MSG_RESULT(no) -< AC_MSG_WARN(pyqt not found) -< else -< AC_CHECK_FILE("$PYQTDIR/libqtcmodule.so",pyqt_ok=yes,pyqt_ok=no) -< if test "x$pyqt_ok" = xno ; then -< AC_MSG_RESULT(no) -< AC_MSG_WARN(pyqt not found) -< else -< PYQT_ROOT=$PYQTDIR -< PYQT_LIBS="-L$PYQTDIR -lqtcmodule" -< fi -< AC_CHECK_FILE("$PYQT_SIPS/copying.sip",pyqt_ok=yes,pyqt_ok=no) -< if test "x$pyqt_ok" = xno ; then -< AC_MSG_RESULT(no) -< AC_MSG_WARN(pyqt not found) -< else -< PYQT_INCLUDES="-I$PYQT_SIPS" -< fi -< -< AC_SUBST(PYQT_ROOT) -< AC_SUBST(PYQT_INCLUDES) -< AC_SUBST(PYQT_LIBS) -< -< AC_MSG_RESULT(yes) -< fi -< -< PYQT_ROOT=$PYQTDIR -< PYQT_INCLUDES="-I$PYQT_SIPS" -< PYQT_LIBS="-L$PYQTDIR -lqtcmodule" -< -< AC_SUBST(PYQT_ROOT) -< AC_SUBST(PYQT_INCLUDES) -< AC_SUBST(PYUIC) -< AC_SUBST(PYQT_SIPS) -< AC_SUBST(PYQT_LIBS) -< -< -< -< AC_MSG_RESULT(for pyqt: $pyqt_ok) -diff -r ./config_files/check_qt.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_qt.m4 -1,21d0 -< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -< dnl -< dnl This library is free software; you can redistribute it and/or -< dnl modify it under the terms of the GNU Lesser General Public -< dnl License as published by the Free Software Foundation; either -< dnl version 2.1 of the License. -< dnl -< dnl This library is distributed in the hope that it will be useful, -< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -< dnl Lesser General Public License for more details. -< dnl -< dnl You should have received a copy of the GNU Lesser General Public -< dnl License along with this library; if not, write to the Free Software -< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -< dnl -< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -< dnl -< dnl -< dnl -diff -r ./config_files/check_qwt.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_qwt.m4 -1,2d0 -< dnl Copyright (C) 2003 CEA/DEN, EDF R&D -< -8c6 -< qwt_ok=yes ---- -> qwt_ok=no -11,23d8 -< -< AC_ARG_WITH(qwt, -< [ --with-qwt=DIR directory path to QWT installation ], -< [QWTHOME="$withval" -< AC_MSG_RESULT("select $withval as path to QWT") -< ]) -< -< AC_ARG_WITH(qwt_inc, -< [ --with-qwt_inc=DIR directory path to QWT includes ], -< [QWT_INCLUDES="$withval" -< AC_MSG_RESULT("select $withval as path to QWT includes") -< ]) -< -25,37c10 -< exits_ok=no -< AC_CHECK_FILE("/usr/local/lib/libqwt.so",exits_ok=yes,exits_ok=no) -< if test "x$exits_ok" = "xyes"; then -< QWTHOME="/usr/local/lib" -< if test -z $QWT_INCLUDES; then -< QWT_INCLUDES="/usr/local/include/qwt" -< fi -< else -< QWTHOME="/usr/lib" -< if test -z $QWT_INCLUDES; then -< QWT_INCLUDES="/usr/include/qwt" -< fi -< fi ---- -> AC_MSG_WARN(You must provide QWTHOME variable) -39,41c12 -< if test -z $QWT_INCLUDES; then -< QWT_INCLUDES="$QWTHOME/include" -< fi ---- -> qwt_ok=yes -47d17 -< qwt_ok=no -48a19 -> -52c23 -< CPPFLAGS="$CPPFLAGS -I$QWT_INCLUDES" ---- -> CPPFLAGS="$CPPFLAGS -I$QWTHOME/include" -73c44 -< CXXFLAGS="$CXXFLAGS -I$QTDIR/include -I$QWT_INCLUDES" ---- -> CXXFLAGS="$CXXFLAGS -I$QTDIR/include -I$QWTHOME/include" -94c65 -< QWT_INCLUDES="-I$QWT_INCLUDES" ---- -> QWT_INCLUDES="-I$QWTHOME/include" -diff -r ./config_files/check_sip.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_sip.m4 -1d0 -< dnl Copyright (C) 2003 CEA/DEN, EDF R&D -21,28c20,51 -< if test $SIPDIR ; then -< SIP_ROOT="$SIPDIR" -< SIP_INCLUDES="-I${SIPDIR}" -< SIP_LIBS="-L${SIPDIR} -lsip" -< else -< SIP_INCLUDES="${PYTHON_INCLUDES}" -< SIP_LIBS="-L${PYTHON_PREFIX}/lib/python${PYTHON_VERSION}/site-packages -lsip" -< fi ---- -> version=`sip -V` -> case "$version" in -> 3.2*) -> sip_vers=old ;; -> 3.3*) -> sip_vers=old ;; -> 3.4*) -> sip_vers=new ;; -> 3.5*) -> sip_vers=new ;; -> *) -> sip_vers=no ;; -> esac -> -> sip_ok=no -> -> if test "x$sip_vers" = "xold" -> then -> sip_ok=yes -> SIP_ROOT="$SIPDIR" -> SIP_INCLUDES="${PYTHON_INCLUDES} -I${SIPDIR}" -> SIP_LIBS="-L${PYTHON_PREFIX}/lib/python${PYTHON_VERSION}/site-packages -L${SIPDIR} -lsip" -> fi -> -> if test "x$sip_vers" = "xnew" -> then -> sip_ok=yes -> SIP_ROOT="$SIPDIR" -> SIP_INCLUDES="${PYTHON_INCLUDES} -I${SIPDIR}/include" -> SIP_LIBS="-L${SIPDIR}/lib -lsip" -> fi -> -diff -r ./config_files/check_swig.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_swig.m4 -1,21d0 -< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -< dnl -< dnl This library is free software; you can redistribute it and/or -< dnl modify it under the terms of the GNU Lesser General Public -< dnl License as published by the Free Software Foundation; either -< dnl version 2.1 of the License. -< dnl -< dnl This library is distributed in the hope that it will be useful, -< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -< dnl Lesser General Public License for more details. -< dnl -< dnl You should have received a copy of the GNU Lesser General Public -< dnl License along with this library; if not, write to the Free Software -< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -< dnl -< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -< dnl -< dnl -< dnl -diff -r ./config_files/check_vtk.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/check_vtk.m4 -1,22d0 -< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -< dnl -< dnl This library is free software; you can redistribute it and/or -< dnl modify it under the terms of the GNU Lesser General Public -< dnl License as published by the Free Software Foundation; either -< dnl version 2.1 of the License. -< dnl -< dnl This library is distributed in the hope that it will be useful, -< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -< dnl Lesser General Public License for more details. -< dnl -< dnl You should have received a copy of the GNU Lesser General Public -< dnl License along with this library; if not, write to the Free Software -< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -< dnl -< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -< dnl -< dnl -< dnl -< -53,54c31,32 -< LOCAL_LIBS="-lvtkCommon -lvtkGraphics -lvtkImaging -lvtkPatented -lvtkFiltering -lvtkIO -lvtkRendering -lvtkHybrid $OGL_LIBS -L$x_libraries -lX11 -lXt" -< TRY_LINK_LIBS="-lvtkCommon $OGL_LIBS -L$x_libraries -lX11 -lXt" ---- -> LOCAL_LIBS="-lVTKCommon -lVTKGraphics -lVTKImaging -lVTKContrib $OGL_LIBS -L$x_libraries -lX11 -lXt" -> TRY_LINK_LIBS="-lVTKCommon $OGL_LIBS -L$x_libraries -lX11 -lXt" -60,62c38,40 -< LOCAL_INCLUDES="-I$VTKHOME/include/vtk $LOCAL_INCLUDES" -< LOCAL_LIBS="-L$VTKHOME/lib/vtk $LOCAL_LIBS" -< TRY_LINK_LIBS="-L$VTKHOME/lib/vtk $TRY_LINK_LIBS" ---- -> LOCAL_INCLUDES="-I$VTKHOME/common -I$VTKHOME/imaging -I$VTKHOME/graphics -I$VTKHOME/contrib $LOCAL_INCLUDES" -> LOCAL_LIBS="-L$VTKHOME/lib -L$VTKHOME/common -L$VTKHOME/graphics -L$VTKHOME/imaging -L$VTKHOME/contrib $LOCAL_LIBS" -> TRY_LINK_LIBS="-L$VTKHOME/lib -L$VTKHOME/common $TRY_LINK_LIBS" -67c45 -< CPPFLAGS="$CPPFLAGS $LOCAL_INCLUDES" ---- -> CPPFLAGS="$CPPFLAGS $LOCAL_INCLUDES -Wno-deprecated" -69c47 -< AC_CHECK_HEADER(vtkPlane.h,vtk_ok="yes",vtk_ok="no") ---- -> AC_CHECK_HEADER(vtk.h,vtk_ok="yes",vtk_ok="no") -71c49 -< CPPFLAGS="$CPPFLAGS_old" ---- -> CPPFLAGS="$CPPFLAGS_old" -73,75c51,53 -< if test "x$vtk_ok" = "xyes" -< then -< VTK_INCLUDES="$LOCAL_INCLUDES" ---- -> if test "x$vtk_ok" = "xyes" -> then -> VTK_INCLUDES="$LOCAL_INCLUDES" -77c55 -< dnl vtk libraries ---- -> dnl vtk libraries -79c57 -< AC_MSG_CHECKING(linking VTK library) ---- -> AC_MSG_CHECKING(linking VTK library) -81,85c59,63 -< LIBS_old="$LIBS" -< # LIBS="$LIBS $TRY_LINK_LIBS" -< LIBS="$LIBS $LOCAL_LIBS" -< CPPFLAGS_old="$CPPFLAGS" -< CPPFLAGS="$CPPFLAGS $VTK_INCLUDES" ---- -> LIBS_old="$LIBS" -> # LIBS="$LIBS $TRY_LINK_LIBS" -> LIBS="$LIBS $LOCAL_LIBS" -> CPPFLAGS_old="$CPPFLAGS" -> CPPFLAGS="$CPPFLAGS $VTK_INCLUDES -Wno-deprecated" -87c65 -< dnl VTKPY_MODULES="$VTKHOME/python" ---- -> dnl VTKPY_MODULES="$VTKHOME/python" -89,91c67,69 -< AC_CACHE_VAL(salome_cv_lib_vtk,[ -< AC_TRY_LINK( -< #include "vtkPlane.h" ---- -> AC_CACHE_VAL(salome_cv_lib_vtk,[ -> AC_TRY_LINK( -> #include -119,120d96 -< -< -diff -r ./config_files/enable_pthreads.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/enable_pthreads.m4 -1,21d0 -< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -< dnl -< dnl This library is free software; you can redistribute it and/or -< dnl modify it under the terms of the GNU Lesser General Public -< dnl License as published by the Free Software Foundation; either -< dnl version 2.1 of the License. -< dnl -< dnl This library is distributed in the hope that it will be useful, -< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -< dnl Lesser General Public License for more details. -< dnl -< dnl You should have received a copy of the GNU Lesser General Public -< dnl License along with this library; if not, write to the Free Software -< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -< dnl -< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -< dnl -< dnl -< dnl -27c6 -< dnl@id $Id$ ---- -> dnl@id $Id$ -diff -r ./config_files/mkinstalldirs /Salome2/KERNEL_SRC/salome_adm/unix/config_files/mkinstalldirs -7c7 -< # $Id$ ---- -> # $Id$ -diff -r ./config_files/production.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/production.m4 -1,21d0 -< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -< dnl -< dnl This library is free software; you can redistribute it and/or -< dnl modify it under the terms of the GNU Lesser General Public -< dnl License as published by the Free Software Foundation; either -< dnl version 2.1 of the License. -< dnl -< dnl This library is distributed in the hope that it will be useful, -< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -< dnl Lesser General Public License for more details. -< dnl -< dnl You should have received a copy of the GNU Lesser General Public -< dnl License along with this library; if not, write to the Free Software -< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -< dnl -< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -< dnl -< dnl -< dnl -27c6 -< dnl version $Id$ ---- -> dnl version $Id$ -58c37 -< CXXFLAGS="$CXXFLAGS -O -Wno-deprecated " ---- -> CXXFLAGS="$CXXFLAGS -O" -92c71 -< CXXFLAGS="$CXXFLAGS -g -D_DEBUG_ -Wno-deprecated " ---- -> CXXFLAGS="$CXXFLAGS -g -D_DEBUG_ " -diff -r ./config_files/pyembed.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/pyembed.m4 -1,21d0 -< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -< dnl -< dnl This library is free software; you can redistribute it and/or -< dnl modify it under the terms of the GNU Lesser General Public -< dnl License as published by the Free Software Foundation; either -< dnl version 2.1 of the License. -< dnl -< dnl This library is distributed in the hope that it will be useful, -< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -< dnl Lesser General Public License for more details. -< dnl -< dnl You should have received a copy of the GNU Lesser General Public -< dnl License along with this library; if not, write to the Free Software -< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -< dnl -< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -< dnl -< dnl -< dnl -diff -r ./config_files/python.m4 /Salome2/KERNEL_SRC/salome_adm/unix/config_files/python.m4 -1,21d0 -< dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -< dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -< dnl -< dnl This library is free software; you can redistribute it and/or -< dnl modify it under the terms of the GNU Lesser General Public -< dnl License as published by the Free Software Foundation; either -< dnl version 2.1 of the License. -< dnl -< dnl This library is distributed in the hope that it will be useful, -< dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -< dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -< dnl Lesser General Public License for more details. -< dnl -< dnl You should have received a copy of the GNU Lesser General Public -< dnl License along with this library; if not, write to the Free Software -< dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -< dnl -< dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -< dnl -< dnl -< dnl -diff -r ./depend.in /Salome2/KERNEL_SRC/salome_adm/unix/depend.in -28c28 -< perl -p $(top_srcdir)/bin/distdep .depend >>$@; \ ---- -> perl -p $(top_srcdir)/bin/salome/distdep .depend >>$@; \ -diff -r ./envScript.in /Salome2/KERNEL_SRC/salome_adm/unix/envScript.in -12c12 -< export LD_LIBRARY_PATH=${SALOME_HOME_DIR}/lib:${LD_LIBRARY_PATH} ---- -> export LD_LIBRARY_PATH=${SALOME_HOME_DIR}/lib/salome:${LD_LIBRARY_PATH} -18c18 -< export PYTHONPATH=${PYTHONPATH}:${SALOME_HOME_DIR}/idl:${SALOME_HOME_DIR}/bin:${SALOME_HOME_DIR}/lib:${PYVTK_PATH}:${EXEC_DIR} ---- -> export PYTHONPATH=${PYTHONPATH}:${SALOME_HOME_DIR}/idl:${SALOME_HOME_DIR}/bin/salome:${SALOME_HOME_DIR}/lib/salome:${PYVTK_PATH}:${EXEC_DIR} -diff -r ./make_commence.in /Salome2/KERNEL_SRC/salome_adm/unix/make_commence.in -2c2 -< inc_builddir=$(top_builddir)/include ---- -> inc_builddir=$(top_builddir)/include/salome -13c13 -< LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib -Xlinker -rpath-link -Xlinker $(top_builddir)/lib ---- -> LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker -L$(top_builddir)/lib/salome -50,52c50,51 -< PYTHON_SITE = @PYTHON_SITE@ -< PYTHON_SITE_INSTALL = @PYTHON_SITE_INSTALL@ -< ---- -> PYTHON_SITE = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages -> PYTHON_SITE_INSTALL = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome -102a102,107 -> -> OCC_KERNEL_LIBS=@CAS_KERNEL@ -> OCC_OCAF_LIBS=@CAS_OCAF@ -> OCC_VIEWER_LIBS=@CAS_VIEWER@ -> OCC_MODELER_LIBS=@CAS_MODELER@ -> OCC_DATAEXCHANGE_LIBS=@CAS_DATAEXCHANGE@ -104,108c109 -< CAS_KERNEL=@CAS_KERNEL@ -< CAS_OCAF=@CAS_OCAF@ -< CAS_VIEWER=@CAS_VIEWER@ -< CAS_MODELER=@CAS_MODELER@ -< CAS_DATAEXCHANGE=@CAS_DATAEXCHANGE@ ---- -> -128c129 -< OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/share/salome/idl ---- -> OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_builddir)/idl -145c146 -< IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_builddir)/share/salome/idl -I$(srcdir) ---- -> IDLCXXFLAGS = @IDLCXXFLAGS@ -I$(top_builddir)/idl -188,189c189,190 -< bindir=@bindir@ -< libdir=@libdir@ ---- -> bindir=@bindir@/salome -> libdir=@libdir@/salome -193c194 -< idldir=$(datadir)/idl ---- -> idldir=${prefix}/idl/salome -194a196 -> incmakedir=${prefix}/salome_adm/unix -196c198 -< docdir=@exec_prefix@/doc ---- -> docdir=$(datadir)/doc -246,248c248,249 -< $(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=$(top_srcdir)/adm/unix/config_files/%) -< cd $(top_srcdir) ; aclocal --acdir=./adm/unix/config_files -< ---- -> $(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 -diff -r ./make_conclude.in /Salome2/KERNEL_SRC/salome_adm/unix/make_conclude.in -10c10 -< # $Header$ ---- -> # $Header$ -38,40c38,40 -< # LIB_BUILD = $(LIB:%.la=$(top_builddir)/lib/%.la) -< LIB_BUILD = $(patsubst %.la, $(top_builddir)/lib/%.la, $(filter %.la, $(LIB))) -< LIB_BUILD_A = $(patsubst %.a, $(top_builddir)/lib/%.a, $(filter %.a, $(LIB))) ---- -> # LIB_BUILD = $(LIB:%.la=$(top_builddir)/lib/salome/%.la) -> LIB_BUILD = $(patsubst %.la, $(top_builddir)/lib/salome/%.la, $(filter %.la, $(LIB))) -> LIB_BUILD_A = $(patsubst %.a, $(top_builddir)/lib/salome/%.a, $(filter %.a, $(LIB))) -51c51 -< $(LIB_BUILD): $(top_builddir)/lib/%.la: %.la ---- -> $(LIB_BUILD): $(top_builddir)/lib/salome/%.la: %.la -55,56c55,56 -< ln -sf $(CURDIR)/$< $@ || true -< ln -sf $(patsubst %.la, %.so, $(CURDIR)/.libs/$<) \ ---- -> ln -s $(CURDIR)/$< $@ || true -> ln -s $(patsubst %.la, %.so, $(CURDIR)/.libs/$<) \ -58c58 -< ln -sf $(patsubst %.la, %.so, $(CURDIR)/.libs/$<).0 \ ---- -> ln -s $(patsubst %.la, %.so, $(CURDIR)/.libs/$<).0 \ -62c62 -< ln -sf $(patsubst %.la,%.so, $(CURDIR)/.libs/$<) $(top_builddir)/lib/_$(LIB_SWIG) || true;\ ---- -> ln -s $(patsubst %.la,%.so, $(CURDIR)/.libs/$<) $(top_builddir)/lib/salome/_$(LIB_SWIG) || true;\ -65c65 -< $(LIB_BUILD_A): $(top_builddir)/lib/%.a: %.a ---- -> $(LIB_BUILD_A): $(top_builddir)/lib/salome/%.a: %.a -67c67 -< ln -sf $(CURDIR)/$< $@ || true ---- -> ln -s $(CURDIR)/$< $@ || true -89c89 -< bin: $(BIN:%=$(top_builddir)/bin/%) $(BIN) $(LIB) pyscripts sharedpyscripts ---- -> bin: $(BIN:%=$(top_builddir)/bin/salome/%) $(BIN) $(LIB) pyscripts sharedpyscripts -93c93 -< $(BIN:%=$(top_builddir)/bin/%) $(TEST_PROGS:%=$(top_builddir)/bin/%): $(top_builddir)/bin/%: % ---- -> $(BIN:%=$(top_builddir)/bin/salome/%) $(TEST_PROGS:%=$(top_builddir)/bin/salome/%): $(top_builddir)/bin/salome/%: % -95c95 -< ln -sf $(CURDIR)/$< $@ ---- -> ln -s $(CURDIR)/$< $@ -100c100 -< # copy python scripts in $(top_builddir)/bin ---- -> # copy python scripts in $(top_builddir)/bin/salome -102c102 -< DEST_PYSCRIPTS = $(EXPORT_PYSCRIPTS:%=$(top_builddir)/bin/%) ---- -> DEST_PYSCRIPTS = $(EXPORT_PYSCRIPTS:%=$(top_builddir)/bin/salome/%) -104c104 -< $(DEST_PYSCRIPTS): $(top_builddir)/bin/%: % ---- -> $(DEST_PYSCRIPTS): $(top_builddir)/bin/salome/%: % -123c123 -< test: $(LIB) $(TEST_PROGS:%=$(top_builddir)/bin/%) ---- -> test: $(LIB) $(TEST_PROGS:%=$(top_builddir)/bin/salome/%) -148c148 -< (cd $(libdir); ln -sf $(patsubst %.so, %cmodule.so, $(LIB_SWIG)) _$(LIB_SWIG) || true); \ ---- -> (cd $(libdir); ln -s $(patsubst %.so, %cmodule.so, $(LIB_SWIG)) _$(LIB_SWIG) || true); \ -164c164 -< ($(INSTALL_DATA) $$f $(includedir)/. || exit 1); \ ---- -> (cp -p $$f $(includedir) || exit 1); \ -263,266c263,266 -< -$(RM) $(top_builddir)/lib/$(LIB) -< -$(RM) $(patsubst %,$(top_builddir)/bin/%, $(BIN)) -< -$(RM) $(patsubst %.la, %.so, $(top_builddir)/lib/$(LIB)) -< -$(RM) $(patsubst %.la, %.a, $(top_builddir)/lib/$(LIB)) ---- -> -$(RM) $(top_builddir)/lib/salome/$(LIB) -> -$(RM) $(patsubst %,$(top_builddir)/bin/salome/%, $(BIN)) -> -$(RM) $(patsubst %.la, %.so, $(top_builddir)/lib/salome/$(LIB)) -> -$(RM) $(patsubst %.la, %.a, $(top_builddir)/lib/salome/$(LIB)) -330c330,334 -< $(top_builddir)/bin/msg2qm $< $@ ---- -> if test -e ${KERNEL_ROOT_DIR}/bin/salome/msg2qm ; then \ -> ${KERNEL_ROOT_DIR}/bin/salome/msg2qm $< $@ ; \ -> else \ -> $(top_builddir)/bin/salome/msg2qm $< $@ ; \ -> fi -diff -r ./make_omniorb.in /Salome2/KERNEL_SRC/salome_adm/unix/make_omniorb.in -10c10 -< # $Header$ ---- -> # $Header$ -19c19 -< %$(OMNIORB_IDL_CLN_CXX) %$(OMNIORB_IDL_CLN_H): ${top_builddir}/share/salome/idl/%.idl ---- -> %$(OMNIORB_IDL_CLN_CXX) %$(OMNIORB_IDL_CLN_H): ${top_builddir}/idl/%.idl -Only in .: toto