PR: patches for 3_2_0b1 automake kernel et divers

diff --git a/Makefile.in b/Makefile.in
index 228277ba594b02df83d2e72877e89dcb8b7598ff..ce8059641de3569b4434e080014cc26b00865f0c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -25,7 +25,7 @@ eficasternovice.png \
 moins.png   \
 plus.png     \
 select1.png \
-
+SalomeApp.xml
 
 BIN_SCRIPT= \
 VERSION

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index fd01839bacb4ad80a1133de565035f23fff5132c..20cf62aa914943e04e7aeb1eebc9785525e51899 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -14,8 +14,6 @@ LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker -L$
 # add libstdc++ to link c++ library with libtool !
 LDFLAGS+= -lstdc++
 
-CP=@CP@
-
 # CPP
 
 CPP=@CPP@
@@ -30,15 +28,9 @@ C_DEPEND_FLAG = @C_DEPEND_FLAG@
 
 # C++
 
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@ 
-CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@
-
-# JAVA
-
-JAVA_INCLUDES = @JAVA_INCLUDES@
-JAVA_LIBS = @JAVA_LIBS@
-JAVA_LDPATH = @JAVA_LDPATH@
+#CXX = @CXX@
+#CXXFLAGS = @CXXFLAGS@ 
+#CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@
 
 # PYTHON
 
@@ -64,11 +56,6 @@ UIC = @UIC@
 # msg2qm
 MSG2QM = @MSG2QM@
 
-#QWT
-
-QWT_INCLUDES=@QWT_INCLUDES@
-QWT_LIBS=@QWT_LIBS@
-
 # SIP
 SIP = @SIP@
 SIP_INCLUDES = @SIP_INCLUDES@
@@ -86,18 +73,6 @@ OGL_LIBS=@OGL_LIBS@
 VTK_INCLUDES=@VTK_INCLUDES@
 VTK_LIBS=@VTK_LIBS@
 
-# HDF5
-
-HDF5_INCLUDES=@HDF5_INCLUDES@
-HDF5_LIBS=@HDF5_LIBS@
-HDF5_MT_LIBS=@HDF5_MT_LIBS@
-
-# MED2
-
-MED2_INCLUDES=@MED2_INCLUDES@
-MED2_LIBS=@MED2_LIBS@
-MED2_MT_LIBS=@MED2_MT_LIBS@
-
 # OpenCasCade
 
 OCC_INCLUDES=@CAS_CPPFLAGS@
@@ -110,11 +85,6 @@ 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@
@@ -236,15 +206,22 @@ $(top_srcdir)/configure: $(top_srcdir)/configure.in $(top_srcdir)/aclocal.m4
 $(top_srcdir)/configure.in: $(top_srcdir)/configure.in.base
        cd $(top_srcdir) && ./build_configure
 
-
 ACLOCAL_SRC = \
-ac_cxx_bool.m4                    check_corba.m4     check_vtk.m4      \
+ac_cxx_bool.m4                    check_corba.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_partial_specialization.m4  python.m4                             \
 ac_cxx_typename.m4                check_pthreads.m4  check_cas.m4      \
-ac_cc_warnings.m4                 check_qt.m4        check_swig.m4 
+ac_cc_warnings.m4                 check_boost.m4     check_swig.m4             
+
+
+ACLOCAL_GUI = \
+check_vtk.m4                     check_opengl.m4    check_qt.m4        \
+check_GUI.m4                     check_corba_in_GUI.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
+$(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \
+                          $(ACLOCAL_GUI:%=@GUI_ROOT_DIR@/adm_local/unix/config_files/%) 
+       cd $(top_srcdir) ; aclocal -I adm_local/unix/config_files \
+                                   -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files \
+                                  -I @GUI_ROOT_DIR@/adm_local/unix/config_files 

diff --git a/build_configure b/build_configure
index e95b0ad12cf7572b8e30faaf9f773d71193a3bbc..884dc60e1638685e1085b0bb657452ff553874ac 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -20,6 +20,11 @@ if test ! -d "${KERNEL_ROOT_DIR}"; then
     exit
 fi
 
+if test ! -d "${GUI_ROOT_DIR}"; then
+    echo "failed : GUI_ROOT_DIR variable is not correct !"
+    exit
+fi
+
 # Test if the KERNEL_SRC is set correctly
 
 #if test ! -d "${KERNEL_SRC}"; then
@@ -203,7 +208,10 @@ else
        echo -n "Creating 'configure' script ...  "
 fi
 
-aclocal --acdir=adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files
+aclocal -I adm_local/unix/config_files \
+        -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
+        -I ${GUI_ROOT_DIR}/adm_local/unix/config_files
+
 if autoconf
 then
        echo "done"

diff --git a/configure.in.base b/configure.in.base
index fbe274f8faca92838dff2e2c7a9d763e075006e6..b145014addaf14036fe94eb6c2629c7c30f4d49c 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -86,52 +86,6 @@ case "$INSTALL" in
       ;;
 esac
 
-echo
-echo ---------------------------------------------
-echo testing C/C++
-echo ---------------------------------------------
-echo
-
-cc_ok=no
-dnl inutil car libtool
-dnl AC_PROG_CC
-AC_PROG_CXX
-AC_DEPEND_FLAG
-# AC_CC_WARNINGS([ansi])
-cc_ok=yes
-
-dnl Library libdl :
-AC_CHECK_LIB(dl,dlopen)
-
-dnl add library libm :
-AC_CHECK_LIB(m,ceil)
-
-dnl 
-dnl Well we use sstream which is not in gcc pre-2.95.3
-dnl We must test if it exists. If not, add it in include !
-dnl
-
-AC_CXX_HAVE_SSTREAM
-
-dnl
-dnl ---------------------------------------------
-dnl testing MPICH
-dnl ---------------------------------------------
-dnl
-
-CHECK_MPICH
-
-echo
-echo ---------------------------------------------
-echo testing LEX \& YACC
-echo ---------------------------------------------
-echo
-
-lex_yacc_ok=no
-AC_PROG_YACC
-AC_PROG_LEX
-lex_yacc_ok=yes
-
 echo
 echo ---------------------------------------------
 echo testing python
@@ -140,30 +94,6 @@ echo
 
 CHECK_PYTHON
 
-dnl echo
-dnl echo ---------------------------------------------
-dnl echo testing java
-dnl echo ---------------------------------------------
-dnl echo
-
-dnl CHECK_JAVA
-
-echo
-echo ---------------------------------------------
-echo testing swig
-echo ---------------------------------------------
-echo
-
-CHECK_SWIG
-
-echo
-echo ---------------------------------------------
-echo testing threads
-echo ---------------------------------------------
-echo
-
-ENABLE_PTHREADS
-
 echo
 echo ---------------------------------------------
 echo testing omniORB
@@ -172,14 +102,6 @@ echo
 
 CHECK_OMNIORB
 
-dnl echo
-dnl echo ---------------------------------------------
-dnl echo testing mico
-dnl echo ---------------------------------------------
-dnl echo
-
-dnl CHECK_MICO
-
 echo
 echo ---------------------------------------------
 echo default ORB : omniORB
@@ -193,61 +115,6 @@ 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
-echo ---------------------------------------------
-echo
-
-CHECK_MED2
-
-echo
-echo ---------------------------------------------
-echo Testing OpenCascade
-echo ---------------------------------------------
-echo
-
-CHECK_CAS
-
-echo
-echo ---------------------------------------------
-echo Testing sip
-echo ---------------------------------------------
-echo
-
-CHECK_SIP
 
 echo
 echo ---------------------------------------------
@@ -259,19 +126,19 @@ CHECK_PYQT
 
 echo
 echo ---------------------------------------------
-echo Testing html generators
+echo Testing Kernel
 echo ---------------------------------------------
 echo
 
-CHECK_HTML_GENERATORS
+CHECK_KERNEL
 
 echo
 echo ---------------------------------------------
-echo Testing Kernel
+echo Testing GUI
 echo ---------------------------------------------
 echo
 
-CHECK_KERNEL
+CHECK_SALOME_GUI
 
 echo
 echo ---------------------------------------------
@@ -283,20 +150,19 @@ CHECK_MSG2QM
 
 echo
 echo ---------------------------------------------
-echo Testing Visu
+echo Testing Pal
 echo ---------------------------------------------
 echo
 
-CHECK_VISU
+CHECK_PAL
 
 echo
 echo ---------------------------------------------
-echo Testing Pal
+echo Testing Visu
 echo ---------------------------------------------
 echo
 
-CHECK_PAL
-
+CHECK_VISU
 echo
 echo ---------------------------------------------
 echo Summary
@@ -304,7 +170,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 omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok msg2qm_ok"
+variables="python_ok threads_ok OpenGL_ok qt_ok omniORB_ok Kernel_ok  SalomeGUI_ok msg2qm_ok"
 
 for var in $variables
 do

diff --git a/src/EFICASGUI/Makefile.in b/src/EFICASGUI/Makefile.in
index cd89a890c4e47a2266309ee79255889e1aede178..079fe3c2e01e72d52ad10f406a43fd6137366ef8 100644 (file)
--- a/src/EFICASGUI/Makefile.in
+++ b/src/EFICASGUI/Makefile.in
@@ -40,12 +40,5 @@ eficasSalome.py \
 EXPORT_PYSCRIPTS+=eficas_etude.py
 
 
-# additionnal information to compil and link file
-
-CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(SIP_INCLUDES)
-CPPFLAGS += -I$(top_builddir)/SALOME/src/SALOME_PYQT
-CXXFLAGS += 
-
-LDFLAGS += $(PYTHON_LIBS) $(PYQT_LIBS) -lSalomeGUI 
 
 @CONCLUDE@