From: jfa <jfa@opencascade.com>
Date: Wed, 14 Mar 2012 10:56:03 +0000 (+0000)
Subject: Internal issue 0022865: Restructurization of Partition packages.
X-Git-Tag: V6_5_0a1~35
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b39f992df5f7e8db06ba97b3120074fb570c3f65;p=modules%2Fkernel.git

Internal issue 0022865: Restructurization of Partition packages.
---

diff --git a/salome_adm/unix/config_files/check_cas.m4 b/salome_adm/unix/config_files/check_cas.m4
index 470fc3df3..025f57143 100644
--- a/salome_adm/unix/config_files/check_cas.m4
+++ b/salome_adm/unix/config_files/check_cas.m4
@@ -18,7 +18,6 @@ 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-dnl
 
 AC_DEFUN([CHECK_CAS],[
 AC_REQUIRE([AC_PROG_CXX])dnl
@@ -44,6 +43,7 @@ AC_SUBST(CAS_LDPATH)
 AC_SUBST(CAS_STDPLUGIN)
 AC_SUBST(CAS_LIBDIR)
 AC_SUBST(CAS_DATADIR)
+AC_SUBST(OCC_VERSION_DEVELOPMENT)
 AC_SUBST(CASROOT)
 
 CAS_CPPFLAGS=""
@@ -112,6 +112,7 @@ else
   OCC_VERSION_MAJOR=0
   OCC_VERSION_MINOR=0
   OCC_VERSION_MAINTENANCE=0
+  OCC_VERSION_DEVELOPMENT=0
   if test -f $CASROOT/inc/Standard_Version.hxx; then
     ff=$CASROOT/inc/Standard_Version.hxx
   else
@@ -130,6 +131,14 @@ else
     if test $? = 0 ; then
       OCC_VERSION_MAINTENANCE=`grep "define OCC_VERSION_MAINTENANCE" $ff | awk '{i=3 ; print $i}'`
     fi
+    grep "define OCC_VERSION_DEVELOPMENT" $ff > /dev/null
+    if test $? = 0 ; then
+      OCC_VERSION_DEVELOPMENT_STR=`grep "define OCC_VERSION_DEVELOPMENT" $ff | awk '{i=1 ; print $i}'`
+      if test "${OCC_VERSION_DEVELOPMENT_STR}" = "#define" ; then
+        OCC_VERSION_DEVELOPMENT=1
+      fi
+      dnl OCC_VERSION_DEVELOPMENT=1
+    fi
     AC_MSG_CHECKING(for OpenCascade data files)
     if test -f ${CASROOT}/src/UnitsAPI/Lexi_Expr.dat; then
       CAS_DATADIR=${CASROOT}
@@ -259,5 +268,3 @@ fi
 AC_LANG_RESTORE
 
 ])dnl
-
-