From 5f1194ca870789bc45111d3365bdae6adc3328f6 Mon Sep 17 00:00:00 2001
From: dutka <dutka>
Date: Thu, 7 Oct 2004 07:22:33 +0000
Subject: [PATCH] =?utf8?q?Biblioth=C3=A8que=20de=20classes=20Batch=20(new)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 salome_adm/unix/config_files/check_boost.m4   |  3 +-
 salome_adm/unix/config_files/check_openpbs.m4 | 57 +++++++++++++++++++
 salome_adm/unix/make_commence.in              |  6 ++
 3 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 salome_adm/unix/config_files/check_openpbs.m4

diff --git a/salome_adm/unix/config_files/check_boost.m4 b/salome_adm/unix/config_files/check_boost.m4
index 66efc5a13..7dfe5826e 100644
--- a/salome_adm/unix/config_files/check_boost.m4
+++ b/salome_adm/unix/config_files/check_boost.m4
@@ -37,13 +37,12 @@ else
   AC_CHECKING(for boost/shared_ptr.hpp header file)
   dnl BOOST headers
   CPPFLAGS_old="${CPPFLAGS}"
-  BOOST_CPPFLAGS="-ftemplate-depth-32 -I${BOOSTDIR}"
+  BOOST_CPPFLAGS="-ftemplate-depth-32 -I`ls -d ${BOOSTDIR}/include/boost-*`"
   CPPFLAGS="${CPPFLAGS} ${BOOST_CPPFLAGS}"
 
   AC_CHECK_HEADER(boost/shared_ptr.hpp,boost_ok=yes,boost_ok=no)
 
   CPPFLAGS="${CPPFLAGS_old}"
-  boost_ok=yes
 fi
 
 AC_LANG_RESTORE
diff --git a/salome_adm/unix/config_files/check_openpbs.m4 b/salome_adm/unix/config_files/check_openpbs.m4
new file mode 100644
index 000000000..9598285c9
--- /dev/null
+++ b/salome_adm/unix/config_files/check_openpbs.m4
@@ -0,0 +1,57 @@
+# Check for OpenPBS
+AC_DEFUN([CHECK_OPENPBS],
+[
+ AC_ARG_VAR([OPENPBS], [OpenPBS home directory])
+ AC_ARG_WITH([openpbs], 
+             AC_HELP_STRING([--with-openpbs=<path>],
+                            [tell configure script to use OpenPBS that is located at <path>]),
+             [test ! x"${withval}" = xyes && OPENPBS=${withval}],
+             [])
+
+ dnl AC_ARG_VAR([OPENPBSSERVERNAME], [OpenPBS server_name file])
+ dnl AC_ARG_WITH([openpbs-server-name], 
+ dnl             AC_HELP_STRING([--with-openpbs-server-name=<path>],
+ dnl                            [tell configure script to use OpenPBS server_name file that is located at <path>]),
+ dnl             [test ! x"${withval}" = xyes && OPENPBSSERVERNAME=${withval}],
+ dnl             [with_openpbs_server_name=""])
+
+
+ if test -z "${OPENPBS}"
+ then
+   AC_MSG_WARN([Environment variable OPENPBS not set. Skipping OpenPBS configuration.])
+
+ else
+
+   OPENPBS_INCLUDES="-I${OPENPBS}/include"
+   saved_CPPFLAGS=${CPPFLAGS}
+   CPPFLAGS="${CPPFLAGS} ${OPENPBS_INCLUDES}"
+   AC_CHECK_HEADER([pbs_ifl.h], [openpbs_header_found=yes], [openpbs_header_found=no], [])
+   test x${openpbs_header_found} = xno && AC_MSG_WARN([OpenPBS include file not found])
+   CPPFLAGS=${saved_CPPFLAGS}
+   AC_SUBST(OPENPBS_INCLUDES)
+ 
+   OPENPBS_LIBDIR="-L${OPENPBS}/lib"
+   OPENPBS_LIBS="-lpbs"
+   saved_LDFLAGS=${LDFLAGS}
+   saved_LIBS=${LIBS}
+   LDFLAGS="${LDFLAGS} ${OPENPBS_LIBDIR}"
+   AC_CHECK_LIB([pbs], [pbs_connect], [openpbs_lib_found=yes], [openpbs_lib_found=no], [])
+   test x${openpbs_lib_found} = xno && AC_MSG_WARN([OpenPBS library not found])
+   LIBS="${LIBS} ${OPENPBS_LIBS}"
+   LDFLAGS=${saved_LDFLAGS}
+   LIBS=${saved_LIBS}
+   AC_SUBST(OPENPBS_LIBDIR)
+   AC_SUBST(OPENPBS_LIBS)
+ 
+   dnl test -z "${OPENPBSSERVERNAME}" && OPENPBSSERVERNAME="/usr/spool/PBS/server_name"
+   dnl AC_CHECK_FILE([${OPENPBSSERVERNAME}], [openpbs_server_name_found=yes], [openpbs_server_name_found=no])
+
+   test x${openpbs_header_found} = xyes && test x${openpbs_lib_found} = xyes  && openpbs_ok="yes"
+
+ fi
+
+ WITHOPENPBS=$openpbs_ok
+ AC_SUBST(WITHOPENPBS)
+
+])
+
diff --git a/salome_adm/unix/make_commence.in b/salome_adm/unix/make_commence.in
index 72033bdcd..7768713de 100644
--- a/salome_adm/unix/make_commence.in
+++ b/salome_adm/unix/make_commence.in
@@ -38,6 +38,12 @@ CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@
 
 BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
 
+# OpenPBS
+
+OPENPBS_INCLUDES = @OPENPBS_INCLUDES@
+OPENPBS_LIBDIR   = @OPENPBS_LIBDIR@
+OPENPBS_LIBS     = @OPENPBS_LIBS@
+
 # JAVA
 
 JAVA_INCLUDES = @JAVA_INCLUDES@
-- 
2.39.2