*** empty log message ***

diff --git a/INSTALL b/INSTALL
index 6334efe6a2bbd7a21a428b0f0f10ff7b8b0d1d44..a92c42b5ae2369d2395175e6da7d2e78e0dae2e2 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
-This is the version 1.4.0 of KERNEL
+This is the version 2.0.0 of KERNEL
 
 Previous versions :
        - 1.3.0

diff --git a/Makefile.in b/Makefile.in
index 39376435017b61461ea8d6abdcc7d0c0cbdbce06..5ec410ee3b9d79316433d906844a5827464a4389 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,12 +9,12 @@
 top_srcdir=@top_srcdir@
 top_builddir=.
 srcdir=@srcdir@
-VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl
+VPATH=.:@srcdir@:@top_srcdir@/bin:./bin/salome:@top_srcdir@/resources:./bin:@top_srcdir@/idl
 
 
 @COMMENCE@
 
-SUBDIRS = idl src examples salome_adm
+SUBDIRS = idl src examples doc salome_adm
 
 RESOURCES_FILES = \
 back.xpm \
@@ -91,8 +91,13 @@ VERSION \
 orbmodule.py \
 runSalome.py \
 killSalome.py \
+killSalomeWithPort.py \
 runSalome \
-runNS.sh
+runSalome.csh \
+runNS.sh \
+launchConfigureParser.py \
+salome.launch \
+showNS.py
 
 # copy header files in common directory
 ifeq ($(HAVE_SSTREAM),yes)
@@ -151,11 +156,7 @@ install-include: $(include_list)
 # install script in $(bindir) :
 install-bin: $(BIN_SCRIPT)
        $(INSTALL) -d  $(bindir)
-       for f in X $(BIN_SCRIPT); do                            \
-          if test $$f != X; then                               \
-            (cp -p ./bin/$$f $(bindir) || exit 1);             \
-          fi;                                                  \
-       done
+       $(INSTALL_PROGRAM) $^ $(bindir)
 
 uninstall: uninstall-idl
 

diff --git a/configure.in.base b/configure.in.base
index 99e1272e1e65a22a8786dcd4dbc4173d5b785c82..b34e79c1573e25085d30e6b0f5b3ea318c179720 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -14,7 +14,7 @@
 #
 # Created from configure.in.base
 #
-AS_SHELL_SANITIZES
+
 AC_INIT(src)
 AC_CONFIG_AUX_DIR(salome_adm/unix/config_files)
 AC_CANONICAL_HOST
@@ -48,10 +48,6 @@ echo Build  root directory : $ROOT_BUILDDIR
 echo
 echo
 
-dnl Modification B. Secher portage sur osf
-AC_CHECK_PROG(SHELL,sh,,)
-AC_SUBST(SHELL)
-
 if test -z "$AR"; then
    AC_CHECK_PROGS(AR,ar xar,:,$PATH)
 fi
@@ -90,7 +86,7 @@ dnl Fix up the INSTALL macro if it s a relative path. We want the
 dnl full-path to the binary instead.
 case "$INSTALL" in
    *install-sh*)
-      INSTALL="${ROOT_SRCDIR}/salome_adm/unix/config_files/install-sh -c"
+      INSTALL='\${top_srcdir}'/salome_adm/unix/config_files/install-sh
       ;;
 esac
 
@@ -104,28 +100,16 @@ cc_ok=no
 dnl inutil car libtool
 dnl AC_PROG_CC
 AC_PROG_CXX
-AC_CXX_WARNINGS
-AC_CXX_TEMPLATE_OPTIONS
 AC_DEPEND_FLAG
-#AC_CC_WARNINGS([ansi])
+# AC_CC_WARNINGS([ansi])
 cc_ok=yes
 
 dnl Library libdl :
 AC_CHECK_LIB(dl,dlopen)
 
-dnl Library librt : for alpha/osf
-AC_CHECK_LIB(rt,nanosleep)
-
 dnl add library libm :
 AC_CHECK_LIB(m,ceil)
 
-dnl 
-dnl Check if we use std iostream by default or if we must add
-dnl a compiler directive for that
-dnl
-
-AC_CXX_USE_STD_IOSTREAM
-
 dnl 
 dnl Well we use sstream which is not in gcc pre-2.95.3
 dnl We must test if it exists. If not, add it in include !
@@ -133,13 +117,13 @@ dnl
 
 AC_CXX_HAVE_SSTREAM
 
-dnl
-dnl ---------------------------------------------
-dnl testing linker
-dnl ---------------------------------------------
-dnl
+echo
+echo ---------------------------------------------
+echo BOOST Library
+echo ---------------------------------------------
+echo
 
-AC_LINKER_OPTIONS
+CHECK_BOOST
 
 dnl
 dnl ---------------------------------------------
@@ -147,7 +131,6 @@ dnl testing MPICH
 dnl ---------------------------------------------
 dnl
 
-CHECK_MPI
 CHECK_MPICH
 
 echo
@@ -309,9 +292,7 @@ echo ---------------------------------------------
 echo
 
 echo Configure
-variables="cc_ok mpi_ok mpich_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok med2_ok omniORB_ok occ_ok sip_ok pyqt_ok qwt_ok doxygen_ok graphviz_ok"
-
-AC_SUBST(pyqt_ok)
+variables="cc_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok med2_ok omniORB_ok occ_ok sip_ok pyqt_ok qwt_ok doxygen_ok graphviz_ok"
  
 for var in $variables
 do
@@ -341,7 +322,7 @@ else
 fi
 
 # make other build directories
-for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources share/salome/doc idl
+for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources idl
 do
 #   if test ! -d $rep ; then
 #      eval mkdir $rep
@@ -374,14 +355,15 @@ dnl copy shells and utilities contained in the bin directory
 dnl excluding .in files (treated in AC-OUTPUT below) and CVS 
 dnl directory
 
-cd $ROOT_BUILDDIR/bin
+mkdir -p bin/salome
+cd bin/salome
 for i in $ROOT_SRCDIR/bin/*
 do
   local_bin=`echo $i | sed -e "s,$ROOT_SRCDIR,.,"`
   case "$local_bin" in
-        *.in | *~)                    ;;
-        ./bin/CVS)                    ;;
-        *) ln -fs $i; echo $local_bin ;;
+        *.in | *~) ;;
+        ./bin/CVS | ./bin/salome)                    ;;
+        *) /usr/bin/install -c $i .; echo $local_bin ;;
   esac
 done
 cd $ROOT_BUILDDIR
@@ -406,7 +388,8 @@ echo ---------------------------------------------
 echo
 
 AC_OUTPUT_COMMANDS([ \
-       chmod +x ./bin/* \
+       chmod +x ./bin/*; \
+       chmod +x ./bin/salome/* \
 ])
 
 ## do not delete this line