PR: mergefrom_DEBUG_V1_3_15Jan04

diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in
index 1e8ae14d71f4c5c8fa4fbcf89481fe2140a6c47f..7b070ace2ebff14a30700d383e85ec2416d3b30e 100644 (file)
--- a/doc/html/Makefile.in
+++ b/doc/html/Makefile.in
@@ -35,6 +35,7 @@ distclean: clean
        rm -rf INPUT
 
 install:
+       $(INSTALL) -d $(docdir); \
        cp -rf html $(docdir)
 
 uninstall:

diff --git a/salome_adm/unix/config_files/check_pyqt.m4 b/salome_adm/unix/config_files/check_pyqt.m4
index 09d4e426c71f7353d00f17c5851e8295f4ec9d9d..e0d320185963199119d40a40229934e3bad147aa 100644 (file)
--- a/salome_adm/unix/config_files/check_pyqt.m4
+++ b/salome_adm/unix/config_files/check_pyqt.m4
@@ -72,46 +72,39 @@ if test -z $PYUIC; then
    PYUIC="/usr/bin/pyuic"      
 fi
 
-AC_CHECK_FILES("$PYQTDIR/qt.py","$PYQTDIR/qt/qt.py",pyqt_ok=yes,pyqt_ok=no)
+PYQT_ROOT=$PYQTDIR
+PYQT_INCLUDES="-I$PYQT_SIPS"
+PYQT_LIBS="-L$PYQTDIR -lqtcmodule"
+
+AC_CHECK_FILES($PYQTDIR/qt.py $PYQTDIR/qt/qt.py $PYQTDIR/lib/qt.py,pyqt_ok=yes,pyqt_ok=no)
 if test "x$pyqt_ok" = xno ; then
-   AC_MSG_RESULT(no)
-   AC_MSG_WARN(pyqt not found)
+   AC_MSG_WARN(qt.py not found)
 else
    AC_CHECK_FILE("$PYQTDIR/libqtcmodule.so",pyqt_ok=yes,pyqt_ok=no)
-   if test "x$pyqt_ok" = xno ; then
-      AC_MSG_RESULT(no)
-      AC_MSG_WARN(pyqt not found)
-   else
+   if test "x$pyqt_ok" = xyes ; then
       PYQT_ROOT=$PYQTDIR
       PYQT_LIBS="-L$PYQTDIR -lqtcmodule"
    fi
-   AC_CHECK_FILE("$PYQT_SIPS/copying.sip",pyqt_ok=yes,pyqt_ok=no)
    if test "x$pyqt_ok" = xno ; then
-      AC_MSG_RESULT(no)
-      AC_MSG_WARN(pyqt not found)
-   else
-      PYQT_INCLUDES="-I$PYQT_SIPS"
+      AC_CHECK_FILE("$PYQTDIR/lib/libqtcmodule.so",pyqt_ok=yes,pyqt_ok=no)
+      if test "x$pyqt_ok" = xyes ; then
+         PYQT_ROOT=$PYQTDIR
+         PYQT_LIBS="-L$PYQTDIR/lib -lqtcmodule"
+      fi
    fi
 
-   AC_SUBST(PYQT_ROOT)
-   AC_SUBST(PYQT_INCLUDES)
-   AC_SUBST(PYQT_LIBS)
-
-   AC_MSG_RESULT(yes)
+   AC_CHECK_FILE("$PYQT_SIPS/copying.sip",pyqt_ok=$pyqt_ok,pyqt_ok=no)
+   if test "x$pyqt_ok" = xyes ; then
+      PYQT_INCLUDES="-I$PYQT_SIPS"
+   fi
 fi
 
-PYQT_ROOT=$PYQTDIR
-PYQT_INCLUDES="-I$PYQT_SIPS"
-PYQT_LIBS="-L$PYQTDIR -lqtcmodule"
-
 AC_SUBST(PYQT_ROOT)
 AC_SUBST(PYQT_INCLUDES)
 AC_SUBST(PYUIC)
 AC_SUBST(PYQT_SIPS)
 AC_SUBST(PYQT_LIBS)
 
-
-
 AC_MSG_RESULT(for pyqt: $pyqt_ok)
 
 fi

diff --git a/salome_adm/unix/config_files/check_sip.m4 b/salome_adm/unix/config_files/check_sip.m4
index d66f84e6e2813bba7fdbd610e38d00f8020ecced..feecb0dde36a765e526746b4d7181d88e4fb6227 100644 (file)
--- a/salome_adm/unix/config_files/check_sip.m4
+++ b/salome_adm/unix/config_files/check_sip.m4
@@ -44,12 +44,13 @@ else
 
     if test "x$sip_vers" = "xnew"
     then
-       if test -z ${SIPDIR}/include ; then
+       if test -d ${SIPDIR}/include ; then
           sip_ok=yes
           SIP_ROOT="$SIPDIR"
           SIP_INCLUDES="${PYTHON_INCLUDES} -I${SIPDIR}/include"
           SIP_LIBS="-L${SIPDIR}/lib -lsip"
        else
+          sip_ok=yes
           SIP_ROOT="$SIPDIR"
           SIP_INCLUDES="-I${SIPDIR}"
           SIP_LIBS="-L${SIPDIR} -lsip"

diff --git a/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.cxx b/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.cxx
index 07b70adfe0a4cf2c4209e3a135041895c5099fbf..50737af05e9757d8f224dcc4b9c89b75befef29e 100644 (file)
--- a/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.cxx
+++ b/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.cxx
@@ -66,6 +66,7 @@ public :
        ATEXIT_( void )
        {
                ASSERT (Destructeurs==0);
+               MESSAGE("Construction ATEXIT"); // message necessaire pour utiliser logger dans Nettoyage (cf.BUG KERNEL4561)
                Destructeurs = new list<DESTRUCTEUR_GENERIQUE_*> ; // Destructeurs alloué dynamiquement (cf. ci-dessous) ,
                                                                   // il est utilisé puis détruit par la fonction Nettoyage
                int cr = atexit( Nettoyage );                      // exécute Nettoyage lors de exit, après la destruction des données statiques !