X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=configure.in.base;h=85ef94023e73882a4084ef558bbf5d168044d80e;hb=refs%2Ftags%2FV7_2_0rc2;hp=caeb12aca93edea813f1839ab9feeff14b2ee0c3;hpb=313a04631c63078d01c2f643a53500ec549d034e;p=modules%2Fyacs.git

diff --git a/configure.in.base b/configure.in.base
index caeb12aca..85ef94023 100644
--- a/configure.in.base
+++ b/configure.in.base
@@ -1,10 +1,29 @@
+# Copyright (C) 2006-2013  CEA/DEN, EDF R&D
+#
+# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
 # --
-# Copyright (C) CEA, EDF
 # Author : Anthony Geay (CEA)
 # --
 # -----------------------------------------------------------------------------
-
-AC_INIT([Salome2 Project], [4.1.1], [paul.rascle@edf.fr], [SalomeYacs])
+#
+AC_INIT([Salome2 Project], [7.2.0], [paul.rascle@edf.fr], [SalomeYacs])
+AC_CONFIG_AUX_DIR(adm/unix/config_files)
 AM_INIT_AUTOMAKE([tar-pax])
 AC_CONFIG_HEADER(yacs_config.h)
 
@@ -12,8 +31,12 @@ AC_CONFIG_HEADER(yacs_config.h)
 MODULE_NAME=yacs
 AC_SUBST(MODULE_NAME)
 
-XVERSION=0x040101
+SHORT_VERSION=`echo $VERSION | awk -F. '{printf("%d.%d",$1,$2)}'`
+AC_SUBST(SHORT_VERSION)
+XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'`
 AC_SUBST(XVERSION)
+VERSION_DEV=0
+AC_SUBST(VERSION_DEV)
 
 RELEASE=$VERSION
 AC_SUBST(RELEASE)
@@ -76,23 +99,20 @@ SWIG_ENABLE_CXX
 SWIG_PYTHON
 CHECK_CPPUNIT
 AC_CHECK_KERNEL
-CHECK_QT
-CHECK_MSG2QM
-CHECK_CAS
+#CHECK_MSG2QM
 CHECK_HTML_GENERATORS
+CHECK_SPHINX
+
+CHECK_GUI(SALOME_Session_Server,SALOME_Session_Server)
+
+I2_CHECK_QT4
+I2_CHECK_QSCINTILLA
 
 AM_CONDITIONAL([PYTHON_API], [test "x$swig_ok" == "xyes"])
 AM_CONDITIONAL([SALOME_KERNEL], [test "x$KERNEL_ROOT_DIR" != "x"])
 AM_CONDITIONAL([DSC_PORTS], [test -f $KERNEL_ROOT_DIR/idl/salome/DSC_Engines.idl])
 
-#CHECK_KERNEL
-CHECK_GUI(SALOME_Session_Server,SALOME_Session_Server)
-#CHECK_PYHELLO
-#CHECK_GEOM
-#CHECK_VISU
-#CHECK_SALOME_ENV
-
-AM_CONDITIONAL([HAS_GUI], [test "x$GUI_ROOT_DIR" != "x"])
+AM_CONDITIONAL(WINDOWS, [ test ])
 
 echo
 echo
@@ -117,10 +137,11 @@ echo "  swig (python wrapper)... : $swig_ok"
 echo "  SALOME KERNEL .......... : $Kernel_ok"
 echo "  DSC extension .......... : $dsc_ok"
 echo "  Cppunit (make check).... : $cppunit_ok"
-echo "  Qt (salome)............. : $qt_ok"
-echo "  msq2qm ................. : $msg2qm_ok"
+echo "  Qt4 (graphic interface)  : $qt_ok"
+echo "  QScintilla ............. : $qscintilla_ok"
+#echo "  msq2qm ................. : $msg2qm_ok"
 echo "  SALOME GUI ............. : $SalomeGUI_ok"
-echo "  OCC..................... : $occ_ok"
+echo "  Sphinx (user doc) ...... : $sphinx_ok"
 echo
 echo "------------------------------------------------------------------------"
 echo
@@ -147,6 +168,7 @@ fi
 
 AC_OUTPUT([ \
   Makefile \
+  YACS_version.h \
   Demo/Makefile \
   doc/Makefile \
   idl/Makefile \
@@ -156,25 +178,36 @@ AC_OUTPUT([ \
   src/engine/Makefile \
   src/engine/Plugin/Makefile \
   src/engine/Test/Makefile \
-  src/gui/Makefile \
+  src/engine_swig/Makefile \
   src/hmi/Makefile \
-  src/lineconn2d/Makefile \
-  src/prs/Makefile \
   src/pyqt/Makefile \
   src/runtime/Makefile \
   src/runtime/Test/Makefile \
+  src/runtime_swig/Makefile \
+  src/genericgui/Makefile \
+  src/salomewrap/Makefile \
+  src/salomegui/Makefile \
+  src/salomegui_swig/Makefile \
   src/salomeloader/Makefile \
+  src/salomeloader/testSalomeLoader.py \
   src/wrappergen/Makefile \
   src/wrappergen/src/Makefile \
   src/yacsloader/Makefile \
   src/yacsloader/Test/Makefile \
+  src/yacsloader/Test/YacsLoaderTest.sh \
+  src/yacsloader/Test/YacsLoaderInSessionTest.sh \
+  src/yacsloader/Test/display.sh \
+  src/yacsloader/Test/config_appli.xml \
+  src/yacsloader_swig/Makefile \
+  src/yacsloader_swig/Test/Makefile \
+  src/yacsloader_swig/Test/YacsLoaderTest.sh \
+  src/yacsloader_swig/Test/YacsLoaderInSessionTest.sh \
+  src/yacsloader_swig/Test/config_appli.xml \
   src/yacsorb/Makefile \
-    src/yacsloader/Test/YacsLoaderTest.sh \
-    src/yacsloader/Test/YacsLoaderInSessionTest.sh \
-    src/yacsloader/Test/YacsLoaderInSessionTest2.sh \
-    src/yacsloader/Test/display.sh \
-    src/yacsloader/Test/config_appli.xml \
-    src/gui/resources/YACSCatalog.xml \
-    doc/Doxyfile \
+  src/salomegui/resources/YACSCatalog.xml \
+  src/salomegui/resources/SalomeApp.xml \
+  doc/Doxyfile \
+  doc/conf.py \
+  doc/sources/header.html \
 ])