X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=a949b25d1ed55c783b09f09b9a19cb3f28d8583e;hb=f0cd60b41162a0a63979907f37d8045f0bbb8292;hp=5f684b80102ac13191464cb52ade3dc512c8f29e;hpb=7fbdd4a756c4f79d63ffada80258f4a0595fe9ff;p=modules%2Fsmesh.git diff --git a/configure.ac b/configure.ac index 5f684b801..a949b25d1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 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 @@ -24,7 +24,7 @@ # Modified by : Alexander BORODIN (OCN) - autotools usage # Created from configure.in.base # -AC_INIT([Salome2 Project SMESH module], [6.4.0], [webmaster.salome@opencascade.com], [SalomeSMESH]) +AC_INIT([Salome2 Project SMESH module], [6.6.0], [webmaster.salome@opencascade.com], [SalomeSMESH]) AC_CONFIG_AUX_DIR(adm_local/unix/config_files) AC_CANONICAL_HOST AC_CANONICAL_TARGET @@ -32,6 +32,8 @@ AM_INIT_AUTOMAKE([-Wno-portability]) XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'` AC_SUBST(XVERSION) +VERSION_DEV=1 +AC_SUBST(VERSION_DEV) # set up MODULE_NAME variable for dynamic construction of directories (resources, etc.) MODULE_NAME=smesh @@ -424,6 +426,15 @@ echo CHECK_CGNS +echo +echo --------------------------------------------- +echo Testing PADDER library +echo --------------------------------------------- +echo + +CHECK_CGAL +CHECK_PADDER + echo echo --------------------------------------------- echo Testing TBB library @@ -458,6 +469,16 @@ echo echo "Default ORB : $DEFAULT_ORB" echo +echo "Optionnal products (for plugins):" +optional_vars="cgal_ok padder_ok" +for var in $optional_vars +do + printf " %10s : " `echo \$var | sed -e "s,_ok,,"` + eval echo \$$var +done + + + dnl We don t need to say when we re entering directories if we re using dnl GNU make becuase make does it for us. if test "X$GMAKE" = "Xyes"; then @@ -516,6 +537,7 @@ AC_OUTPUT([ \ doc/docutils/Makefile \ doc/docutils/conf.py \ doc/salome/Makefile \ + doc/salome/examples/Makefile \ doc/salome/gui/Makefile \ doc/salome/gui/SMESH/Makefile \ doc/salome/gui/SMESH/doxyfile \ @@ -532,6 +554,7 @@ AC_OUTPUT([ \ src/DriverMED/Makefile \ src/DriverSTL/Makefile \ src/DriverUNV/Makefile \ + src/DriverGMF/Makefile \ src/DriverCGNS/Makefile \ src/MEFISTO2/Makefile \ src/OBJECT/Makefile \ @@ -552,6 +575,7 @@ AC_OUTPUT([ \ src/SMESH_PY/Makefile \ src/Tools/Makefile \ src/Tools/MeshCut/Makefile \ + src/Tools/YamsPlug/Makefile \ src/Tools/padder/Makefile \ src/Tools/padder/meshjob/Makefile \ src/Tools/padder/meshjob/idl/Makefile \ @@ -565,8 +589,7 @@ AC_OUTPUT([ \ src/Tools/padder/resources/appligen/Makefile \ src/Tools/padder/resources/appligen/appligen.sh \ src/Tools/padder/resources/appligen/config_appli.xml \ - src/Tools/padder/resources/padderexe/Makefile \ - src/Tools/padder/resources/padderexe/envPadder.sh \ + src/Tools/padder/resources/testdata/Makefile \ src/Tools/padder/unittests/Makefile \ src/Tools/padder/unittests/autotest.sh \ src/Tools/padder/doc/Makefile \