From a06f6dbcbae37958e0462a30138036afe0fcd0a5 Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Mon, 18 Apr 2011 12:58:18 +0000
Subject: [PATCH] Merge from V6_main branch 18/04/2011

---
 salome_adm/unix/config_files/check_libbatch.m4 | 4 ++--
 src/Launcher/BatchTest.cxx                     | 4 ++--
 src/Launcher/Launcher.cxx                      | 8 ++++----
 src/Launcher/Launcher_Job.cxx                  | 3 ++-
 src/Launcher/Launcher_Job.hxx                  | 8 ++++----
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/salome_adm/unix/config_files/check_libbatch.m4 b/salome_adm/unix/config_files/check_libbatch.m4
index 089dc070d..8c5ec95af 100644
--- a/salome_adm/unix/config_files/check_libbatch.m4
+++ b/salome_adm/unix/config_files/check_libbatch.m4
@@ -53,14 +53,14 @@ LOCAL_INCLUDES=""
 LOCAL_LIBS=""
 
 if test "x$LIBBATCH_DIR" != "x" ; then
-  LOCAL_INCLUDES="-I$LIBBATCH_DIR/include/Batch"
+  LOCAL_INCLUDES="-I$LIBBATCH_DIR/include"
   if test "x$LIBBATCH_DIR" = "x/usr" ; then
     LOCAL_LIBS="-lBatch"
   else
     LOCAL_LIBS="-L$LIBBATCH_DIR/lib -lBatch"
   fi
 else
-  LOCAL_INCLUDES="-I/usr/include/Batch"
+  LOCAL_INCLUDES="-I/usr/include"
   LOCAL_LIBS="-lBatch"
 fi
 
diff --git a/src/Launcher/BatchTest.cxx b/src/Launcher/BatchTest.cxx
index 53a765bf0..80f59953e 100644
--- a/src/Launcher/BatchTest.cxx
+++ b/src/Launcher/BatchTest.cxx
@@ -24,8 +24,8 @@
 #include "Launcher.hxx"
 
 #ifdef WITH_LIBBATCH
-#include <Batch_Date.hxx>
-#include <Batch_MpiImpl.hxx>
+#include <Batch/Batch_Date.hxx>
+#include <Batch/Batch_MpiImpl.hxx>
 #endif
 
 #include "utilities.h"
diff --git a/src/Launcher/Launcher.cxx b/src/Launcher/Launcher.cxx
index 672212ba7..e416a934c 100644
--- a/src/Launcher/Launcher.cxx
+++ b/src/Launcher/Launcher.cxx
@@ -21,10 +21,10 @@
 //
 
 #ifdef WITH_LIBBATCH
-#include <Batch_Date.hxx>
-#include <Batch_BatchManagerCatalog.hxx>
-#include <Batch_FactBatchManager_eClient.hxx>
-#include <Batch_BatchManager_eClient.hxx>
+#include <Batch/Batch_Date.hxx>
+#include <Batch/Batch_BatchManagerCatalog.hxx>
+#include <Batch/Batch_FactBatchManager_eClient.hxx>
+#include <Batch/Batch_BatchManager_eClient.hxx>
 #endif
 
 #include "Basics_Utils.hxx"
diff --git a/src/Launcher/Launcher_Job.cxx b/src/Launcher/Launcher_Job.cxx
index 72594b8da..7b2526e61 100644
--- a/src/Launcher/Launcher_Job.cxx
+++ b/src/Launcher/Launcher_Job.cxx
@@ -23,7 +23,8 @@
 #include "Launcher.hxx"
 
 #ifdef WITH_LIBBATCH
-#include <Batch_Constants.hxx>
+#include <Batch/Batch_Constants.hxx>
+#include <Batch/Batch_FactBatchManager_eLL.hxx>
 #endif
 
 Launcher::Job::Job()
diff --git a/src/Launcher/Launcher_Job.hxx b/src/Launcher/Launcher_Job.hxx
index ae169ad44..eeba823a7 100644
--- a/src/Launcher/Launcher_Job.hxx
+++ b/src/Launcher/Launcher_Job.hxx
@@ -38,10 +38,10 @@
 #include <exception>
 
 #ifdef WITH_LIBBATCH
-#include <Batch_Job.hxx>
-#include <Batch_Date.hxx>
-#include <Batch_JobId.hxx>
-#include <Batch_EmulationException.hxx>
+#include <Batch/Batch_Job.hxx>
+#include <Batch/Batch_Date.hxx>
+#include <Batch/Batch_JobId.hxx>
+#include <Batch/Batch_EmulationException.hxx>
 #endif
 
 #include <libxml/parser.h>
-- 
2.39.2