Merge from V6_3_BR 15/07/2011

diff --git a/Makefile.am b/Makefile.am
index 28447e093555c689d2cc7f3f9508ba7190a62b51..983d3dba873220360293a3c200cbded701bf562e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,11 +24,12 @@
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-ACLOCAL_AMFLAGS = -I $(top_srcdir)/adm_local/unix/config_files                 \
+ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \
                   -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
                   -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \
-                  -I ${HOMARD_SRC}/adm_local/unix/config_files
-
+                 -I ${MED_ROOT_DIR}/adm_local/unix/config_files \
+                 -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files
+                               
 SUBDIRS = idl adm_local resources src doc tests
 
 DIST_SUBDIRS = idl adm_local resources src doc tests

diff --git a/configure.ac b/configure.ac
index 87dde32549204603b5f9a7e789c5fda956748180..9515a1f7530773a48e93a567e51677a98459d899 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Modified by : Alexander BORODIN (OCN) - autotools usage
 # Created from configure.in.base
 #
-AC_INIT([Salome2 Project HOMARD module], [6.3.0], [webmaster.salome@opencascade.com], [SalomeHOMARD])
+AC_INIT([Salome2 Project HOMARD module], [6.3.1], [webmaster.salome@opencascade.com], [SalomeHOMARD])
 AC_CONFIG_AUX_DIR(salome_adm/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET