-dnl Copyright (C) 2009-2012 CEA/DEN, EDF R&D
+dnl Copyright (C) 2009-2014 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 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
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
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])
fi
AC_MSG_RESULT(for Kernel: $Kernel_ok)
-
+
])dnl
-
+
# -----------------------------------------------------------------------------
# --- from GUI_SRC 3.2.3
# Check availability of Salome binary distribution
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
else
AC_MSG_WARN("Cannot find compiled SALOME GUI distribution")
fi
-
+
AC_MSG_RESULT(for $2: ${SalomeGUI_ok})
-
+
])dnl
AC_DEFUN([CHECK_SALOME_GUI],[