Salome HOME
projects
/
modules
/
visu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve hack_libtool utility to workaround problems on some Linux configurations
[modules/visu.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index e0080ef8698761eec60b79ef4792a4610a32a6d3..dfc38bde11576bd592207fb8ded291b64c3a9770 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,7
+1,4
@@
-# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
-#
-# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@
-19,13
+16,14
@@
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
+
# Author : Marc Tajchman (CEA)
# Date : 28/06/2001
# Modified by : Patrick GOLDBRONN (CEA)
# Modified by : Marc Tajchman (CEA)
# Modified by : Mikhail Ponikarov (OCN)
#
# Author : Marc Tajchman (CEA)
# Date : 28/06/2001
# Modified by : Patrick GOLDBRONN (CEA)
# Modified by : Marc Tajchman (CEA)
# Modified by : Mikhail Ponikarov (OCN)
#
-AC_INIT([Salome2 Project VISU module], [
5.1.3
], [webmaster.salome@opencascade.com], [SalomeVISU])
+AC_INIT([Salome2 Project VISU module], [
6.2.0
], [webmaster.salome@opencascade.com], [SalomeVISU])
AC_CONFIG_AUX_DIR(adm_local/unix/config_files)
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
AC_CONFIG_AUX_DIR(adm_local/unix/config_files)
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
@@
-136,7
+134,15
@@
dnl testing MPICH
dnl ---------------------------------------------
dnl
dnl ---------------------------------------------
dnl
-CHECK_MPICH
+dnl CHECK_MPICH
+
+echo
+echo ---------------------------------------------
+echo testing MPI
+echo ---------------------------------------------
+echo
+
+CHECK_MPI
echo
echo ---------------------------------------------
echo
echo ---------------------------------------------
@@
-358,6
+364,14
@@
AC_OUTPUT_COMMANDS([ \
chmod +x ./bin/*; \
])
chmod +x ./bin/*; \
])
+AC_HACK_LIBTOOL
+AC_CONFIG_COMMANDS([hack_libtool],[
+sed -i "s%^CC=\"\(.*\)\"%hack_libtool (){ \n\
+ $(pwd)/hack_libtool \1 \"\$[@]\" \n\
+}\n\
+CC=\"hack_libtool\"%g" libtool
+],[])
+
# This list is initiated using autoscan and must be updated manually
# when adding a new file <filename>.in to manage. When you execute
# autoscan, the Makefile list is generated in the output file configure.scan.
# This list is initiated using autoscan and must be updated manually
# when adding a new file <filename>.in to manage. When you execute
# autoscan, the Makefile list is generated in the output file configure.scan.
@@
-377,8
+391,10
@@
AC_OUTPUT([ \
doc/salome/gui/VISU/Makefile \
doc/salome/gui/VISU/doxyfile \
doc/salome/gui/VISU/doxyfile_idl \
doc/salome/gui/VISU/Makefile \
doc/salome/gui/VISU/doxyfile \
doc/salome/gui/VISU/doxyfile_idl \
+ doc/salome/gui/VISU/static/header.html \
doc/salome/tui/Makefile \
doc/salome/tui/doxyfile \
doc/salome/tui/Makefile \
doc/salome/tui/doxyfile \
+ doc/salome/tui/static/header.html \
idl/Makefile \
resources/VISUCatalog.xml \
resources/Makefile \
idl/Makefile \
resources/VISUCatalog.xml \
resources/Makefile \
@@
-386,8
+402,6
@@
AC_OUTPUT([ \
src/CONVERTOR/Makefile \
src/PIPELINE/Makefile \
src/OBJECT/Makefile \
src/CONVERTOR/Makefile \
src/PIPELINE/Makefile \
src/OBJECT/Makefile \
- src/VVTK/Makefile \
- src/GUITOOLS/Makefile \
src/VISU_I/Makefile \
src/VISUGUI/Makefile \
src/VISU_SWIG/Makefile \
src/VISU_I/Makefile \
src/VISUGUI/Makefile \
src/VISU_SWIG/Makefile \