X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=m4%2Fcheck_salome.m4;h=de0b21405a6a9562c29c789a3810e72dfc628a1f;hb=94317c743eafd6b6de89a47378e31410b4a8fdf3;hp=f6bdfa7d9bdf73f55a6d5565d7a3234296e2dbb2;hpb=97482df035ee6e97dde980312a5b02d356b03702;p=modules%2Fjobmanager.git

diff --git a/m4/check_salome.m4 b/m4/check_salome.m4
index f6bdfa7..de0b214 100644
--- a/m4/check_salome.m4
+++ b/m4/check_salome.m4
@@ -1,20 +1,20 @@
-dnl  Copyright (C) 2006-2008  CEA/DEN, EDF R&D
+dnl Copyright (C) 2009-2019  CEA/DEN, 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
-dnl  License as published by the Free Software Foundation; either
-dnl  version 2.1 of the License.
+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, or (at your option) any later version.
 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 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 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 See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 dnl
 # Check availability of Salome's KERNEL binary distribution
 #
@@ -29,8 +29,8 @@ Kernel_ok=no
 dsc_ok=no
 
 AC_ARG_WITH(kernel,
-	    [  --with-kernel=DIR               root directory path of KERNEL build or installation],
-	    KERNEL_DIR="$withval",KERNEL_DIR="")
+            [  --with-kernel=DIR               root directory path of KERNEL build or installation],
+            KERNEL_DIR="$withval",KERNEL_DIR="")
 
 if test "x$KERNEL_DIR" = "x" ; then
 
@@ -44,18 +44,18 @@ if test "x$KERNEL_DIR" = "x" ; then
    else
 
     # search Kernel binaries in PATH variable
-      AC_PATH_PROG(TEMP, runSalome)
+      AC_PATH_PROG(TEMP, runSalome.py)
       if test "x$TEMP" != "x" ; then
          KERNEL_BIN_DIR=`dirname $TEMP`
          KERNEL_DIR=`dirname $KERNEL_BIN_DIR`
       fi
-      
+
    fi
-# 
+#
 fi
 
 
-if test -f ${KERNEL_DIR}/bin/salome/runSalome ; then
+if test -f ${KERNEL_DIR}/bin/salome/runSalome.py ; then
    Kernel_ok=yes
    AC_MSG_RESULT(Using Kernel module distribution in ${KERNEL_DIR})
    AC_DEFINE(SALOME_KERNEL,,[With Salome KERNEL])
@@ -93,9 +93,9 @@ else
 fi
 
 AC_MSG_RESULT(for Kernel: $Kernel_ok)
- 
+
 ])dnl
- 
+
 # -----------------------------------------------------------------------------
 # --- from GUI_SRC 3.2.3
 #  Check availability of Salome binary distribution
@@ -114,8 +114,8 @@ GUI_LDFLAGS=""
 GUI_CXXFLAGS=""
 
 AC_ARG_WITH(gui,
-	    [  --with-gui=DIR          root directory path of SALOME GUI installation],
-	    [SALOME_GUI_DIR="$withval"],[SALOME_GUI_DIR=""])
+            [  --with-gui=DIR          root directory path of SALOME GUI installation],
+            [SALOME_GUI_DIR="$withval"],[SALOME_GUI_DIR=""])
 
 if test "x${SALOME_GUI_DIR}" = "x" ; then
   # no --with-gui-dir option used
@@ -152,9 +152,9 @@ if test -f ${SALOME_GUI_DIR}/bin/salome/$1 ; then
 else
   AC_MSG_WARN("Cannot find compiled SALOME GUI distribution")
 fi
-  
+
 AC_MSG_RESULT(for $2: ${SalomeGUI_ok})
- 
+
 ])dnl
 
 AC_DEFUN([CHECK_SALOME_GUI],[