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
PAL12037. Add protection against None shapes and empty geom groups
[modules/smesh.git]
/
configure.in.base
diff --git
a/configure.in.base
b/configure.in.base
index 9c6efd0ec911de71a346adf94e85ec4d420024ce..2e65ed14023864016eec5b7cdcd08ac5e5184e26 100644
(file)
--- a/
configure.in.base
+++ b/
configure.in.base
@@
-113,6
+113,14
@@
dnl
AC_CXX_HAVE_SSTREAM
AC_CXX_HAVE_SSTREAM
+echo
+echo ---------------------------------------------
+echo BOOST Library
+echo ---------------------------------------------
+echo
+
+CHECK_BOOST
+
dnl
dnl ---------------------------------------------
dnl testing MPICH
dnl
dnl ---------------------------------------------
dnl testing MPICH
@@
-140,13
+148,13
@@
echo
CHECK_PYTHON
CHECK_PYTHON
-echo
-echo ---------------------------------------------
-echo testing java
-echo ---------------------------------------------
-echo
+
dnl
echo
+
dnl
echo ---------------------------------------------
+
dnl
echo testing java
+
dnl
echo ---------------------------------------------
+
dnl
echo
-CHECK_JAVA
+
dnl
CHECK_JAVA
echo
echo ---------------------------------------------
echo
echo ---------------------------------------------
@@
-172,13
+180,13
@@
echo
CHECK_OMNIORB
CHECK_OMNIORB
-echo
-echo ---------------------------------------------
-echo testing mico
-echo ---------------------------------------------
-echo
+
dnl
echo
+
dnl
echo ---------------------------------------------
+
dnl
echo testing mico
+
dnl
echo ---------------------------------------------
+
dnl
echo
-CHECK_MICO
+
dnl
CHECK_MICO
echo
echo ---------------------------------------------
echo
echo ---------------------------------------------
@@
-191,7
+199,7
@@
CHECK_CORBA
AC_SUBST_FILE(CORBA)
corba=make_$ORB
AC_SUBST_FILE(CORBA)
corba=make_$ORB
-CORBA=
salome_adm
/unix/$corba
+CORBA=
adm_local
/unix/$corba
echo
echo ---------------------------------------------
echo
echo ---------------------------------------------
@@
-227,19
+235,19
@@
CHECK_HDF5
echo
echo ---------------------------------------------
echo
echo ---------------------------------------------
-echo
testing MED2
+echo
Testing OpenCascade
echo ---------------------------------------------
echo
echo ---------------------------------------------
echo
-CHECK_
MED2
+CHECK_
CAS
echo
echo ---------------------------------------------
echo
echo ---------------------------------------------
-echo Testing
OpenCascade
+echo Testing
html generators
echo ---------------------------------------------
echo
echo ---------------------------------------------
echo
-CHECK_
CA
S
+CHECK_
HTML_GENERATOR
S
echo
echo ---------------------------------------------
echo
echo ---------------------------------------------
@@
-257,6
+265,14
@@
echo
CHECK_GEOM
CHECK_GEOM
+echo
+echo ---------------------------------------------
+echo Testing Med
+echo ---------------------------------------------
+echo
+
+CHECK_MED
+
echo
echo ---------------------------------------------
echo Summary
echo
echo ---------------------------------------------
echo Summary
@@
-264,7
+280,7
@@
echo ---------------------------------------------
echo
echo Configure
echo
echo Configure
-variables="cc_ok
lex_yacc_ok python_ok java_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok med2_ok omniORB_ok mico_ok occ_ok Kernel_ok Geom_O
k"
+variables="cc_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 Kernel_ok Geom_ok Med_o
k"
for var in $variables
do
for var in $variables
do
@@
-278,8
+294,8
@@
echo
dnl generals files which could be included in every makefile
dnl generals files which could be included in every makefile
-AC_SUBST_FILE(COMMENCE) COMMENCE=
salome_adm
/unix/make_commence
-AC_SUBST_FILE(CONCLUDE) CONCLUDE=
salome_adm
/unix/make_conclude
+AC_SUBST_FILE(COMMENCE) COMMENCE=
adm_local
/unix/make_commence
+AC_SUBST_FILE(CONCLUDE) CONCLUDE=
adm_local
/unix/make_conclude
AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/make_module
dnl les dependences
AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/make_module
dnl les dependences
@@
-294,7
+310,7
@@
else
fi
# make other build directories
fi
# make other build directories
-for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources
share/salome/doc
idl
+for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources idl
do
# if test ! -d $rep ; then
# eval mkdir $rep
do
# if test ! -d $rep ; then
# eval mkdir $rep
@@
-327,14
+343,15
@@
dnl copy shells and utilities contained in the bin directory
dnl excluding .in files (treated in AC-OUTPUT below) and CVS
dnl directory
dnl excluding .in files (treated in AC-OUTPUT below) and CVS
dnl directory
-cd bin
+mkdir -p bin/salome
+cd bin/salome
for i in $ROOT_SRCDIR/bin/*
do
local_bin=`echo $i | sed -e "s,$ROOT_SRCDIR,.,"`
case "$local_bin" in
*.in | *~) ;;
for i in $ROOT_SRCDIR/bin/*
do
local_bin=`echo $i | sed -e "s,$ROOT_SRCDIR,.,"`
case "$local_bin" in
*.in | *~) ;;
- ./bin/CVS) ;;
- *)
ln -fs $i
; echo $local_bin ;;
+ ./bin/CVS
| ./bin/salome
) ;;
+ *)
/usr/bin/install $i .
; echo $local_bin ;;
esac
done
cd $ROOT_BUILDDIR
esac
done
cd $ROOT_BUILDDIR