Merge from V6_main_20120808 08Aug12

[modules/kernel.git] / salome_adm / unix / config_files / check_paco++.m4

diff --git a/salome_adm/unix/config_files/check_paco++.m4 b/salome_adm/unix/config_files/check_paco++.m4
index 844bbf68c5beef4d1768436e75576e09ceb8bc11..5c1d44502366ca9cda41beacaabe67f8ffe1bdae 100644 (file)
--- a/salome_adm/unix/config_files/check_paco++.m4
+++ b/salome_adm/unix/config_files/check_paco++.m4
@@ -1,24 +1,25 @@
-dnl  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+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 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
-dnl  version 2.1 of the License.
+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
+dnl version 2.1 of the License.
 dnl
-dnl  This library is distributed in the hope that it will be useful,
-dnl  but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-dnl  Lesser General Public License for more details.
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl Lesser General Public License for more details.
 dnl
-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 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 email : webmaster.salome@opencascade.com
 dnl
+
 dnl  File   : check_paco++.m4
 dnl  Author : André RIBES (EDF)
 dnl  Module : KERNEL
@@ -34,14 +35,14 @@ if test "x$WITHPACO" = "xyes";
 then
   PACOPATH=$withval
   PACO_INCLUDES="-I${PACOPATH}/include"
-  PACO_LIBS="-L${PACOPATH}/lib -lPaCO"
+  PACO_LIBS="-L${PACOPATH}/lib -lPaCO -lGaBro -lBasicBC"
   dnl a basic test to be sure that PaCO++
   dnl is correctly installed.
-  AC_CHECK_PROG(PACO_IDL, PaCOIdlTool, yes, no, ${PACOPATH}/bin)
+  AC_CHECK_PROG(PACO_IDL, PaCOIdlTool.sh, yes, no, ${PACOPATH}/bin)
   if test "x$PACO_IDL" = "xno";
   then
     PaCO_ok=no
-    AC_MSG_RESULT(PaCO++ binary not in ${PACOPATH})
+    AC_MSG_RESULT(PaCO++ binary not in ${PACOPATH}/bin)
   fi
 else
   PaCO_ok=no
@@ -51,7 +52,7 @@ AC_MSG_CHECKING(for PaCO++)
 if  test "x$PaCO_ok" = "xyes"
 then
   AC_MSG_RESULT([yes])
-  PACO_IDL=${PACOPATH}/bin/PaCOIdlTool
+  PACO_IDL=${PACOPATH}/bin/PaCOIdlTool.sh
   AC_SUBST(PACO_IDL)
   AC_SUBST(PACOPATH)
   AC_SUBST(PACO_INCLUDES)