From: prascle <prascle>
Date: Thu, 15 Jan 2004 08:13:20 +0000 (+0000)
Subject: PR: mergefrom_DEBUG_V1_3_15Jan04
X-Git-Tag: V1_4_0~18
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ffd1b922ef238c38427a4bd722ea72e9a1c695e3;p=modules%2Fkernel.git

PR: mergefrom_DEBUG_V1_3_15Jan04
---

diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in
index 1e8ae14d7..7b070ace2 100644
--- 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 09d4e426c..e0d320185 100644
--- 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 d66f84e6e..feecb0dde 100644
--- 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 07b70adfe..50737af05 100644
--- 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 !