Merge from V6_main branch 18/04/2011

diff --git a/salome_adm/unix/config_files/check_libbatch.m4 b/salome_adm/unix/config_files/check_libbatch.m4
index 089dc070df8fec563d3c93b80773b65f87498b64..8c5ec95afae3174859f7cf3b8788f192c3af3480 100644 (file)
--- 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 53a765bf04bf8bb6602216a159d2a5ff3f8cee9f..80f59953e8962b2068f3c64fb111d75484a85b0a 100644 (file)
--- 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 672212ba721a2bbc5c9f785357cff339d41dd3cb..e416a934c26b2adfe7bd9808619417faa99b2bbf 100644 (file)
--- 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 72594b8da042955f0aaee578cd419753f12d635f..7b2526e61fb33a0f6ed3519421088f3b7f0bbcf4 100644 (file)
--- 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 ae169ad440ed355adb4d3e7b72ada62b776c3f2e..eeba823a743d65c9d3fc3c05f72ccd657662a2bf 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_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>