Fix compilation problems

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index f93a0a4bba7d71e02801ea61ac8f176d2e633a5a..95af6a6502ad9720124e2d1b42f1234925dc54ab 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -152,7 +152,7 @@ OMNIORB_CXXFLAGS    = @OMNIORB_CXXFLAGS@
 
 OMNIORB_IDL         = @OMNIORB_IDL@
 OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@
-OMNIORB_IDLPYFLAGS  = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/salome/idl -I$(KERNEL_ROOT_DIR)/idl/salome
+OMNIORB_IDLPYFLAGS  = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl -I$(KERNEL_ROOT_DIR)/idl/salome
 
 OMNIORB_IDL_CLN_H   = @OMNIORB_IDL_CLN_H@
 OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@
@@ -169,7 +169,7 @@ CORBA_INCLUDES    = @CORBA_INCLUDES@
 CORBA_LIBS        = @CORBA_LIBS@
 CORBA_CXXFLAGS    = @CORBA_CXXFLAGS@
 
-IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome 
+IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl
 IDLPYFLAGS  = @IDLPYFLAGS@
 
 IDL = @IDL@
@@ -182,12 +182,12 @@ IDL_SRV_H   = @IDL_SRV_H@
 IDL_SRV_CXX = @IDL_SRV_CXX@
 IDL_SRV_OBJ = @IDL_SRV_OBJ@
 
-  CPPFLAGS+= $(CORBA_INCLUDES) 
-  CXXFLAGS+= $(CORBA_CXXFLAGS)
+CPPFLAGS+= $(CORBA_INCLUDES) 
+CXXFLAGS+= $(CORBA_CXXFLAGS)
 
-  # add corba libs when link salome application ! 
-  #LDFLAGS+= $(CORBA_LIBS)
-  LIBS+=$(CORBA_LIBS)
+# add corba libs when link salome application ! 
+#LDFLAGS+= $(CORBA_LIBS)
+LIBS+=$(CORBA_LIBS)
 
 DOXYGEN = @DOXYGEN@
 DOXYGEN_WITH_PYTHON = @DOXYGEN_WITH_PYTHON@
@@ -298,7 +298,7 @@ ACLOCAL_SRC = \
 check_corba.m4                  ac_cxx_depend_flag.m4           check_hdf5.m4     \
 enable_pthreads.m4             ac_cxx_namespaces.m4            check_omniorb.m4  \
 pyembed.m4                     python.m4                       check_cas.m4      \
-check_swig.m4                  check_qt.m4 
+check_swig.m4
 
 ACLOCAL_SRC_DEPR = \
 ac_cxx_bool.m4                  ac_cxx_mutable.m4      ac_cxx_partial_specialization.m4 \
@@ -306,12 +306,13 @@ check_mico.m4                   libtool.m4                ac_cxx_typename.m4
 check_pthreads.m4               ac_cc_warnings.m4
 
 ACLOCAL_GUI = \
-check_vtk.m4                     check_opengl.m4       \
+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/%) \
-                         $(ACLOCAL_SRC_DEPR:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/DEPRECATED/%) \
+                          $(ACLOCAL_SRC_DEPR:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/DEPRECATED/%) \
                           $(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 @KERNEL_ROOT_DIR@/salome_adm/unix/config_files/DEPRECATED \
-                                                                  -I @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 @KERNEL_ROOT_DIR@/salome_adm/unix/config_files/DEPRECATED \
+                                   -I @GUI_ROOT_DIR@/adm_local/unix/config_files

diff --git a/configure.in.base b/configure.in.base
index a516d94ffda12cdf725eb4bc99142a96432acc62..8d333f00d1fa40a22ba7641140cea4406c688e14 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -88,7 +88,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*)
-      INSTALL='\${KERNEL_ROOT_DIR}'/salome_adm/unix/config_files/install-sh
+      INSTALL='\${KERNEL_ROOT_DIR}'/salome_adm/unix/config_files/DEPRECATED/install-sh
       ;;
 esac