Adapt to new libbatch naming conventions

diff --git a/salome_adm/unix/config_files/check_libbatch.m4 b/salome_adm/unix/config_files/check_libbatch.m4
index 53d3ebd0f841c4e7f5886772e13476e0d5affbc7..4e678874554a292b3a1f9a4fe9f10235bfb31551 100644 (file)
--- a/salome_adm/unix/config_files/check_libbatch.m4
+++ b/salome_adm/unix/config_files/check_libbatch.m4
@@ -1,5 +1,8 @@
 dnl Copyright (C) 2007-2012  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
@@ -14,18 +17,19 @@ 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
+dnl email : webmaster.salome@opencascade.com
 dnl
 
 # CHECK_LIBBATCH
-# This macro can be used to find libBatch and set the associated variables in
+# This macro can be used to find libbatch and set the associated variables in
 # a project based on autoconf. You can copy this file in your own project and
 # eventually modify it according to your own needs.
 # ----------------------------------------------------------------------------
 
 AC_DEFUN([CHECK_LIBBATCH],[
 
-AC_MSG_NOTICE(Checking for libBatch library)
+AC_MSG_NOTICE(Checking for libbatch library)
 
 AC_SUBST(LIBBATCH_INCLUDES)
 AC_SUBST(LIBBATCH_LIBS)
@@ -55,27 +59,27 @@ LOCAL_LIBS=""
 if test "x$LIBBATCH_DIR" != "x" ; then
   LOCAL_INCLUDES="-I$LIBBATCH_DIR/include"
   if test "x$LIBBATCH_DIR" = "x/usr" ; then
-    LOCAL_LIBS="-lBatch"
+    LOCAL_LIBS="-lbatch"
   else
-    LOCAL_LIBS="-L$LIBBATCH_DIR/lib -lBatch"
+    LOCAL_LIBS="-L$LIBBATCH_DIR/lib -lbatch"
   fi
 else
   LOCAL_INCLUDES="-I/usr/include"
-  LOCAL_LIBS="-lBatch"
+  LOCAL_LIBS="-lbatch"
 fi
 
-# libBatch headers
+# libbatch headers
 
 CPPFLAGS_old="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $LOCAL_INCLUDES"
-AC_CHECK_HEADER(Batch/Batch_BatchManager.hxx,
+AC_CHECK_HEADER(libbatch/Batch_BatchManager.hxx,
                                libbatch_ok="yes",
                                libbatch_ok="no")
 CPPFLAGS="$CPPFLAGS_old"
 
 
 if  test "x$libbatch_ok" = "xyes" ; then
-  # libBatch library
+  # libbatch library
 
   LIBS_old=$LIBS
   LIBS="$LIBS $LOCAL_LIBS"
@@ -106,6 +110,6 @@ if test "x$libbatch_ok" = "xyes" ; then
   LIBBATCH_LIBS="$LOCAL_LIBS"
 fi
 
-AC_MSG_RESULT(for libBatch: $libbatch_ok)
+AC_MSG_RESULT(for libbatch: $libbatch_ok)
 
 ])

diff --git a/src/Launcher/BatchTest.cxx b/src/Launcher/BatchTest.cxx
index d765f51e8c1ababac7f863f833d791167a235697..04adb68bfa99d7cad434daa18e505cb87fffd89e 100644 (file)
--- a/src/Launcher/BatchTest.cxx
+++ b/src/Launcher/BatchTest.cxx
@@ -24,8 +24,8 @@
 #include "Launcher.hxx"
 
 #ifdef WITH_LIBBATCH
-#include <Batch/Batch_Date.hxx>
-#include <Batch/Batch_MpiImpl.hxx>
+#include <libbatch/Batch_Date.hxx>
+#include <libbatch/Batch_MpiImpl.hxx>
 #endif
 
 #include "utilities.h"

diff --git a/src/Launcher/Launcher.cxx b/src/Launcher/Launcher.cxx
index fcea8e445cbcd222b7b9b7e1cab0fa71d3731213..02c2ab966fc35f96e6096dcc4ced8c2e010ff25e 100644 (file)
--- a/src/Launcher/Launcher.cxx
+++ b/src/Launcher/Launcher.cxx
@@ -21,10 +21,10 @@
 //
 
 #ifdef WITH_LIBBATCH
-#include <Batch/Batch_Date.hxx>
-#include <Batch/Batch_BatchManagerCatalog.hxx>
-#include <Batch/Batch_FactBatchManager.hxx>
-#include <Batch/Batch_BatchManager.hxx>
+#include <libbatch/Batch_Date.hxx>
+#include <libbatch/Batch_BatchManagerCatalog.hxx>
+#include <libbatch/Batch_FactBatchManager.hxx>
+#include <libbatch/Batch_BatchManager.hxx>
 #endif
 
 #include "Basics_Utils.hxx"

diff --git a/src/Launcher/Launcher_Job.cxx b/src/Launcher/Launcher_Job.cxx
index e51b7a4d3c9eb58fec4a1b12f843a5bd2fcf1401..945baabc11e312fdea55df3b78c6e00f735dde21 100644 (file)
--- a/src/Launcher/Launcher_Job.cxx
+++ b/src/Launcher/Launcher_Job.cxx
@@ -23,7 +23,7 @@
 #include "Launcher.hxx"
 
 #ifdef WITH_LIBBATCH
-#include <Batch/Batch_Constants.hxx>
+#include <libbatch/Batch_Constants.hxx>
 #endif
 
 Launcher::Job::Job()

diff --git a/src/Launcher/Launcher_Job.hxx b/src/Launcher/Launcher_Job.hxx
index 15d69bdc8a55674d9bc69247fbe8a2b196866756..d011d9ecd5becf06a6c798fcdce6e8681f65065b 100644 (file)
--- a/src/Launcher/Launcher_Job.hxx
+++ b/src/Launcher/Launcher_Job.hxx
@@ -38,10 +38,10 @@
 #include <exception>
 
 #ifdef WITH_LIBBATCH
-#include <Batch/Batch_Job.hxx>
-#include <Batch/Batch_Date.hxx>
-#include <Batch/Batch_JobId.hxx>
-#include <Batch/Batch_GenericException.hxx>
+#include <libbatch/Batch_Job.hxx>
+#include <libbatch/Batch_Date.hxx>
+#include <libbatch/Batch_JobId.hxx>
+#include <libbatch/Batch_GenericException.hxx>
 #endif
 
 #include <libxml/parser.h>

diff --git a/src/Launcher/Launcher_Job_Command.cxx b/src/Launcher/Launcher_Job_Command.cxx
index 6f2fecebd12f2d2769d892b5718d45292d5631ab..0bfa868873c3ed75eb2985656d91f5982aa4b22f 100644 (file)
--- a/src/Launcher/Launcher_Job_Command.cxx
+++ b/src/Launcher/Launcher_Job_Command.cxx
@@ -23,7 +23,7 @@
 #include "Basics_DirUtils.hxx"
 
 #ifdef WITH_LIBBATCH
-#include <Batch/Batch_Constants.hxx>
+#include <libbatch/Batch_Constants.hxx>
 #endif
 
 #ifdef WNT

diff --git a/src/Launcher/Launcher_Job_Command.hxx b/src/Launcher/Launcher_Job_Command.hxx
index ead4fb5b26fd61b81cde5892e7e5435ca5b98127..5696a1b7d9170d5e2e046d7c8063dc1bf4e4759c 100644 (file)
--- a/src/Launcher/Launcher_Job_Command.hxx
+++ b/src/Launcher/Launcher_Job_Command.hxx
@@ -26,7 +26,7 @@
 #include "Launcher.hxx"
 
 #ifdef WITH_LIBBATCH
-#include <Batch/Batch_Job.hxx>
+#include <libbatch/Batch_Job.hxx>
 #endif
 
 namespace Launcher

diff --git a/src/Launcher/Launcher_Job_SALOME.cxx b/src/Launcher/Launcher_Job_SALOME.cxx
index 85f6e1015eb2f6bae1e7b20c983252c3c94f5eae..22170aeefc472124b4d778f20e1977a35fba488c 100644 (file)
--- a/src/Launcher/Launcher_Job_SALOME.cxx
+++ b/src/Launcher/Launcher_Job_SALOME.cxx
@@ -23,7 +23,7 @@
 #include "Basics_DirUtils.hxx"
 
 #ifdef WITH_LIBBATCH
-#include <Batch/Batch_Constants.hxx>
+#include <libbatch/Batch_Constants.hxx>
 #endif
 
 #ifdef WNT

diff --git a/src/Launcher/Launcher_Job_SALOME.hxx b/src/Launcher/Launcher_Job_SALOME.hxx
index 30351b18408cc032de9a15b9254d2cc4471c815f..297dca4c43a334cbae97ef90950231f7f96c0f15 100644 (file)
--- a/src/Launcher/Launcher_Job_SALOME.hxx
+++ b/src/Launcher/Launcher_Job_SALOME.hxx
@@ -26,7 +26,7 @@
 #include "Launcher.hxx"
 
 #ifdef WITH_LIBBATCH
-#include <Batch/Batch_Job.hxx>
+#include <libbatch/Batch_Job.hxx>
 #endif
 
 namespace Launcher