PR: merge from branch OCC_debug_for_3_2_0b1 tag mergeto_BR_PR_V320b1_11avr06

diff --git a/configure.ac b/configure.ac
index 7b99185b048d060b5199ae3156dfd7b853898cb1..476e903dd367850f696b8c81f571526292b5b2ac 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -379,7 +379,7 @@ function check_fatal_error {
 if test x$corba_gen = xtrue; then
   basic_mandatory_products="cc_ok threads_ok python_ok swig_ok hdf5_ok occ_ok"
 else
-  basic_mandatory_products="cc_ok threads_ok python_ok hdf5_ok occ_ok"
+  basic_mandatory_products="cc_ok threads_ok hdf5_ok occ_ok"
 fi
 
 echo --- General mandatory products - Light configuration:
@@ -394,6 +394,13 @@ if test x$corba_gen = xtrue; then
   check_fatal_error $corba_mandatory_products
 else
   echo --- CORBA products not required - option --disable-corba-gen
+  if test x"$WITH_BATCH" = xyes; then
+    echo --- BATCH mode mandatory products - default configuration:
+    summary "python_ok"
+    check_fatal_error "python_ok"
+  else 
+    echo --- Python not required - option --enable-batch=no
+  fi
 fi
 echo
 

diff --git a/idl/SALOME_TestModuleCatalog.idl b/idl/SALOME_TestModuleCatalog.idl
index b497fdb113bca550c35675584d8aed527523e417..a607060ac9e0bb4837046db485a7bf9a0c0dfafe 100644 (file)
--- a/idl/SALOME_TestModuleCatalog.idl
+++ b/idl/SALOME_TestModuleCatalog.idl
@@ -27,7 +27,7 @@
 
 #include "SALOME_Component.idl"
 
-module CatalogTest {
+module SALOME_TestModuleCatalog {
 
   interface Adder ;
 

diff --git a/salome_adm/unix/config_files/check_opengl.m4 b/salome_adm/unix/config_files/check_opengl.m4
index 0552a4bb5fa5fa180af84ffd3eb67ff1643bfc10..8a56e0f54841b65eaedaf5ad1de9f2657ed7cdcf 100644 (file)
--- a/salome_adm/unix/config_files/check_opengl.m4
+++ b/salome_adm/unix/config_files/check_opengl.m4
@@ -38,6 +38,9 @@ AC_CHECKING(for OpenGL headers)
 OGL_INCLUDES=""
 OGL_LIBS=""
 
+GL_LIB_PATH=""
+GLU_LIB_PATH=""
+
 OpenGL_ok=no
 OpenGL_libs_ok=no
 OpenGL_headers_ok=no
@@ -105,9 +108,9 @@ if test "x${OpenGL_headers_ok}" = "xyes" ; then
     if test -r "${idir}/libGL.so"; then
       AC_MSG_RESULT(in ${idir})
       if test "x${idir}" = "x/usr/lib${LIB_LOCATION_SUFFIX}" ; then
-        OGL_LIBS=""
+        GL_LIB_PATH=""
       else
-        OGL_LIBS="-L${idir}"
+        GL_LIB_PATH="-L${idir}"
       fi
       break
     fi
@@ -115,15 +118,15 @@ if test "x${OpenGL_headers_ok}" = "xyes" ; then
     if test -r "${idir}/libGL.sl"; then
       AC_MSG_RESULT(in ${idir})
       if test "x${idir}" = "x/usr/lib${LIB_LOCATION_SUFFIX}" ; then
-        OGL_LIBS=""
+        GL_LIB_PATH=""
       else
-        OGL_LIBS="-L${idir}"
+        GL_LIB_PATH="-L${idir}"
       fi
       break
     fi
   done
-  LDFLAGS_old="$LDFLAGS"
-  LDFLAGS="$LDFLAGS $OGL_LIBS"
+  LDFLAGS_old="${LDFLAGS}"
+  LDFLAGS="${LDFLAGS} ${GL_LIB_PATH}"
   AC_CHECK_LIB([GL],
                [glBegin],
                [OpenGL_libs_ok=yes],
@@ -131,7 +134,7 @@ if test "x${OpenGL_headers_ok}" = "xyes" ; then
   if test "x${OpenGL_libs_ok}" = "xyes" ; then
     AC_TRY_LINK([],
                 [],
-                [OpenGL_libs_ok=yes ; OGL_LIBS="$OGL_LIBS -lGL"],
+                [OpenGL_libs_ok=yes ; OGL_LIBS="${OGL_LIBS} ${GL_LIB_PATH} -lGL"],
                 [OpenGL_libs_ok=no])
   fi
   LDFLAGS="$LDFLAGS_old"
@@ -142,9 +145,9 @@ if test "x${OpenGL_libs_ok}" = "xyes" ; then
     if test -r "${idir}/libGLU.so"; then
       AC_MSG_RESULT(in ${idir})
       if test "x${idir}" = "x/usr/lib${LIB_LOCATION_SUFFIX}" ; then
-        OGL_LIBS=""
+        GLU_LIB_PATH=""
       else
-        OGL_LIBS="-L${idir}"
+        GLU_LIB_PATH="-L${idir}"
       fi
       break
     fi
@@ -152,15 +155,15 @@ if test "x${OpenGL_libs_ok}" = "xyes" ; then
     if test -r "${idir}/libGLU.sl"; then
       AC_MSG_RESULT(in ${idir})
       if test "x${idir}" = "x/usr/lib${LIB_LOCATION_SUFFIX}" ; then
-        OGL_LIBS=""
+        GLU_LIB_PATH=""
       else
-        OGL_LIBS="-L${idir}"
+        GLU_LIB_PATH="-L${idir}"
       fi
       break
     fi
   done
-  LDFLAGS_old="$LDFLAGS"
-  LDFLAGS="$LDFLAGS $OGL_LIBS"
+  LDFLAGS_old="${LDFLAGS}"
+  LDFLAGS="${LDFLAGS} ${OGL_LIBS} ${GLU_LIB_PATH}"
   AC_CHECK_LIB([GLU],
                [gluBeginSurface],
                [OpenGL_libs_ok=yes],
@@ -168,7 +171,7 @@ if test "x${OpenGL_libs_ok}" = "xyes" ; then
   if test "x${OpenGL_libs_ok}" = "xyes" ; then
     AC_TRY_LINK([],
                 [],
-                [OpenGL_libs_ok=yes ; OGL_LIBS="$OGL_LIBS -lGLU"],
+                [OpenGL_libs_ok=yes ; OGL_LIBS="${OGL_LIBS} ${GLU_LIB_PATH} -lGLU"],
                 [OpenGL_libs_ok=no])
   fi
   LDFLAGS="$LDFLAGS_old"