X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=adm_local%2Funix%2Fconfig_files%2Fcheck_SMESH.m4;h=7965412f1f5853b8e62e6732db621c3d0538ab5e;hp=86a8264b2b23f14fdd883020a4904a1d8fe2d677;hb=2c607013a23bd4e7ba07e72e0c04dee2c1209cff;hpb=4ff5bd61540272713e48de1eee75625028c32155

diff --git a/adm_local/unix/config_files/check_SMESH.m4 b/adm_local/unix/config_files/check_SMESH.m4
index 86a8264b2..7965412f1 100644
--- a/adm_local/unix/config_files/check_SMESH.m4
+++ b/adm_local/unix/config_files/check_SMESH.m4
@@ -1,3 +1,25 @@
+dnl Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+dnl
+dnl Copyright (C) 2003-2007  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+dnl
+
 # Check availability of SMesh binary distribution
 #
 # Author : Nicolas REJNERI (OPEN CASCADE, 2003)
@@ -9,6 +31,9 @@ AC_CHECKING(for SMesh)
 
 SMesh_ok=no
 
+SMESH_LDFLAGS=""
+SMESH_CXXFLAGS=""
+
 AC_ARG_WITH(smesh,
 	    [  --with-smesh=DIR root directory path of SMESH installation ],
 	    SMESH_DIR="$withval",SMESH_DIR="")
@@ -25,7 +50,9 @@ if test "x$SMESH_DIR" == "x" ; then
    else
 
     # search SMESH binaries in PATH variable
-      AC_PATH_PROG(TEMP, libSMESH_Swig.py)
+      #CCRTAC_PATH_PROG(TEMP, libSMESH_Swig.py)
+      #AC_PATH_PROG(TEMP, MED_Test)
+      AC_PATH_PROG(TEMP, smesh.py)
       if test "x$TEMP" != "x" ; then
          SMESH_BIN_DIR=`dirname $TEMP`
          SMESH_DIR=`dirname $SMESH_BIN_DIR`
@@ -35,7 +62,9 @@ if test "x$SMESH_DIR" == "x" ; then
 # 
 fi
 
-if test -f ${SMESH_DIR}/bin/salome/libSMESH_Swig.py ; then
+#CCRTif test -f ${SMESH_DIR}/bin/salome/libSMESH_Swig.py ; then
+#if test -f ${SMESH_DIR}/bin/salome/MED_Test ; then
+if test -f ${SMESH_DIR}/bin/salome/smesh.py ; then
    SMesh_ok=yes
    AC_MSG_RESULT(Using SMesh module distribution in ${SMESH_DIR})
 
@@ -44,6 +73,12 @@ if test -f ${SMESH_DIR}/bin/salome/libSMESH_Swig.py ; then
    fi
    AC_SUBST(SMESH_ROOT_DIR)
 
+   SMESH_LDFLAGS=-L${SMESH_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
+   SMESH_CXXFLAGS=-I${SMESH_DIR}/include/salome
+
+   AC_SUBST(SMESH_LDFLAGS)
+   AC_SUBST(SMESH_CXXFLAGS)   
+
 else
    AC_MSG_WARN("Cannot find compiled SMesh module distribution")
 fi