X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=622ef26c66623226bc9375bf2552f9ed52f7c26d;hb=1bc1bf1fa0fd8b54d5f1afd2a69ae159109199bd;hp=4e47246dc9054a4ba008952ae1efef5be3a73cd1;hpb=e9409ea8b6207a6af3f782591e1b9d7d1ec64069;p=modules%2Fadao.git diff --git a/configure.ac b/configure.ac index 4e47246..622ef26 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -dnl Copyright (C) 2010 EDF R&D +dnl Copyright (C) 2010-2011 EDF R&D 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 @@ -16,9 +16,9 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com dnl -dnl Author: André Ribes, andre.ribes@edf.fr, EDF R&D +dnl Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D -AC_INIT(adao, 0.1) +AC_INIT(ADAO_SRC, [7.2.0]) AC_CONFIG_AUX_DIR(adm_local) AM_INIT_AUTOMAKE AM_CONFIG_HEADER(adao_config.h) @@ -35,6 +35,7 @@ AC_PROG_CXX CHECK_KERNEL CHECK_OMNIORB CHECK_EFICAS +CHECK_MODULE_EFICAS CHECK_SCIPY CHECK_SPHINX @@ -57,6 +58,7 @@ echo " OmniOrb (CORBA) ........ : $omniORB_ok" echo " OmniOrbpy (CORBA) ...... : $omniORBpy_ok" echo " SALOME KERNEL .......... : $Kernel_ok" echo " Eficas ................. : $eficas_ok" +echo " Module Eficas .......... : $module_eficas_ok" echo echo "Optional products:" echo " Sphinx (for doc)........ : $threads_ok" @@ -92,6 +94,10 @@ if test "x$eficas_ok" = "xno"; then AC_MSG_WARN([Eficas is required for SALOME Module part]) salome_module_ok=no fi +if test "x$module_eficas_ok" = "xno"; then + AC_MSG_WARN([Module Eficas is required for SALOME Module part]) + salome_module_ok=no +fi AM_CONDITIONAL(SALOME_MODULE, test x$salome_module_ok = xyes) @@ -99,6 +105,10 @@ if test "x$sphinx_ok" = "xno"; then AC_MSG_WARN([Sphinx is required for ADAO documentation]) fi +if test -f a.out; then + rm a.out +fi + AC_CONFIG_FILES([ Makefile idl/Makefile @@ -109,14 +119,28 @@ AC_CONFIG_FILES([ src/daEficas/prefs_ADAO.py src/daSalome/Makefile src/daSalome/daGUI/Makefile + src/daSalome/daGUI/daUtils/Makefile src/daSalome/daGUI/daGuiImpl/Makefile src/daSalome/daGUI/daEficasWrapper/Makefile - src/daSalome/daGUI/daEficasWrapper/eficasWrapper.py - src/tests/Makefile - src/tests/daSalome/Makefile - src/tests/daSalome/test000_Blue_AnalysisFile.py + examples/Makefile + examples/daSalome/Makefile + examples/daSalome/test003_ADAO_JDC_using_scripts.comm + examples/daSalome/test003_ADAO_JDC_using_scripts.py + examples/daSalome/test003_bis_ADAO_JDC_using_user_data_init.comm + examples/daSalome/test003_bis_ADAO_JDC_using_user_data_init.py + examples/daSalome/test004_ADAO_JDC_using_scripts.comm + examples/daSalome/test004_ADAO_JDC_using_scripts.py + examples/daSalome/test005_ADAO_Operators.comm + examples/daSalome/test005_ADAO_Operators.py + examples/daSalome/test006_Observers.comm + examples/daSalome/test006_Observers.py + examples/daSkeletons/Makefile + examples/daSkeletons/External_data_definition_by_scripts/Makefile + examples/daSkeletons/External_data_definition_by_scripts/ADAO_Case.comm bin/Makefile bin/qtEficas_adao_study.py doc/Makefile + doc/en/Makefile + doc/fr/Makefile ]) AC_OUTPUT