Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PR: correct some warnings
[modules/smesh.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 912e8c20af8314b3f212c3c03e12785d42026b19..7b39b99c89c7ef7c082d88f47c402616958aecdc 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,6
+16,7
@@
#
# 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)
# Author : Marc Tajchman (CEA)
# Date : 28/06/2001
# Modified by : Patrick GOLDBRONN (CEA)
@@
-26,8
+24,8
@@
# Modified by : Alexander BORODIN (OCN) - autotools usage
# Created from configure.in.base
#
# Modified by : Alexander BORODIN (OCN) - autotools usage
# Created from configure.in.base
#
-AC_INIT([Salome2 Project SMESH module], [
5.1.2
], [webmaster.salome@opencascade.com], [SalomeSMESH])
-AC_CONFIG_AUX_DIR(
salome_adm
/unix/config_files)
+AC_INIT([Salome2 Project SMESH module], [
6.2.0
], [webmaster.salome@opencascade.com], [SalomeSMESH])
+AC_CONFIG_AUX_DIR(
adm_local
/unix/config_files)
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE([-Wno-portability])
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE([-Wno-portability])
@@
-81,12
+79,13
@@
echo
AC_PROG_MAKE_SET
AC_PROG_INSTALL
AC_PROG_MAKE_SET
AC_PROG_INSTALL
+AC_LOCAL_INSTALL
dnl
dnl libtool macro check for CC, LD, NM, LN_S, RANLIB, STRIP + pour les librairies dynamiques !
echo
echo ---------------------------------------------
dnl
dnl libtool macro check for CC, LD, NM, LN_S, RANLIB, STRIP + pour les librairies dynamiques !
echo
echo ---------------------------------------------
-echo Coniguring production
+echo Con
f
iguring production
echo ---------------------------------------------
echo
AC_ENABLE_DEBUG(yes)
echo ---------------------------------------------
echo
AC_ENABLE_DEBUG(yes)
@@
-107,7
+106,7
@@
dnl Fix up the INSTALL macro if it s a relative path. We want the
dnl full-path to the binary instead.
case "$INSTALL" in
*install-sh*)
dnl full-path to the binary instead.
case "$INSTALL" in
*install-sh*)
- INSTALL='\${ROOT_BUILDDIR}'/
salome_adm
/unix/config_files/install-sh
+ INSTALL='\${ROOT_BUILDDIR}'/
adm_local
/unix/config_files/install-sh
;;
esac
;;
esac
@@
-166,7
+165,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 ---------------------------------------------
@@
-348,6
+355,13
@@
echo
CHECK_HTML_GENERATORS
CHECK_HTML_GENERATORS
+echo
+echo ---------------------------------------------
+echo testing sphinx
+echo ---------------------------------------------
+echo
+CHECK_SPHINX
+
echo
echo ---------------------------------------------
echo Testing Kernel
echo
echo ---------------------------------------------
echo Testing Kernel
@@
-383,11
+397,11
@@
echo
echo Configure
if test "${gui_ok}" = "yes"; then
echo Configure
if test "${gui_ok}" = "yes"; then
- variables="cc_ok fortran_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok qwt_ok Kernel_ok Geom_ok Med_ok gui_ok"
+ variables="cc_ok fortran_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok
sphinx_ok
qwt_ok Kernel_ok Geom_ok Med_ok gui_ok"
elif test "${SalomeGUI_need}" != "no"; then
elif test "${SalomeGUI_need}" != "no"; then
- variables="cc_ok fortran_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok Geom_ok Med_ok gui_ok"
+ variables="cc_ok fortran_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok
sphinx_ok
Kernel_ok Geom_ok Med_ok gui_ok"
else
else
- variables="cc_ok fortran_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok Geom_ok Med_ok"
+ variables="cc_ok fortran_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok
sphinx_ok
Kernel_ok Geom_ok Med_ok"
fi
for var in $variables
fi
for var in $variables
@@
-428,12
+442,24
@@
echo
# chmod +x ./bin/salome/*; \
#])
# chmod +x ./bin/salome/*; \
#])
+AC_CONFIG_COMMANDS([hack_libtool],[
+sed -i "s%^CC=\"\(.*\)\"%hack_libtool (){ \n\
+ if test \"\$(echo \$[@] | grep -E '\\\-L/usr/lib(/../lib)?(64)? ')\" == \"\" \n\
+ then\n\
+ cmd=\"\1 \$[@]\"\n\
+ else\n\
+ cmd=\"\1 \"\`echo \$[@] | sed -r -e 's|(.*)-L/usr/lib(/../lib)?(64)? (.*)|\\\1\\\4 -L/usr/lib\\\3|g'\`\n\
+ fi\n\
+ \$cmd\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 could be helpfull to update de configuration.
AC_OUTPUT([ \
# 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 could be helpfull to update de configuration.
AC_OUTPUT([ \
- salome_adm/unix/SALOMEconfig.h \
adm_local/Makefile \
adm_local/cmake_files/Makefile \
adm_local/unix/Makefile \
adm_local/Makefile \
adm_local/cmake_files/Makefile \
adm_local/unix/Makefile \
@@
-442,13
+468,16
@@
AC_OUTPUT([ \
bin/Makefile \
SMESH_version.h \
doc/Makefile \
bin/Makefile \
SMESH_version.h \
doc/Makefile \
+ doc/docutils/Makefile \
doc/salome/Makefile \
doc/salome/gui/Makefile \
doc/salome/gui/SMESH/Makefile \
doc/salome/gui/SMESH/doxyfile \
doc/salome/gui/SMESH/doxyfile_py \
doc/salome/Makefile \
doc/salome/gui/Makefile \
doc/salome/gui/SMESH/Makefile \
doc/salome/gui/SMESH/doxyfile \
doc/salome/gui/SMESH/doxyfile_py \
+ doc/salome/gui/SMESH/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 \
src/Makefile \
src/Controls/Makefile \
src/Driver/Makefile \
src/Makefile \
src/Controls/Makefile \
src/Driver/Makefile \
@@
-458,6
+487,7
@@
AC_OUTPUT([ \
src/DriverUNV/Makefile \
src/MEFISTO2/Makefile \
src/OBJECT/Makefile \
src/DriverUNV/Makefile \
src/MEFISTO2/Makefile \
src/OBJECT/Makefile \
+ src/PluginUtils/Makefile \
src/SMDS/Makefile \
src/SMESH/Makefile \
src/SMESHClient/Makefile \
src/SMDS/Makefile \
src/SMESH/Makefile \
src/SMESHClient/Makefile \
@@
-470,6
+500,7
@@
AC_OUTPUT([ \
src/StdMeshers/Makefile \
src/StdMeshersGUI/Makefile \
src/StdMeshers_I/Makefile \
src/StdMeshers/Makefile \
src/StdMeshersGUI/Makefile \
src/StdMeshers_I/Makefile \
+ src/SMESH_PY/Makefile \
resources/Makefile \
resources/SMESHCatalog.xml \
idl/Makefile \
resources/Makefile \
resources/SMESHCatalog.xml \
idl/Makefile \