dnl but configure --with-kernel=DIR is being called
if test "x${old_with_kernel}" != "x${MED_WITH_KERNEL}"; then
- if test "x${old_with_kernel}" == "xno" ; then
+ if test "x${old_with_kernel}" = "xno" ; then
if test ! -d "${KERNEL_ROOT_DIR}"; then
echo "failed : KERNEL_ROOT_DIR variable is not correct !"
exit
fi
kernel_check_in_aclocal=`grep KERNEL_ROOT_DIR ${ROOT_SRCDIR}/aclocal.m4`
- if test "x${kernel_check_in_aclocal}" == "x"; then
+ if test "x${kernel_check_in_aclocal}" = "x"; then
echo "Configuration changed: without KERNEL -> with KERNEL"
echo -n "Updating 'configure' script ... "
cd $ROOT_SRCDIR
WITHOUT_KERNEL_CONFIG_DIR=${ROOT_SRCDIR}/adm_local_without_kernel/unix/config_files
AUX_CONFIG_DIR=""
-if test "${MED_WITH_KERNEL}" == "yes"; then
+if test "${MED_WITH_KERNEL}" = "yes"; then
AUX_CONFIG_DIR=${KERNEL_ROOT_DIR}/salome_adm/unix/config_files
else
AUX_CONFIG_DIR=${WITHOUT_KERNEL_CONFIG_DIR}
dnl correctly.
export AR
+echo
+echo ---------------------------------------------
+echo Testing GUI
+echo ---------------------------------------------
+echo
+
+CHECK_SALOME_GUI
+
+echo
+echo ---------------------------------------------
+echo Testing full GUI
+echo ---------------------------------------------
+echo
+
+CHECK_CORBA_IN_GUI
+if test "x${CORBA_IN_GUI}" != "xyes"; then
+ echo "failed : For configure MED module necessary full GUI !"
+ exit
+fi
+
echo
echo ---------------------------------------------
echo testing make
dnl full-path to the binary instead.
case "$INSTALL" in
*install-sh*)
- INSTALL="\${AUX_CONFIG_DIR}/install-sh -c"
- ;;
+ case $host_os in
+ osf*)
+ INSTALL="${AUX_CONFIG_DIR}/install-sh -c"
+ ;;
+ *)
+ INSTALL="\${AUX_CONFIG_DIR}/install-sh -c"
+ ;;
+ esac
esac
echo
dnl Library libdl :
AC_CHECK_LIB(dl,dlopen)
-dnl add library libm :
-AC_CHECK_LIB(m,ceil)
-
dnl Library librt : for alpha/osf
AC_CHECK_LIB(rt,nanosleep)
+dnl add library libm :
+AC_CHECK_LIB(m,ceil)
+
dnl
dnl Check if we use std iostream by default or if we must add
dnl a compiler directive for that
echo
echo ---------------------------------------------
-echo testing LEX \& YACC
+echo testing threads
echo ---------------------------------------------
echo
-lex_yacc_ok=no
-AC_PROG_YACC
-AC_PROG_LEX
-lex_yacc_ok=yes
+ENABLE_PTHREADS
+
+dnl
+dnl ---------------------------------------------
+dnl testing WITHIHM
+dnl ---------------------------------------------
+dnl
+
+CHECK_WITHIHM
echo
echo ---------------------------------------------
-echo testing python
+echo BOOST Library
echo ---------------------------------------------
echo
-CHECK_PYTHON
+CHECK_BOOST
+
+dnl
+dnl ---------------------------------------------
+dnl testing sockets
+dnl ---------------------------------------------
+dnl
+
+CHECK_SOCKETS
+
+dnl
+dnl ---------------------------------------------
+dnl testing OpenPBS
+dnl ---------------------------------------------
+dnl
echo
echo ---------------------------------------------
-echo testing swig
+echo testing OpenPBS
echo ---------------------------------------------
echo
-CHECK_SWIG
+openpbs_ok=no
+CHECK_OPENPBS
+dnl openpbs_ok is set to yes by CHECK_OPENPBS
+
+dnl
+dnl ---------------------------------------------
+dnl testing LSF
+dnl ---------------------------------------------
+dnl
echo
echo ---------------------------------------------
-echo testing threads
+echo testing LSF
echo ---------------------------------------------
echo
-ENABLE_PTHREADS
+lsf_ok=no
+CHECK_LSF
+dnl lsf_ok is set to yes by CHECK_LSF
+
+dnl
+dnl ---------------------------------------------
+dnl testing Batch
+dnl ---------------------------------------------
+dnl
+
+WITH_BATCH=no
+test x$openpbs_ok = xyes || test x$lsf_ok = xyes && WITH_BATCH=yes
+AC_SUBST(WITH_BATCH)
+
+if test "X$WITHIHM" = "Xyes"; then
+ echo
+ echo ---------------------------------------------
+ echo testing LEX \& YACC
+ echo ---------------------------------------------
+ echo
+
+ lex_yacc_ok=no
+ AC_PROG_YACC
+ AC_PROG_LEX
+ lex_yacc_ok=yes
+fi
-dnl BOOST is needed for MED Wrapper
echo
echo ---------------------------------------------
-echo BOOST Library
+echo testing python
echo ---------------------------------------------
echo
-CHECK_BOOST
+CHECK_PYTHON
+
+echo
+echo ---------------------------------------------
+echo testing swig
+echo ---------------------------------------------
+echo
+
+CHECK_SWIG
echo
echo ---------------------------------------------
CHECK_MED2
+echo "MED_WITH_KERNEL ${MED_WITH_KERNEL}"
-if test "${MED_WITH_KERNEL}" == "yes"; then
+if test "${MED_WITH_KERNEL}" = "yes"; then
{
-#CPPFLAGS="$CPPFLAGS -DMED_WITH_KERNEL"
-dnl echo
-dnl echo ---------------------------------------------
-dnl echo testing java
-dnl echo ---------------------------------------------
-dnl echo
+ dnl echo
+ dnl echo ---------------------------------------------
+ dnl echo testing java
+ dnl echo ---------------------------------------------
+ dnl echo
-dnl CHECK_JAVA
+ dnl CHECK_JAVA
-dnl
-dnl ---------------------------------------------
-dnl testing MPICH
-dnl ---------------------------------------------
-dnl
+ dnl
+ dnl ---------------------------------------------
+ dnl testing MPI
+ dnl ---------------------------------------------
+ dnl
-CHECK_MPI
-CHECK_MPICH
+ CHECK_MPI
+ CHECK_MPICH
-dnl
-dnl ---------------------------------------------
-dnl testing WITHIHM
-dnl ---------------------------------------------
-dnl
+ echo
+ echo ---------------------------------------------
+ echo testing omniORB
+ echo ---------------------------------------------
+ echo
-CHECK_WITHIHM
+ CHECK_OMNIORB
-echo
-echo ---------------------------------------------
-echo testing omniORB
-echo ---------------------------------------------
-echo
+ echo
+ echo ---------------------------------------------
+ echo default ORB : omniORB
+ echo ---------------------------------------------
+ echo
-CHECK_OMNIORB
+ DEFAULT_ORB=omniORB
+ CHECK_CORBA
-echo
-echo ---------------------------------------------
-echo default ORB : omniORB
-echo ---------------------------------------------
-echo
+ AC_SUBST_FILE(CORBA)
+ corba=make_$ORB
+ CORBA=adm_local/unix/$corba
-DEFAULT_ORB=omniORB
-CHECK_CORBA
-AC_SUBST_FILE(CORBA)
-corba=make_$ORB
-CORBA=adm_local/unix/$corba
+ echo
+ echo ---------------------------------------------
+ echo testing openGL
+ echo ---------------------------------------------
+ echo
-echo
-echo ---------------------------------------------
-echo testing openGL
-echo ---------------------------------------------
-echo
+ CHECK_OPENGL
-CHECK_OPENGL
+ echo
+ echo ---------------------------------------------
+ echo testing QT
+ echo ---------------------------------------------
+ echo
-echo
-echo ---------------------------------------------
-echo testing QT
-echo ---------------------------------------------
-echo
+ CHECK_QT
-CHECK_QT
+ if test "X$WITHIHM" = "Xyes"; then
+ echo
+ echo ---------------------------------------------
+ echo testing VTK
+ echo ---------------------------------------------
+ echo
-echo
-echo ---------------------------------------------
-echo testing VTK
-echo ---------------------------------------------
-echo
+ CHECK_VTK
+ fi
-CHECK_VTK
+ echo
+ echo ---------------------------------------------
+ echo Testing OpenCascade
+ echo ---------------------------------------------
+ echo
-echo
-echo ---------------------------------------------
-echo Testing OpenCascade
-echo ---------------------------------------------
-echo
+ CHECK_CAS
-CHECK_CAS
+ echo
+ echo ---------------------------------------------
+ echo Testing Kernel
+ echo ---------------------------------------------
+ echo
-echo
-echo ---------------------------------------------
-echo Testing Kernel
-echo ---------------------------------------------
-echo
+ CHECK_KERNEL
-CHECK_KERNEL
+ dnl echo
+ dnl echo ---------------------------------------------
+ dnl echo testing mico
+ dnl echo ---------------------------------------------
+ dnl echo
-dnl echo
-dnl echo ---------------------------------------------
-dnl echo testing mico
-dnl echo ---------------------------------------------
-dnl echo
+ dnl CHECK_MICO
-dnl CHECK_MICO
+ echo
+ echo ---------------------------------------------
+ echo testing MSG2QM
+ echo ---------------------------------------------
+ echo
-echo
-echo ---------------------------------------------
-echo testing MSG2QM
-echo ---------------------------------------------
-echo
+ CHECK_MSG2QM
+
+ echo
+ echo ---------------------------------------------
+ echo Testing html generators
+ echo ---------------------------------------------
+ echo
-CHECK_MSG2QM
+ CHECK_HTML_GENERATORS
}
else
{
- WITHIHM=""
- AC_SUBST(WITHIHM)
- CPPFLAGS="$CPPFLAGS -DMED_WITHOUT_KERNEL"
+ WITHIHM=""
+ AC_SUBST(WITHIHM)
+ CPPFLAGS="$CPPFLAGS -DMED_WITHOUT_KERNEL"
}
fi # MED_WITH_KERNEL
echo ---------------------------------------------
echo
-if test "$MED_WITH_KERNEL" == "no"; then
+if test "$MED_WITH_KERNEL" = "no"; then
echo "Configure (without Kernel)"
else
echo Configure
fi
-variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok hdf5_ok med2_ok boost_ok doxygen_ok graphviz_ok OpenGL_ok qt_ok vtk_ok omniORB_ok occ_ok Kernel_ok"
+#variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok hdf5_ok med2_ok boost_ok doxygen_ok graphviz_ok OpenGL_ok qt_ok vtk_ok omniORB_ok occ_ok Kernel_ok"
+
+if test "X$WITHIHM" = "Xyes"; then
+variables="cc_ok lex_yacc_ok mpi_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok med2_ok omniORB_ok occ_ok sip_ok pyqt_ok qwt_ok Kernel_ok"
+fi
+if test "X$WITHIHM" = "Xno"; then
+variables="cc_ok mpi_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok hdf5_ok med2_ok omniORB_ok occ_ok Kernel_ok"
+fi
+
+for var in $variables
+do
+ eval toto=\$$var
+ if test x$toto != "x"; then
+ printf " %10s : " `echo \$var | sed -e "s,_ok,,"`
+ eval echo \$$var
+ fi
+done
+echo "---Optional:"
+variables="cppunit_ok openpbs_ok lsf_ok doxygen_ok graphviz_ok"
+
for var in $variables
do
- printf " %10s : " `echo \$var | sed -e "s,_ok,,"`
- eval echo \$$var
+ eval toto=\$$var
+ if test x$toto != "x"; then
+ printf " %10s : " `echo \$var | sed -e "s,_ok,,"`
+ eval echo \$$var
+ fi
done
echo