From 825cc9cd71aefa9fb3ae7c535fd9b405a0110804 Mon Sep 17 00:00:00 2001 From: barate Date: Tue, 15 Jan 2013 10:57:45 +0000 Subject: [PATCH] Adapt to new libbatch naming conventions --- .../unix/config_files/check_libbatch.m4 | 24 +++++++++++-------- src/Launcher/BatchTest.cxx | 4 ++-- src/Launcher/Launcher.cxx | 8 +++---- src/Launcher/Launcher_Job.cxx | 2 +- src/Launcher/Launcher_Job.hxx | 8 +++---- src/Launcher/Launcher_Job_Command.cxx | 2 +- src/Launcher/Launcher_Job_Command.hxx | 2 +- src/Launcher/Launcher_Job_SALOME.cxx | 2 +- src/Launcher/Launcher_Job_SALOME.hxx | 2 +- 9 files changed, 29 insertions(+), 25 deletions(-) diff --git a/salome_adm/unix/config_files/check_libbatch.m4 b/salome_adm/unix/config_files/check_libbatch.m4 index 53d3ebd0f..4e6788745 100644 --- 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 d765f51e8..04adb68bf 100644 --- a/src/Launcher/BatchTest.cxx +++ b/src/Launcher/BatchTest.cxx @@ -24,8 +24,8 @@ #include "Launcher.hxx" #ifdef WITH_LIBBATCH -#include -#include +#include +#include #endif #include "utilities.h" diff --git a/src/Launcher/Launcher.cxx b/src/Launcher/Launcher.cxx index fcea8e445..02c2ab966 100644 --- a/src/Launcher/Launcher.cxx +++ b/src/Launcher/Launcher.cxx @@ -21,10 +21,10 @@ // #ifdef WITH_LIBBATCH -#include -#include -#include -#include +#include +#include +#include +#include #endif #include "Basics_Utils.hxx" diff --git a/src/Launcher/Launcher_Job.cxx b/src/Launcher/Launcher_Job.cxx index e51b7a4d3..945baabc1 100644 --- a/src/Launcher/Launcher_Job.cxx +++ b/src/Launcher/Launcher_Job.cxx @@ -23,7 +23,7 @@ #include "Launcher.hxx" #ifdef WITH_LIBBATCH -#include +#include #endif Launcher::Job::Job() diff --git a/src/Launcher/Launcher_Job.hxx b/src/Launcher/Launcher_Job.hxx index 15d69bdc8..d011d9ecd 100644 --- a/src/Launcher/Launcher_Job.hxx +++ b/src/Launcher/Launcher_Job.hxx @@ -38,10 +38,10 @@ #include #ifdef WITH_LIBBATCH -#include -#include -#include -#include +#include +#include +#include +#include #endif #include diff --git a/src/Launcher/Launcher_Job_Command.cxx b/src/Launcher/Launcher_Job_Command.cxx index 6f2fecebd..0bfa86887 100644 --- 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 +#include #endif #ifdef WNT diff --git a/src/Launcher/Launcher_Job_Command.hxx b/src/Launcher/Launcher_Job_Command.hxx index ead4fb5b2..5696a1b7d 100644 --- 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 +#include #endif namespace Launcher diff --git a/src/Launcher/Launcher_Job_SALOME.cxx b/src/Launcher/Launcher_Job_SALOME.cxx index 85f6e1015..22170aeef 100644 --- 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 +#include #endif #ifdef WNT diff --git a/src/Launcher/Launcher_Job_SALOME.hxx b/src/Launcher/Launcher_Job_SALOME.hxx index 30351b184..297dca4c4 100644 --- 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 +#include #endif namespace Launcher -- 2.39.2