From: aguerre <aguerre>
Date: Fri, 11 Oct 2013 13:01:52 +0000 (+0000)
Subject: Search runSalome.py instead of runSalome for KERNEL detection
X-Git-Tag: V7_3_0a1~10
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9e9000e6b1beaf740c945627d01fdbf8dad9efcb;p=modules%2Fjobmanager.git

Search runSalome.py instead of runSalome for KERNEL detection
---

diff --git a/m4/check_salome.m4 b/m4/check_salome.m4
index 1d41dbb..103c2d9 100644
--- a/m4/check_salome.m4
+++ b/m4/check_salome.m4
@@ -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],[