From c3ddfcdcff901272fff7947cf6cff0e8e896895e Mon Sep 17 00:00:00 2001 From: smh Date: Fri, 2 Apr 2004 12:41:37 +0000 Subject: [PATCH] SALOME PAL V1_4_1 --- INSTALL | 2 +- Makefile.in | 11 ++++++++--- configure.in.base | 24 +++++++++++++++++------- 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/INSTALL b/INSTALL index 6334efe6a..4ce073992 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1,4 @@ -This is the version 1.4.0 of KERNEL +This is the version 1.4.1 of KERNEL Previous versions : - 1.3.0 diff --git a/Makefile.in b/Makefile.in index 2aeee3a55..5ec410ee3 100644 --- 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) diff --git a/configure.in.base b/configure.in.base index c76d5a728..02da87649 100644 --- a/configure.in.base +++ b/configure.in.base @@ -117,6 +117,14 @@ dnl AC_CXX_HAVE_SSTREAM +echo +echo --------------------------------------------- +echo BOOST Library +echo --------------------------------------------- +echo + +CHECK_BOOST + dnl dnl --------------------------------------------- dnl testing MPICH @@ -284,7 +292,7 @@ echo --------------------------------------------- echo echo Configure -variables="cc_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" +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 @@ -314,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 @@ -347,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 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 @@ -379,7 +388,8 @@ echo --------------------------------------------- echo AC_OUTPUT_COMMANDS([ \ - chmod +x ./bin/* \ + chmod +x ./bin/*; \ + chmod +x ./bin/salome/* \ ]) ## do not delete this line -- 2.39.2