Corrections from Paul RASCLE to work on DEBIAN.

diff --git a/build_configure b/build_configure
index 41d838aa368ec834b5c22887167e12aea7f75bf7..eb80d899d6bf848927bde2b264182bb6991b1ed4 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -119,23 +119,38 @@ echo "AC_OUTPUT([ \\" >> configure.in_tmp1
 # These files MUST be on top of AC_OUTPUT list so we
 # put them "manually"
 #
-
+# Attention, l'ordre d'entrée des fichiers doit être choisi avec
+# précision
+#
 echo " ./salome_adm/unix/SALOMEconfig.h \\" >> configure.in_tmp1
 echo " ./salome_adm/unix/F77config.h \\" >> configure.in_tmp1
 echo " ./salome_adm/unix/sstream \\" >> configure.in_tmp1
+
 echo " ./salome_adm/unix/depend \\" >> configure.in_tmp1
 echo " ./adm_local/unix/make_omniorb \\" >> configure.in_tmp1
 echo " ./salome_adm/unix/envScript \\" >> configure.in_tmp1
-echo " ./adm_local/unix/make_commence \\" >> configure.in_tmp1
-echo " ./salome_adm/unix/make_conclude \\" >> configure.in_tmp1
 echo " ./salome_adm/unix/make_module \\" >> configure.in_tmp1
 
+# _CS_gbo Pour assurer ls construction correct de la chaîne de
+# dépendance, il apparaît nécessaire de surcharger le make_conclude
+# (resp. make_commence) pardéfaut, c'est à dire le make_conclude de
+# salome_adm, par le make_conclude (resp. make_commence) du module,
+# c'est à dire le make_conclude (resp. make_commence) du répertoire
+# adm_local
+echo " ./adm_local/unix/make_commence \\" >> configure.in_tmp1
+echo " ./adm_local/unix/make_conclude \\" >> configure.in_tmp1
+
 \rm -f configure.in_tmp2 configure.in_tmp3
 touch configure.in_tmp2
+
 find_in . configure.in_tmp2
-sed '/^.salome_adm/d' configure.in_tmp2 >  configure.in_tmp3
-sed '/configure.in/d' configure.in_tmp3 >  configure.in_tmp2
-sed 's/.in / /' configure.in_tmp2 >> configure.in_tmp1
+
+# _CS_gbo_100204 Mise à jour du filtre pour prise en compte des
+# restrictions imposées par les versions récente de autoconf.
+    sed -e '/^ \.\/salome_adm/d' \
+       -e '/configure.in/d'      \
+       -e '/^  \.\/adm_local/d'  \
+       -e 's/.in / /' configure.in_tmp2 >> configure.in_tmp1
 
 echo  "])" >> configure.in_tmp1
 

diff --git a/configure.in.base b/configure.in.base
index e743049da6de446e549948130039d620f1b0ba85..84a25237b42e5365f2b59603f87db4e21fbbb321 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -335,7 +335,7 @@ do
   case "$local_bin" in
         *.in | *~)                    ;;
         ./bin/CVS | ./bin/salome)                    ;;
-        *) /usr/bin/install -C $i .; echo $local_bin ;;
+        *) /usr/bin/install -c $i .; echo $local_bin ;;
   esac
 done
 cd $ROOT_BUILDDIR

diff --git a/src/DataStreamComponent/Makefile.in b/src/DataStreamComponent/Makefile.in
index 447bfb9ab28ce0786fa25bbce0e9ec328a1b4029..3ceb993fd104d1663328c1d9d0acfe3fe58be633 100644 (file)
--- a/src/DataStreamComponent/Makefile.in
+++ b/src/DataStreamComponent/Makefile.in
@@ -52,8 +52,9 @@ BIN_SERVER_IDL =
 
 CPPFLAGS+= $(PYTHON_INCLUDES) \
        -I${KERNEL_ROOT_DIR}/include/salome
-LDFLAGS+= -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSalomeLoggerServer \
-       -L${KERNEL_ROOT_DIR}/lib/salome
+LDFLAGS+= -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace
+
+LDFLAGSFORBIN+= -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace
 
 @CONCLUDE@