Fix bug 10964: improve configure/make procedure for PYCALCULATOR - remove unnecessary...

diff --git a/adm_local/unix/config_files/check_Med.m4 b/adm_local/unix/config_files/check_Med.m4
new file mode 100644 (file)
index 0000000..727bf43
--- /dev/null
+++ b/adm_local/unix/config_files/check_Med.m4
@@ -0,0 +1,45 @@
+# Check availability of Med binary distribution
+#
+# Author : Nicolas REJNERI (OPEN CASCADE, 2003)
+#
+
+AC_DEFUN([CHECK_MED],[
+
+AC_CHECKING(for Med)
+
+Med_ok=no
+
+AC_ARG_WITH(med,
+           [  --with-med=DIR root directory path of MED installation ],
+           MED_DIR="$withval",MED_DIR="")
+
+if test "x$MED_DIR" == "x" ; then
+
+# no --with-med-dir option used
+
+   if test "x$MED_ROOT_DIR" != "x" ; then
+
+    # MED_ROOT_DIR environment variable defined
+      MED_DIR=$MED_ROOT_DIR
+
+   fi
+# 
+fi
+
+if test -f ${MED_DIR}/idl/salome/MED.idl ; then
+   Med_ok=yes
+   AC_MSG_RESULT(Using Med module distribution in ${MED_DIR})
+
+   if test "x$MED_ROOT_DIR" == "x" ; then
+      MED_ROOT_DIR=${MED_DIR}
+   fi
+   AC_SUBST(MED_ROOT_DIR)
+
+else
+   AC_MSG_WARN("Cannot find Med module sources")
+fi
+  
+AC_MSG_RESULT(for Med: $Med_ok)
+ 
+])dnl
+ 

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index 76a43c0402f8968f56828de349eec98ef9eade17..262171089ba2762ae26892c414557891d788d82a 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -50,68 +50,11 @@ PYTHON_VERSION = @PYTHON_VERSION@
 PYTHON_SITE = @PYTHON_SITE@
 PYTHON_SITE_INSTALL = @PYTHON_SITE_INSTALL@
 
-# QT
-
-QT_ROOT = @QT_ROOT@
-QT_INCLUDES = @QT_INCLUDES@
-QT_MT_INCLUDES = @QT_INCLUDES@ -DQT_THREAD_SUPPORT
-QT_LIBS = @QT_LIBS@
-QT_MT_LIBS = @QT_MT_LIBS@
-
-MOC = @MOC@
-UIC = @UIC@
-
-
-#QWT
-
-QWT_INCLUDES=@QWT_INCLUDES@
-QWT_LIBS=@QWT_LIBS@
-
-# SIP
-SIP = @SIP@
-SIP_INCLUDES = @SIP_INCLUDES@
-SIP_LIBS = @SIP_LIBS@
-
-# PYQT
-PYQT_SIPS = @PYQT_SIPS@
-PYQT_LIBS = @PYQT_LIBS@
-
-# openGL
-OGL_INCLUDES=@OGL_INCLUDES@
-OGL_LIBS=@OGL_LIBS@
-
-# VTK
-VTK_INCLUDES=@VTK_INCLUDES@
-VTK_LIBS=@VTK_LIBS@
-
-# HDF5
-
-HDF5_INCLUDES=@HDF5_INCLUDES@
-HDF5_LIBS=@HDF5_LIBS@
-HDF5_MT_LIBS=@HDF5_MT_LIBS@
-
-# OpenCasCade
-
-OCC_INCLUDES=@CAS_CPPFLAGS@
-OCC_CXXFLAGS=@CAS_CXXFLAGS@
-
-OCC_KERNEL_LIBS=@CAS_KERNEL@
-OCC_OCAF_LIBS=@CAS_OCAF@
-OCC_VIEWER_LIBS=@CAS_VIEWER@
-OCC_MODELER_LIBS=@CAS_MODELER@
-OCC_DATAEXCHANGE_LIBS=@CAS_DATAEXCHANGE@
-OCC_LIBS=@CAS_LDFLAGS@
-
 # MPICH
 
 MPICH_INCLUDES=@MPICH_INCLUDES@
 MPICH_LIBS=@MPICH_LIBS@
 
-# Swig C++ Python
-
-SWIG       = @SWIG@
-SWIG_FLAGS = @SWIG_FLAGS@ -I$(inc_builddir) -I$(srcdir) -I.
-
 # OMNIORB
 
 OMNIORB_ROOT        = @OMNIORB_ROOT@
@@ -230,13 +173,14 @@ $(top_srcdir)/configure.in: $(top_srcdir)/configure.in.base
 
 
 ACLOCAL_SRC = \
-ac_cxx_bool.m4                    check_corba.m4     check_vtk.m4      \
-ac_cxx_depend_flag.m4             check_hdf5.m4      enable_pthreads.m4        \
-ac_cxx_mutable.m4                 check_mico.m4      libtool.m4                \
-ac_cxx_namespaces.m4              check_omniorb.m4   pyembed.m4                \
-ac_cxx_partial_specialization.m4  check_opengl.m4    python.m4         \
-ac_cxx_typename.m4                check_pthreads.m4  check_cas.m4      \
-ac_cc_warnings.m4                 check_qt.m4        check_swig.m4 
+ac_cxx_bool.m4                         check_corba.m4          \
+ac_cxx_depend_flag.m4                  enable_pthreads.m4      \
+ac_cxx_mutable.m4                      check_mico.m4           \
+libtool.m4                             ac_cxx_namespaces.m4    \
+check_omniorb.m4                       pyembed.m4              \
+ac_cxx_partial_specialization.m4       ac_cxx_typename.m4      \
+check_pthreads.m4                      ac_cc_warnings.m4       \
+python.m4
 
 $(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%)
        cd $(top_srcdir) ; aclocal --acdir=adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files

diff --git a/configure.in.base b/configure.in.base
index 4029925297ad4995410fc1d5e5bb535819cac6c4..7e30fff18ed8b926f240f38be5a46573e36ca23d 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -148,14 +148,6 @@ dnl echo
 
 dnl CHECK_JAVA
 
-echo
-echo ---------------------------------------------
-echo testing swig
-echo ---------------------------------------------
-echo
-
-CHECK_SWIG
-
 echo
 echo ---------------------------------------------
 echo testing threads
@@ -193,69 +185,23 @@ AC_SUBST_FILE(CORBA)
 corba=make_$ORB
 CORBA=adm_local/unix/$corba
 
-echo
-echo ---------------------------------------------
-echo testing openGL
-echo ---------------------------------------------
-echo
-
-CHECK_OPENGL
-
-echo
-echo ---------------------------------------------
-echo testing QT
-echo ---------------------------------------------
-echo
-
-CHECK_QT
-
-echo
-echo ---------------------------------------------
-echo testing VTK
-echo ---------------------------------------------
-echo
-
-CHECK_VTK
-
-echo
-echo ---------------------------------------------
-echo testing HDF5
-echo ---------------------------------------------
-echo
-
-CHECK_HDF5
-
-#echo
-#echo ---------------------------------------------
-#echo testing MED2 - or MED module?
-#echo ---------------------------------------------
-#echo
-#
-#CHECK_MED2
-#
-echo
-echo ---------------------------------------------
-echo Testing OpenCascade
-echo ---------------------------------------------
-echo
-
-CHECK_CAS
+CHECK_HTML_GENERATORS
 
 echo
 echo ---------------------------------------------
-echo Testing html generators
+echo Testing Kernel
 echo ---------------------------------------------
 echo
 
-CHECK_HTML_GENERATORS
+CHECK_KERNEL
 
 echo
 echo ---------------------------------------------
-echo Testing Kernel
+echo testing MED module
 echo ---------------------------------------------
 echo
 
-CHECK_KERNEL
+CHECK_MED
 
 echo
 echo ---------------------------------------------
@@ -264,7 +210,7 @@ echo ---------------------------------------------
 echo
 
 echo Configure
-variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok med2_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok"
+variables="cc_ok lex_yacc_ok python_ok threads_ok omniORB_ok doxygen_ok graphviz_ok Kernel_ok Med_ok"
 
 for var in $variables
 do

diff --git a/doc/salome/Makefile.in b/doc/salome/Makefile.in
index d7bae518f52d0a8f5819c9cdbac73dd984f248ae..c1bec59a389a0aa739a5c8d7ed0bd07b3c0cfde1 100644 (file)
--- a/doc/salome/Makefile.in
+++ b/doc/salome/Makefile.in
@@ -33,12 +33,13 @@ distclean: clean
 
 install:
        $(MAKE) docs
-       (cd tui && $(MAKE) install);
-       (cd gui && $(MAKE) install);
-       cp -f SUPERV_index.html $(docdir)
+       @@SETX@; for d in $(SUBDIRS); do        \
+          (cd $$d && $(MAKE) $@) || exit 1;    \
+       done; \
+       cp -f PYCALCULATOR_index.html $(docdir)
 
 uninstall:
        @@SETX@; for d in $(SUBDIRS); do        \
           (cd $$d && $(MAKE) $@) || exit 1;    \
        done; \
-       rm -fr $(docdir)/SUPERV_index.html
+       rm -fr $(docdir)/PYCALCULATOR_index.html