Merge remote branch 'origin/master' into YaSp 52/4052/2
Bruno JOFRET [Mon, 16 May 2011 13:19:33 +0000 (15:19 +0200)]
Conflicts:
scilab/configure
scilab/etc/Info.plist
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/includes/version.h
scilab/modules/core/src/c/core.vcproj
scilab/modules/core/src/c/getversion.c
scilab/modules/core/src/c/loadversion.c
scilab/modules/core/src/c/stack2.c
scilab/modules/fileio/fileio.iss
scilab/modules/fileio/src/c/getrelativefilename.c
scilab/modules/fileio/src/c/mgetl.c
scilab/modules/gui/src/c/LibScilab_Import.def
scilab/modules/helptools/sci_gateway/cpp/sci_buildDoc.cpp
scilab/modules/helptools/sci_gateway/cpp/sci_buildDocv2.cpp
scilab/modules/history_browser/Makefile.am
scilab/modules/integer/integer.iss
scilab/modules/output_stream/sci_gateway/c/sci_msprintf.c
scilab/modules/output_stream/src/c/do_xxprintf.c
scilab/modules/parallel/Makefile.am
scilab/modules/parallel/Makefile.in
scilab/modules/string/string.iss
scilab/modules/types/Makefile.am
scilab/modules/types/Makefile.in
scilab/modules/windows_tools/src/c/CScilex/CScilex.rc
scilab/modules/windows_tools/src/c/WScilex/WScilex.rc
scilab/modules/windows_tools/src/c/registry.c

Change-Id: I7ec4eb216b0c505d157d09307a7e22c4f8d9d2e1

308 files changed:
1  2 
scilab/Makefile.in
scilab/Scilab_f2c.sln
scilab/bin/scilab
scilab/configure
scilab/configure.ac
scilab/contrib/Makefile.in
scilab/libs/MALLOC/Makefile.in
scilab/libs/Makefile.in
scilab/libs/doublylinkedlist/Makefile.in
scilab/libs/dynamiclibrary/Makefile.in
scilab/libs/hashtable/Makefile.in
scilab/libs/libst/Makefile.in
scilab/modules/Makefile.in
scilab/modules/abstractSyntaxTree/Makefile.in
scilab/modules/action_binding/Makefile.am
scilab/modules/action_binding/Makefile.in
scilab/modules/action_binding/action_binding.iss
scilab/modules/api_scilab/Makefile.am
scilab/modules/api_scilab/Makefile.in
scilab/modules/api_scilab/api_scilab.vcproj
scilab/modules/arnoldi/Makefile.am
scilab/modules/arnoldi/Makefile.in
scilab/modules/arnoldi/arnoldi.iss
scilab/modules/arnoldi/arnoldi.vcproj
scilab/modules/atoms/Makefile.in
scilab/modules/atoms/atoms.iss
scilab/modules/boolean/Makefile.am
scilab/modules/boolean/Makefile.in
scilab/modules/boolean/boolean.iss
scilab/modules/boolean/src/c/boolean.vcproj
scilab/modules/cacsd/Makefile.am
scilab/modules/cacsd/Makefile.in
scilab/modules/cacsd/cacsd.iss
scilab/modules/cacsd/src/c/cacsd.vcproj
scilab/modules/call_scilab/Makefile.am
scilab/modules/call_scilab/Makefile.in
scilab/modules/call_scilab/call_scilab.iss
scilab/modules/call_scilab/call_scilab.vcproj
scilab/modules/commons/Makefile.in
scilab/modules/commons/src/c/commons.vcproj
scilab/modules/compatibility_functions/Makefile.in
scilab/modules/compatibility_functions/compatibility_functions.iss
scilab/modules/completion/Makefile.am
scilab/modules/completion/Makefile.in
scilab/modules/completion/completion.iss
scilab/modules/completion/src/c/completion.c
scilab/modules/completion/src/c/completion.vcproj
scilab/modules/console/Makefile.am
scilab/modules/console/Makefile.in
scilab/modules/console/console.iss
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/core.iss
scilab/modules/core/includes/getversion.h
scilab/modules/core/includes/machine.h.in
scilab/modules/core/includes/stack-c.h
scilab/modules/core/src/c/core.vcproj
scilab/modules/core/src/c/csignal.c
scilab/modules/core/src/c/getversion.c
scilab/modules/core/src/c/loadversion.c
scilab/modules/core/src/c/stack2.c
scilab/modules/core/src/fortran/core_f.vfproj
scilab/modules/core/src/fortran/inisci.f
scilab/modules/data_structures/Makefile.am
scilab/modules/data_structures/Makefile.in
scilab/modules/data_structures/data_structures.iss
scilab/modules/data_structures/src/c/data_structures.vcproj
scilab/modules/demo_tools/Makefile.in
scilab/modules/demo_tools/demo_tools.iss
scilab/modules/development_tools/Makefile.in
scilab/modules/development_tools/development_tools.iss
scilab/modules/development_tools/macros/test_run.sci
scilab/modules/development_tools/src/fake/Makefile.in
scilab/modules/differential_equations/Makefile.am
scilab/modules/differential_equations/Makefile.in
scilab/modules/differential_equations/differential_equations.iss
scilab/modules/differential_equations/src/c/differential_equations.vcproj
scilab/modules/double/Makefile.am
scilab/modules/double/Makefile.in
scilab/modules/double/double.iss
scilab/modules/double/src/c/double.vcproj
scilab/modules/dynamic_link/Makefile.am
scilab/modules/dynamic_link/Makefile.in
scilab/modules/dynamic_link/dynamic_link.iss
scilab/modules/dynamic_link/src/c/dynamic_link.vcproj
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/elementary_functions.iss
scilab/modules/elementary_functions/src/c/elementary_functions.vcproj
scilab/modules/fftw/Makefile.am
scilab/modules/fftw/Makefile.in
scilab/modules/fftw/fftw.iss
scilab/modules/fftw/fftw.vcproj
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/fileio.iss
scilab/modules/fileio/fileio.vcproj
scilab/modules/fileio/src/c/getrelativefilename.c
scilab/modules/functions/Makefile.am
scilab/modules/functions/Makefile.in
scilab/modules/functions/functions.iss
scilab/modules/functions/src/c/functions.vcproj
scilab/modules/functions_manager/Makefile.in
scilab/modules/genetic_algorithms/Makefile.in
scilab/modules/genetic_algorithms/genetic_algorithms.iss
scilab/modules/graph/Makefile.in
scilab/modules/graphic_export/Makefile.am
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphic_export/graphic_export.iss
scilab/modules/graphic_export/graphic_export.vcproj
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/graphics.iss
scilab/modules/graphics/graphics.vcproj
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/gui.iss
scilab/modules/gui/sci_gateway/c/gw_gui.c
scilab/modules/gui/sci_gateway/cpp/sci_toprint.cpp
scilab/modules/gui/src/c/LibScilab_Import.def
scilab/modules/gui/src/c/gui.vcproj
scilab/modules/hdf5/Makefile.am
scilab/modules/hdf5/Makefile.in
scilab/modules/hdf5/hdf5.iss
scilab/modules/helptools/Makefile.am
scilab/modules/helptools/Makefile.in
scilab/modules/helptools/data/pages/homepage-fr_FR.html
scilab/modules/helptools/etc/SciDocConf.xml.vc
scilab/modules/helptools/helptools.iss
scilab/modules/helptools/sci_gateway/cpp/sci_buildDoc.cpp
scilab/modules/helptools/sci_gateway/cpp/sci_buildDocv2.cpp
scilab/modules/helptools/src/c/helptools.vcproj
scilab/modules/history_browser/Makefile.am
scilab/modules/history_browser/Makefile.in
scilab/modules/history_browser/history_browser.iss
scilab/modules/history_browser/src/c/history_browser.vcproj
scilab/modules/history_manager/Makefile.am
scilab/modules/history_manager/Makefile.in
scilab/modules/history_manager/history_manager.iss
scilab/modules/history_manager/src/c/history_manager.vcproj
scilab/modules/integer/Makefile.am
scilab/modules/integer/Makefile.in
scilab/modules/integer/integer.iss
scilab/modules/integer/src/c/integer.vcproj
scilab/modules/interpolation/Makefile.am
scilab/modules/interpolation/Makefile.in
scilab/modules/interpolation/interpolation.iss
scilab/modules/interpolation/src/c/interpolation.vcproj
scilab/modules/intersci/Makefile.am
scilab/modules/intersci/Makefile.in
scilab/modules/intersci/intersci.iss
scilab/modules/io/Makefile.am
scilab/modules/io/Makefile.in
scilab/modules/io/io.iss
scilab/modules/io/src/c/io.vcproj
scilab/modules/javasci/Makefile.am
scilab/modules/javasci/Makefile.in
scilab/modules/javasci/javasci.iss
scilab/modules/jvm/Makefile.am
scilab/modules/jvm/Makefile.in
scilab/modules/jvm/jvm.iss
scilab/modules/jvm/libjvm.vcproj
scilab/modules/linear_algebra/Makefile.am
scilab/modules/linear_algebra/Makefile.in
scilab/modules/linear_algebra/linear_algebra.iss
scilab/modules/linear_algebra/sci_gateway/c/sci_chol.c
scilab/modules/linear_algebra/sci_gateway/c/sci_inv.c
scilab/modules/linear_algebra/src/c/linear_algebra.vcproj
scilab/modules/localization/Makefile.am
scilab/modules/localization/Makefile.in
scilab/modules/localization/localization.iss
scilab/modules/localization/src/localization.vcproj
scilab/modules/m2sci/Makefile.in
scilab/modules/m2sci/m2sci.iss
scilab/modules/maple2scilab/Makefile.in
scilab/modules/maple2scilab/maple2scilab.iss
scilab/modules/matio/Makefile.am
scilab/modules/matio/Makefile.in
scilab/modules/matio/matio.iss
scilab/modules/matio/matio.vcproj
scilab/modules/mexlib/Makefile.am
scilab/modules/mexlib/Makefile.in
scilab/modules/mexlib/mexlib.iss
scilab/modules/modules_manager/Makefile.in
scilab/modules/modules_manager/modules_manager.iss
scilab/modules/operations/Makefile.in
scilab/modules/optimization/Makefile.am
scilab/modules/optimization/Makefile.in
scilab/modules/optimization/optimization.iss
scilab/modules/optimization/src/c/optimization.vcproj
scilab/modules/output_stream/Makefile.am
scilab/modules/output_stream/Makefile.in
scilab/modules/output_stream/output_stream.iss
scilab/modules/output_stream/src/c/do_xxprintf.c
scilab/modules/overloading/Makefile.in
scilab/modules/overloading/overloading.iss
scilab/modules/parallel/Makefile.am
scilab/modules/parallel/Makefile.in
scilab/modules/parallel/parallel.iss
scilab/modules/parameters/Makefile.am
scilab/modules/parameters/Makefile.in
scilab/modules/parameters/parameters.iss
scilab/modules/parameters/parameters.vcproj
scilab/modules/parse/Makefile.in
scilab/modules/polynomials/Makefile.am
scilab/modules/polynomials/Makefile.in
scilab/modules/polynomials/polynomials.iss
scilab/modules/polynomials/src/c/polynomials.vcproj
scilab/modules/pvm/Makefile.am
scilab/modules/pvm/Makefile.in
scilab/modules/pvm/pvm.iss
scilab/modules/pvm/pvm.vcproj
scilab/modules/randlib/Makefile.am
scilab/modules/randlib/Makefile.in
scilab/modules/randlib/randlib.iss
scilab/modules/randlib/src/c/randlib.vcproj
scilab/modules/renderer/Makefile.am
scilab/modules/renderer/Makefile.in
scilab/modules/renderer/renderer.iss
scilab/modules/renderer/renderer.vcproj
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/Makefile.in
scilab/modules/scicos/scicos.iss
scilab/modules/scicos/src/c/scicos.vcproj
scilab/modules/scicos_blocks/Makefile.am
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scicos_blocks/scicos_blocks.iss
scilab/modules/scicos_blocks/src/c/scicos_blocks.vcproj
scilab/modules/scicos_blocks/src/cpp/affich2.cpp
scilab/modules/scinotes/Makefile.am
scilab/modules/scinotes/Makefile.in
scilab/modules/scinotes/scinotes.iss
scilab/modules/scinotes/src/c/scinotes.vcproj
scilab/modules/shell/Makefile.am
scilab/modules/shell/Makefile.in
scilab/modules/shell/shell.iss
scilab/modules/shell/src/c/GetCommandLine.c
scilab/modules/shell/src/c/shell.vcproj
scilab/modules/signal_processing/Makefile.am
scilab/modules/signal_processing/Makefile.in
scilab/modules/signal_processing/signal_processing.iss
scilab/modules/signal_processing/src/c/signal_processing.vcproj
scilab/modules/simulated_annealing/Makefile.in
scilab/modules/simulated_annealing/simulated_annealing.iss
scilab/modules/sound/Makefile.am
scilab/modules/sound/Makefile.in
scilab/modules/sound/sound.iss
scilab/modules/sound/sound.vcproj
scilab/modules/sparse/Makefile.am
scilab/modules/sparse/Makefile.in
scilab/modules/sparse/sparse.iss
scilab/modules/sparse/src/c/sparse.vcproj
scilab/modules/special_functions/Makefile.am
scilab/modules/special_functions/Makefile.in
scilab/modules/special_functions/special_functions.iss
scilab/modules/special_functions/src/c/special_functions.vcproj
scilab/modules/spreadsheet/Makefile.am
scilab/modules/spreadsheet/Makefile.in
scilab/modules/spreadsheet/spreadsheet.iss
scilab/modules/spreadsheet/spreadsheet.vcproj
scilab/modules/statistics/Makefile.am
scilab/modules/statistics/Makefile.in
scilab/modules/statistics/src/c/statistics.vcproj
scilab/modules/statistics/statistics.iss
scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in
scilab/modules/string/src/c/string.vcproj
scilab/modules/string/string.iss
scilab/modules/symbol/Makefile.in
scilab/modules/symbolic/Makefile.am
scilab/modules/symbolic/Makefile.in
scilab/modules/symbolic/src/c/symbolic.vcproj
scilab/modules/symbolic/symbolic.iss
scilab/modules/system_env/Makefile.in
scilab/modules/tclsci/Makefile.am
scilab/modules/tclsci/Makefile.in
scilab/modules/tclsci/tclsci.iss
scilab/modules/tclsci/tclsci.vcproj
scilab/modules/texmacs/Makefile.in
scilab/modules/texmacs/texmacs.iss
scilab/modules/time/Makefile.am
scilab/modules/time/Makefile.in
scilab/modules/time/time.iss
scilab/modules/time/time.vcproj
scilab/modules/types/Makefile.am
scilab/modules/types/Makefile.in
scilab/modules/types/types.iss
scilab/modules/ui_data/Makefile.am
scilab/modules/ui_data/Makefile.in
scilab/modules/ui_data/src/c/ui_data.vcproj
scilab/modules/umfpack/Makefile.am
scilab/modules/umfpack/Makefile.in
scilab/modules/umfpack/umfpack.iss
scilab/modules/windows_tools/Makefile.am
scilab/modules/windows_tools/Makefile.in
scilab/modules/windows_tools/includes/gw_windows_tools.h
scilab/modules/windows_tools/sci_gateway/c/gw_windows_tools.c
scilab/modules/windows_tools/sci_gateway/c/sci_winqueryreg.c
scilab/modules/windows_tools/src/c/CScilex/CScilex.rc
scilab/modules/windows_tools/src/c/WScilex/WScilex.rc
scilab/modules/windows_tools/src/c/registry.c
scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.vcproj
scilab/modules/windows_tools/src/c/windows_tools.vcproj
scilab/modules/windows_tools/windows_tools.iss
scilab/modules/xcos/Makefile.am
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/src/c/xcos.vcproj
scilab/modules/xcos/xcos.iss

Simple merge
Simple merge
Simple merge
  done
  
  
+ # Provided by signal.h
+ for ac_func in strsignal
+ do :
+   ac_fn_c_check_func "$LINENO" "strsignal" "ac_cv_func_strsignal"
 -if test "x$ac_cv_func_strsignal" = xyes; then :
++if test "x$ac_cv_func_strsignal" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRSIGNAL 1
+ _ACEOF
+ fi
+ done
  
  # Check of the libm (lib math). Macro provided by libtool.
  save_LDFLAGS="$LDFLAGS"
@@@ -24086,7 -23817,7 +24099,7 @@@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
  $as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
  cat > conftest.$ac_ext <<EOF
- #line 24089 "configure"
 -#line 23820 "configure"
++#line 24102 "configure"
  #include "confdefs.h"
  
  #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@@ -24396,7 -24127,7 +24409,7 @@@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CH
  $as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
  
  cat > conftest.$ac_ext <<EOF
- #line 24399 "configure"
 -#line 24130 "configure"
++#line 24412 "configure"
  #include "confdefs.h"
  
  #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@@ -24977,7 -24708,7 +24990,7 @@@ $as_echo_n "checking saxon... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 24980 "configure"
 -// #line 24711 "configure"
++// #line 24993 "configure"
  import com.icl.saxon.Loader;
  
  public class conftest {
@@@ -25084,7 -24815,7 +25097,7 @@@ $as_echo_n "checking jlatexmath-fop... 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 25087 "configure"
 -// #line 24818 "configure"
++// #line 25100 "configure"
  import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
  
  public class conftest {
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 31394 "configure"
 -#line 31125 "configure"
++#line 31407 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 31500 "configure"
 -#line 31231 "configure"
++#line 31513 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 348e890,0000000..7415484
mode 100644,000000..100644
--- /dev/null
@@@ -1,996 -1,0 +1,996 @@@
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
 +# @configure_input@
 +
 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
 +# with or without modifications, as long as this notice is preserved.
 +
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 +# PARTICULAR PURPOSE.
 +
 +@SET_MAKE@
 +
 +
 +VPATH = @srcdir@
 +pkgdatadir = $(datadir)/@PACKAGE@
 +pkgincludedir = $(includedir)/@PACKAGE@
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
 +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 +install_sh_DATA = $(install_sh) -c -m 644
 +install_sh_PROGRAM = $(install_sh) -c
 +install_sh_SCRIPT = $(install_sh) -c
 +INSTALL_HEADER = $(INSTALL_DATA)
 +transform = $(program_transform_name)
 +NORMAL_INSTALL = :
 +PRE_INSTALL = :
 +POST_INSTALL = :
 +NORMAL_UNINSTALL = :
 +PRE_UNINSTALL = :
 +POST_UNINSTALL = :
 +build_triplet = @build@
 +host_triplet = @host@
 +check_PROGRAMS = testConstExp$(EXEEXT) testVarExp$(EXEEXT) \
 +      testControlExp$(EXEEXT)
 +TESTS = testConstExp$(EXEEXT) testVarExp$(EXEEXT) \
 +      testControlExp$(EXEEXT)
 +subdir = modules/abstractSyntaxTree
 +DIST_COMMON = $(libsciabstractSyntaxTree_la_include_HEADERS) \
 +      $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
-       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
-       $(top_srcdir)/m4/intel_compiler.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
++      $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
++      $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
++      $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
 +      $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
 +      $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
 +      $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
 +      $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
 +      $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 +      $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 +      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 +      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 +      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 +      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 +      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +      $(ACLOCAL_M4)
 +mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 +CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
 +CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
 +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 +am__vpath_adj = case $$p in \
 +    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
 +    *) f=$$p;; \
 +  esac;
 +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
 +am__install_max = 40
 +am__nobase_strip_setup = \
 +  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
 +am__nobase_strip = \
 +  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
 +am__nobase_list = $(am__nobase_strip_setup); \
 +  for p in $$list; do echo "$$p $$p"; done | \
 +  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
 +  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
 +    if (++n[$$2] == $(am__install_max)) \
 +      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
 +    END { for (dir in files) print dir, files[dir] }'
 +am__base_list = \
 +  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
 +  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 +am__installdirs = "$(DESTDIR)$(pkglibdir)" \
 +      "$(DESTDIR)$(libsciabstractSyntaxTree_la_includedir)"
 +LTLIBRARIES = $(pkglib_LTLIBRARIES)
 +libsciabstractSyntaxTree_la_LIBADD =
 +am_libsciabstractSyntaxTree_la_OBJECTS =  \
 +      libsciabstractSyntaxTree_la-libAst.lo \
 +      libsciabstractSyntaxTree_la-visitor_common.lo \
 +      libsciabstractSyntaxTree_la-printvisitor.lo \
 +      libsciabstractSyntaxTree_la-debugvisitor.lo \
 +      libsciabstractSyntaxTree_la-mutevisitor.lo \
 +      libsciabstractSyntaxTree_la-shortcutvisitor.lo \
 +      libsciabstractSyntaxTree_la-scilabexception.lo
 +libsciabstractSyntaxTree_la_OBJECTS =  \
 +      $(am_libsciabstractSyntaxTree_la_OBJECTS)
 +libsciabstractSyntaxTree_la_LINK = $(LIBTOOL) --tag=CXX \
 +      $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
 +      $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) \
 +      $(AM_LDFLAGS) $(LDFLAGS) -o $@
 +am_testConstExp_OBJECTS = testConstExp-testConstExp.$(OBJEXT)
 +testConstExp_OBJECTS = $(am_testConstExp_OBJECTS)
 +testConstExp_DEPENDENCIES = $(check_LDADD)
 +testConstExp_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 +      $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(testConstExp_CXXFLAGS) \
 +      $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 +am_testControlExp_OBJECTS = testControlExp-testControlExp.$(OBJEXT)
 +testControlExp_OBJECTS = $(am_testControlExp_OBJECTS)
 +testControlExp_DEPENDENCIES = $(check_LDADD)
 +testControlExp_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 +      $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
 +      $(testControlExp_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 +      $(LDFLAGS) -o $@
 +am_testVarExp_OBJECTS = testVarExp-testVarExp.$(OBJEXT)
 +testVarExp_OBJECTS = $(am_testVarExp_OBJECTS)
 +testVarExp_DEPENDENCIES = $(check_LDADD)
 +testVarExp_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 +      $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(testVarExp_CXXFLAGS) \
 +      $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 +depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 +am__depfiles_maybe = depfiles
 +am__mv = mv -f
 +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +      $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +      --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +      $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 +CXXLD = $(CXX)
 +CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +      --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 +      $(LDFLAGS) -o $@
 +SOURCES = $(libsciabstractSyntaxTree_la_SOURCES) \
 +      $(testConstExp_SOURCES) $(testControlExp_SOURCES) \
 +      $(testVarExp_SOURCES)
 +DIST_SOURCES = $(libsciabstractSyntaxTree_la_SOURCES) \
 +      $(testConstExp_SOURCES) $(testControlExp_SOURCES) \
 +      $(testVarExp_SOURCES)
 +HEADERS = $(libsciabstractSyntaxTree_la_include_HEADERS)
 +ETAGS = etags
 +CTAGS = ctags
 +am__tty_colors = \
 +red=; grn=; lgn=; blu=; std=
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +ACLOCAL = @ACLOCAL@
 +ALL_LINGUAS = @ALL_LINGUAS@
 +AMTAR = @AMTAR@
 +ANT = @ANT@
 +ANTLR = @ANTLR@
 +AR = @AR@
 +AUTOCONF = @AUTOCONF@
 +AUTOHEADER = @AUTOHEADER@
 +AUTOMAKE = @AUTOMAKE@
 +AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
 +AWK = @AWK@
 +BATIK = @BATIK@
 +BLAS_LIBS = @BLAS_LIBS@
 +BSH = @BSH@
 +CC = @CC@
 +CCDEPMODE = @CCDEPMODE@
 +CFLAGS = @CFLAGS@
 +CHECKSTYLE = @CHECKSTYLE@
 +COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
 +COMMONS_IO = @COMMONS_IO@
 +COMMONS_LOGGING = @COMMONS_LOGGING@
 +CPP = @CPP@
 +CPPFLAGS = @CPPFLAGS@
 +CXX = @CXX@
 +CXXCPP = @CXXCPP@
 +CXXDEPMODE = @CXXDEPMODE@
 +CXXFLAGS = @CXXFLAGS@
 +CYGPATH_W = @CYGPATH_W@
 +DEFS = @DEFS@
 +DEMOTOOLS_ENABLE = @DEMOTOOLS_ENABLE@
 +DEPDIR = @DEPDIR@
 +DOCBOOK_ROOT = @DOCBOOK_ROOT@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
 +ECHO_C = @ECHO_C@
 +ECHO_N = @ECHO_N@
 +ECHO_T = @ECHO_T@
 +EGREP = @EGREP@
 +EXEEXT = @EXEEXT@
 +F77 = @F77@
 +FFLAGS = @FFLAGS@
 +FFTW3_LIB = @FFTW3_LIB@
 +FFTW_ENABLE = @FFTW_ENABLE@
 +FGREP = @FGREP@
 +FLEXDOCK = @FLEXDOCK@
 +FLIBS = @FLIBS@
 +FOP = @FOP@
 +GENHTML = @GENHTML@
 +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 +GIWS_BIN = @GIWS_BIN@
 +GLUEGEN_RT = @GLUEGEN_RT@
 +GMSGFMT = @GMSGFMT@
 +GMSGFMT_015 = @GMSGFMT_015@
 +GRAPHICS_ENABLE = @GRAPHICS_ENABLE@
 +GREP = @GREP@
 +GUI_ENABLE = @GUI_ENABLE@
 +HDF5_CFLAGS = @HDF5_CFLAGS@
 +HDF5_ENABLE = @HDF5_ENABLE@
 +HDF5_LIBS = @HDF5_LIBS@
 +HELP_ENABLE = @HELP_ENABLE@
 +INSTALL = @INSTALL@
 +INSTALL_DATA = @INSTALL_DATA@
 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
 +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 +INTLLIBS = @INTLLIBS@
 +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 +JAR = @JAR@
 +JAVA = @JAVA@
 +JAVAC = @JAVAC@
 +JAVAC_DEBUG = @JAVAC_DEBUG@
 +JAVADOC = @JAVADOC@
 +JAVAH = @JAVAH@
 +JAVASCI_ENABLE = @JAVASCI_ENABLE@
 +JAVA_ENABLE = @JAVA_ENABLE@
 +JAVA_G = @JAVA_G@
 +JAVA_HOME = @JAVA_HOME@
 +JAVA_JNI_INCLUDE = @JAVA_JNI_INCLUDE@
 +JAVA_JNI_LIBS = @JAVA_JNI_LIBS@
 +JDB = @JDB@
 +JEUCLID_CORE = @JEUCLID_CORE@
 +JGRAPHX = @JGRAPHX@
 +JHALL = @JHALL@
 +JHDF5 = @JHDF5@
 +JLATEXMATH = @JLATEXMATH@
 +JLATEXMATH_FOP = @JLATEXMATH_FOP@
 +JOGL = @JOGL@
 +JROSETTA_API = @JROSETTA_API@
 +JROSETTA_ENGINE = @JROSETTA_ENGINE@
 +JUNIT = @JUNIT@
 +LAPACK_LIBS = @LAPACK_LIBS@
 +LCOV = @LCOV@
 +LD = @LD@
 +LDFLAGS = @LDFLAGS@
 +LEX = @LEX@
 +LEXLIB = @LEXLIB@
 +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 +LIBICONV = @LIBICONV@
 +LIBINTL = @LIBINTL@
 +LIBM = @LIBM@
 +LIBOBJS = @LIBOBJS@
 +LIBS = @LIBS@
 +LIBTOOL = @LIBTOOL@
 +LIPO = @LIPO@
 +LN_S = @LN_S@
 +LOOKS = @LOOKS@
 +LTLIBICONV = @LTLIBICONV@
 +LTLIBINTL = @LTLIBINTL@
 +LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAKEINFO = @MAKEINFO@
 +MATIO_CFLAGS = @MATIO_CFLAGS@
 +MATIO_ENABLE = @MATIO_ENABLE@
 +MATIO_LIBS = @MATIO_LIBS@
 +MKDIR_P = @MKDIR_P@
 +MSGCAT = @MSGCAT@
 +MSGFMT = @MSGFMT@
 +MSGFMT_015 = @MSGFMT_015@
 +MSGMERGE = @MSGMERGE@
 +NM = @NM@
 +NMEDIT = @NMEDIT@
 +OBJDUMP = @OBJDUMP@
 +OBJEXT = @OBJEXT@
 +OCAMLC = @OCAMLC@
 +OCAMLDEP = @OCAMLDEP@
 +OCAMLLEX = @OCAMLLEX@
 +OCAMLOPT = @OCAMLOPT@
 +OCAMLYACC = @OCAMLYACC@
 +OPENMP_CFLAGS = @OPENMP_CFLAGS@
 +OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
 +OPENMP_ENABLE = @OPENMP_ENABLE@
 +OPENMP_LIBS = @OPENMP_LIBS@
 +OTOOL = @OTOOL@
 +OTOOL64 = @OTOOL64@
 +PACKAGE = @PACKAGE@
 +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 +PACKAGE_NAME = @PACKAGE_NAME@
 +PACKAGE_STRING = @PACKAGE_STRING@
 +PACKAGE_TARNAME = @PACKAGE_TARNAME@
 +PACKAGE_URL = @PACKAGE_URL@
 +PACKAGE_VERSION = @PACKAGE_VERSION@
 +PATH_SEPARATOR = @PATH_SEPARATOR@
 +PCRE_CFLAGS = @PCRE_CFLAGS@
 +PCRE_CONFIG = @PCRE_CONFIG@
 +PCRE_LIBS = @PCRE_LIBS@
 +PCRE_VERSION = @PCRE_VERSION@
 +PKG_CONFIG = @PKG_CONFIG@
 +POSUB = @POSUB@
 +POW_LIB = @POW_LIB@
 +PVMGETARCH = @PVMGETARCH@
 +PVM_ARCH = @PVM_ARCH@
 +PVM_ENABLE = @PVM_ENABLE@
 +PVM_INCLUDE = @PVM_INCLUDE@
 +PVM_LIB = @PVM_LIB@
 +PYTHON = @PYTHON@
 +QDOX = @QDOX@
 +RANLIB = @RANLIB@
 +RELOCATABLE = @RELOCATABLE@
 +RT_LIB = @RT_LIB@
 +SAXON = @SAXON@
 +SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
 +SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
 +SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
 +SCILAB_VERSION_MAJOR = @SCILAB_VERSION_MAJOR@
 +SCILAB_VERSION_MINOR = @SCILAB_VERSION_MINOR@
 +SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SET_RELOCATABLE = @SET_RELOCATABLE@
 +SHELL = @SHELL@
 +SKINLF = @SKINLF@
 +SPLINT = @SPLINT@
 +STRIP = @STRIP@
 +SWIG_BIN = @SWIG_BIN@
 +SWIG_JAVA = @SWIG_JAVA@
 +SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
 +TCLTK_LIBS = @TCLTK_LIBS@
 +TCL_INC_PATH = @TCL_INC_PATH@
 +TESTNG = @TESTNG@
 +TK_INC_PATH = @TK_INC_PATH@
 +UMFPACK_ENABLE = @UMFPACK_ENABLE@
 +UMFPACK_LIB = @UMFPACK_LIB@
 +USE_NLS = @USE_NLS@
 +VERSION = @VERSION@
 +WITH_OCAML = @WITH_OCAML@
 +WITH_TKSCI = @WITH_TKSCI@
 +XCOS_ENABLE = @XCOS_ENABLE@
 +XGETTEXT = @XGETTEXT@
 +XGETTEXT_015 = @XGETTEXT_015@
 +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 +XMKMF = @XMKMF@
 +XMLGRAPHICS_COMMONS = @XMLGRAPHICS_COMMONS@
 +XML_APIS_EXT = @XML_APIS_EXT@
 +XML_CONFIG = @XML_CONFIG@
 +XML_FLAGS = @XML_FLAGS@
 +XML_LIBS = @XML_LIBS@
 +XML_VERSION = @XML_VERSION@
 +X_CFLAGS = @X_CFLAGS@
 +X_EXTRA_LIBS = @X_EXTRA_LIBS@
 +X_LIBS = @X_LIBS@
 +X_PRE_LIBS = @X_PRE_LIBS@
 +YACC = @YACC@
 +YFLAGS = @YFLAGS@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
 +ac_ct_CC = @ac_ct_CC@
 +ac_ct_CXX = @ac_ct_CXX@
 +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 +ac_ct_F77 = @ac_ct_F77@
 +am__include = @am__include@
 +am__leading_dot = @am__leading_dot@
 +am__quote = @am__quote@
 +am__tar = @am__tar@
 +am__untar = @am__untar@
 +bindir = @bindir@
 +build = @build@
 +build_alias = @build_alias@
 +build_cpu = @build_cpu@
 +build_os = @build_os@
 +build_vendor = @build_vendor@
 +builddir = @builddir@
 +cxx_present = @cxx_present@
 +datadir = @datadir@
 +datarootdir = @datarootdir@
 +docdir = @docdir@
 +dvidir = @dvidir@
 +exec_prefix = @exec_prefix@
 +host = @host@
 +host_alias = @host_alias@
 +host_cpu = @host_cpu@
 +host_os = @host_os@
 +host_vendor = @host_vendor@
 +htmldir = @htmldir@
 +includedir = @includedir@
 +infodir = @infodir@
 +install_sh = @install_sh@
 +libdir = @libdir@
 +libexecdir = @libexecdir@
 +localedir = @localedir@
 +localstatedir = @localstatedir@
 +mandir = @mandir@
 +mkdir_p = @mkdir_p@
 +oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
 +psdir = @psdir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +srcdir = @srcdir@
 +sysconfdir = @sysconfdir@
 +target_alias = @target_alias@
 +top_build_prefix = @top_build_prefix@
 +top_builddir = @top_builddir@
 +top_srcdir = @top_srcdir@
 +yacc_present = @yacc_present@
 +pkglib_LTLIBRARIES = libsciabstractSyntaxTree.la
 +libsciabstractSyntaxTree_la_SOURCES = \
 +                              src/cpp/libAst.cpp \
 +                              src/cpp/visitor_common.cpp \
 +                              src/cpp/printvisitor.cpp \
 +                              src/cpp/debugvisitor.cpp \
 +                              src/cpp/mutevisitor.cpp \
 +                              src/cpp/shortcutvisitor.cpp \
 +                              src/cpp/scilabexception.cpp
 +
 +libsciabstractSyntaxTree_la_CXXFLAGS = \
 +                      -I $(top_srcdir)/modules/symbol/includes \
 +                      -I $(top_srcdir)/modules/types/includes \
 +                      -I $(top_srcdir)/modules/functions_manager/includes \
 +                      -I $(top_srcdir)/modules/elementary_functions/includes \
 +                      -I $(top_srcdir)/modules/operations/includes \
 +                      -I $(top_srcdir)/modules/output_stream/includes \
 +                      -I includes \
 +                      -I src/cpp \
 +                      -I $(top_srcdir)/modules/system_env/includes \
 +                      -I $(top_srcdir)/modules/api_scilab/includes \
 +                      -I $(top_srcdir)/modules/string/includes
 +
 +libsciabstractSyntaxTree_la_includedir = $(pkgincludedir)/abstractSyntaxTree
 +libsciabstractSyntaxTree_la_include_HEADERS = 
 +
 +####################
 +####################
 +check_INCLUDES = -I$(top_srcdir)/modules/symbol/includes \
 +                      -Iincludes/ \
 +                      -Isrc/cpp
 +
 +check_LDADD = $(top_builddir)/modules/symbol/libsciSymbol.la \
 +                      $(top_builddir)/modules/abstractSyntaxTree/libsciabstractSyntaxTree.la \
 +                      $(top_builddir)/modules/types/libsciTypes.la
 +
 +testConstExp_SOURCES = src/cpp/testConstExp.cpp
 +testConstExp_CXXFLAGS = $(check_INCLUDES)
 +testConstExp_LDADD = $(check_LDADD)
 +testVarExp_SOURCES = src/cpp/testVarExp.cpp
 +testVarExp_CXXFLAGS = $(check_INCLUDES)
 +testVarExp_LDADD = $(check_LDADD)
 +testControlExp_SOURCES = src/cpp/testControlExp.cpp
 +testControlExp_CXXFLAGS = $(check_INCLUDES)
 +testControlExp_LDADD = $(check_LDADD)
 +all: all-am
 +
 +.SUFFIXES:
 +.SUFFIXES: .cpp .lo .o .obj
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 +      @for dep in $?; do \
 +        case '$(am__configure_deps)' in \
 +          *$$dep*) \
 +            ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
 +              && { if test -f $@; then exit 0; else break; fi; }; \
 +            exit 1;; \
 +        esac; \
 +      done; \
 +      echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign modules/abstractSyntaxTree/Makefile'; \
 +      $(am__cd) $(top_srcdir) && \
 +        $(AUTOMAKE) --foreign modules/abstractSyntaxTree/Makefile
 +.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +      @case '$?' in \
 +        *config.status*) \
 +          cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 +        *) \
 +          echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 +          cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 +      esac;
 +
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 +      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 +      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 +      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(am__aclocal_m4_deps):
 +install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 +      @$(NORMAL_INSTALL)
 +      test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
 +      @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
 +      list2=; for p in $$list; do \
 +        if test -f $$p; then \
 +          list2="$$list2 $$p"; \
 +        else :; fi; \
 +      done; \
 +      test -z "$$list2" || { \
 +        echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
 +        $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
 +      }
 +
 +uninstall-pkglibLTLIBRARIES:
 +      @$(NORMAL_UNINSTALL)
 +      @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
 +      for p in $$list; do \
 +        $(am__strip_dir) \
 +        echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
 +        $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
 +      done
 +
 +clean-pkglibLTLIBRARIES:
 +      -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
 +      @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
 +        dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
 +        test "$$dir" != "$$p" || dir=.; \
 +        echo "rm -f \"$${dir}/so_locations\""; \
 +        rm -f "$${dir}/so_locations"; \
 +      done
 +libsciabstractSyntaxTree.la: $(libsciabstractSyntaxTree_la_OBJECTS) $(libsciabstractSyntaxTree_la_DEPENDENCIES) 
 +      $(libsciabstractSyntaxTree_la_LINK) -rpath $(pkglibdir) $(libsciabstractSyntaxTree_la_OBJECTS) $(libsciabstractSyntaxTree_la_LIBADD) $(LIBS)
 +
 +clean-checkPROGRAMS:
 +      @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
 +      echo " rm -f" $$list; \
 +      rm -f $$list || exit $$?; \
 +      test -n "$(EXEEXT)" || exit 0; \
 +      list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 +      echo " rm -f" $$list; \
 +      rm -f $$list
 +testConstExp$(EXEEXT): $(testConstExp_OBJECTS) $(testConstExp_DEPENDENCIES) 
 +      @rm -f testConstExp$(EXEEXT)
 +      $(testConstExp_LINK) $(testConstExp_OBJECTS) $(testConstExp_LDADD) $(LIBS)
 +testControlExp$(EXEEXT): $(testControlExp_OBJECTS) $(testControlExp_DEPENDENCIES) 
 +      @rm -f testControlExp$(EXEEXT)
 +      $(testControlExp_LINK) $(testControlExp_OBJECTS) $(testControlExp_LDADD) $(LIBS)
 +testVarExp$(EXEEXT): $(testVarExp_OBJECTS) $(testVarExp_DEPENDENCIES) 
 +      @rm -f testVarExp$(EXEEXT)
 +      $(testVarExp_LINK) $(testVarExp_OBJECTS) $(testVarExp_LDADD) $(LIBS)
 +
 +mostlyclean-compile:
 +      -rm -f *.$(OBJEXT)
 +
 +distclean-compile:
 +      -rm -f *.tab.c
 +
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciabstractSyntaxTree_la-debugvisitor.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciabstractSyntaxTree_la-libAst.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciabstractSyntaxTree_la-mutevisitor.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciabstractSyntaxTree_la-printvisitor.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciabstractSyntaxTree_la-scilabexception.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciabstractSyntaxTree_la-shortcutvisitor.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciabstractSyntaxTree_la-visitor_common.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testConstExp-testConstExp.Po@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testControlExp-testControlExp.Po@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testVarExp-testVarExp.Po@am__quote@
 +
 +.cpp.o:
 +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXXCOMPILE) -c -o $@ $<
 +
 +.cpp.obj:
 +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 +
 +.cpp.lo:
 +@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LTCXXCOMPILE) -c -o $@ $<
 +
 +libsciabstractSyntaxTree_la-libAst.lo: src/cpp/libAst.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -MT libsciabstractSyntaxTree_la-libAst.lo -MD -MP -MF $(DEPDIR)/libsciabstractSyntaxTree_la-libAst.Tpo -c -o libsciabstractSyntaxTree_la-libAst.lo `test -f 'src/cpp/libAst.cpp' || echo '$(srcdir)/'`src/cpp/libAst.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciabstractSyntaxTree_la-libAst.Tpo $(DEPDIR)/libsciabstractSyntaxTree_la-libAst.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/libAst.cpp' object='libsciabstractSyntaxTree_la-libAst.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -c -o libsciabstractSyntaxTree_la-libAst.lo `test -f 'src/cpp/libAst.cpp' || echo '$(srcdir)/'`src/cpp/libAst.cpp
 +
 +libsciabstractSyntaxTree_la-visitor_common.lo: src/cpp/visitor_common.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -MT libsciabstractSyntaxTree_la-visitor_common.lo -MD -MP -MF $(DEPDIR)/libsciabstractSyntaxTree_la-visitor_common.Tpo -c -o libsciabstractSyntaxTree_la-visitor_common.lo `test -f 'src/cpp/visitor_common.cpp' || echo '$(srcdir)/'`src/cpp/visitor_common.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciabstractSyntaxTree_la-visitor_common.Tpo $(DEPDIR)/libsciabstractSyntaxTree_la-visitor_common.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/visitor_common.cpp' object='libsciabstractSyntaxTree_la-visitor_common.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -c -o libsciabstractSyntaxTree_la-visitor_common.lo `test -f 'src/cpp/visitor_common.cpp' || echo '$(srcdir)/'`src/cpp/visitor_common.cpp
 +
 +libsciabstractSyntaxTree_la-printvisitor.lo: src/cpp/printvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -MT libsciabstractSyntaxTree_la-printvisitor.lo -MD -MP -MF $(DEPDIR)/libsciabstractSyntaxTree_la-printvisitor.Tpo -c -o libsciabstractSyntaxTree_la-printvisitor.lo `test -f 'src/cpp/printvisitor.cpp' || echo '$(srcdir)/'`src/cpp/printvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciabstractSyntaxTree_la-printvisitor.Tpo $(DEPDIR)/libsciabstractSyntaxTree_la-printvisitor.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/printvisitor.cpp' object='libsciabstractSyntaxTree_la-printvisitor.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -c -o libsciabstractSyntaxTree_la-printvisitor.lo `test -f 'src/cpp/printvisitor.cpp' || echo '$(srcdir)/'`src/cpp/printvisitor.cpp
 +
 +libsciabstractSyntaxTree_la-debugvisitor.lo: src/cpp/debugvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -MT libsciabstractSyntaxTree_la-debugvisitor.lo -MD -MP -MF $(DEPDIR)/libsciabstractSyntaxTree_la-debugvisitor.Tpo -c -o libsciabstractSyntaxTree_la-debugvisitor.lo `test -f 'src/cpp/debugvisitor.cpp' || echo '$(srcdir)/'`src/cpp/debugvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciabstractSyntaxTree_la-debugvisitor.Tpo $(DEPDIR)/libsciabstractSyntaxTree_la-debugvisitor.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/debugvisitor.cpp' object='libsciabstractSyntaxTree_la-debugvisitor.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -c -o libsciabstractSyntaxTree_la-debugvisitor.lo `test -f 'src/cpp/debugvisitor.cpp' || echo '$(srcdir)/'`src/cpp/debugvisitor.cpp
 +
 +libsciabstractSyntaxTree_la-mutevisitor.lo: src/cpp/mutevisitor.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -MT libsciabstractSyntaxTree_la-mutevisitor.lo -MD -MP -MF $(DEPDIR)/libsciabstractSyntaxTree_la-mutevisitor.Tpo -c -o libsciabstractSyntaxTree_la-mutevisitor.lo `test -f 'src/cpp/mutevisitor.cpp' || echo '$(srcdir)/'`src/cpp/mutevisitor.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciabstractSyntaxTree_la-mutevisitor.Tpo $(DEPDIR)/libsciabstractSyntaxTree_la-mutevisitor.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/mutevisitor.cpp' object='libsciabstractSyntaxTree_la-mutevisitor.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -c -o libsciabstractSyntaxTree_la-mutevisitor.lo `test -f 'src/cpp/mutevisitor.cpp' || echo '$(srcdir)/'`src/cpp/mutevisitor.cpp
 +
 +libsciabstractSyntaxTree_la-shortcutvisitor.lo: src/cpp/shortcutvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -MT libsciabstractSyntaxTree_la-shortcutvisitor.lo -MD -MP -MF $(DEPDIR)/libsciabstractSyntaxTree_la-shortcutvisitor.Tpo -c -o libsciabstractSyntaxTree_la-shortcutvisitor.lo `test -f 'src/cpp/shortcutvisitor.cpp' || echo '$(srcdir)/'`src/cpp/shortcutvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciabstractSyntaxTree_la-shortcutvisitor.Tpo $(DEPDIR)/libsciabstractSyntaxTree_la-shortcutvisitor.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/shortcutvisitor.cpp' object='libsciabstractSyntaxTree_la-shortcutvisitor.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -c -o libsciabstractSyntaxTree_la-shortcutvisitor.lo `test -f 'src/cpp/shortcutvisitor.cpp' || echo '$(srcdir)/'`src/cpp/shortcutvisitor.cpp
 +
 +libsciabstractSyntaxTree_la-scilabexception.lo: src/cpp/scilabexception.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -MT libsciabstractSyntaxTree_la-scilabexception.lo -MD -MP -MF $(DEPDIR)/libsciabstractSyntaxTree_la-scilabexception.Tpo -c -o libsciabstractSyntaxTree_la-scilabexception.lo `test -f 'src/cpp/scilabexception.cpp' || echo '$(srcdir)/'`src/cpp/scilabexception.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciabstractSyntaxTree_la-scilabexception.Tpo $(DEPDIR)/libsciabstractSyntaxTree_la-scilabexception.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/scilabexception.cpp' object='libsciabstractSyntaxTree_la-scilabexception.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -c -o libsciabstractSyntaxTree_la-scilabexception.lo `test -f 'src/cpp/scilabexception.cpp' || echo '$(srcdir)/'`src/cpp/scilabexception.cpp
 +
 +testConstExp-testConstExp.o: src/cpp/testConstExp.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testConstExp_CXXFLAGS) $(CXXFLAGS) -MT testConstExp-testConstExp.o -MD -MP -MF $(DEPDIR)/testConstExp-testConstExp.Tpo -c -o testConstExp-testConstExp.o `test -f 'src/cpp/testConstExp.cpp' || echo '$(srcdir)/'`src/cpp/testConstExp.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testConstExp-testConstExp.Tpo $(DEPDIR)/testConstExp-testConstExp.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/testConstExp.cpp' object='testConstExp-testConstExp.o' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testConstExp_CXXFLAGS) $(CXXFLAGS) -c -o testConstExp-testConstExp.o `test -f 'src/cpp/testConstExp.cpp' || echo '$(srcdir)/'`src/cpp/testConstExp.cpp
 +
 +testConstExp-testConstExp.obj: src/cpp/testConstExp.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testConstExp_CXXFLAGS) $(CXXFLAGS) -MT testConstExp-testConstExp.obj -MD -MP -MF $(DEPDIR)/testConstExp-testConstExp.Tpo -c -o testConstExp-testConstExp.obj `if test -f 'src/cpp/testConstExp.cpp'; then $(CYGPATH_W) 'src/cpp/testConstExp.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/testConstExp.cpp'; fi`
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testConstExp-testConstExp.Tpo $(DEPDIR)/testConstExp-testConstExp.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/testConstExp.cpp' object='testConstExp-testConstExp.obj' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testConstExp_CXXFLAGS) $(CXXFLAGS) -c -o testConstExp-testConstExp.obj `if test -f 'src/cpp/testConstExp.cpp'; then $(CYGPATH_W) 'src/cpp/testConstExp.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/testConstExp.cpp'; fi`
 +
 +testControlExp-testControlExp.o: src/cpp/testControlExp.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testControlExp_CXXFLAGS) $(CXXFLAGS) -MT testControlExp-testControlExp.o -MD -MP -MF $(DEPDIR)/testControlExp-testControlExp.Tpo -c -o testControlExp-testControlExp.o `test -f 'src/cpp/testControlExp.cpp' || echo '$(srcdir)/'`src/cpp/testControlExp.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testControlExp-testControlExp.Tpo $(DEPDIR)/testControlExp-testControlExp.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/testControlExp.cpp' object='testControlExp-testControlExp.o' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testControlExp_CXXFLAGS) $(CXXFLAGS) -c -o testControlExp-testControlExp.o `test -f 'src/cpp/testControlExp.cpp' || echo '$(srcdir)/'`src/cpp/testControlExp.cpp
 +
 +testControlExp-testControlExp.obj: src/cpp/testControlExp.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testControlExp_CXXFLAGS) $(CXXFLAGS) -MT testControlExp-testControlExp.obj -MD -MP -MF $(DEPDIR)/testControlExp-testControlExp.Tpo -c -o testControlExp-testControlExp.obj `if test -f 'src/cpp/testControlExp.cpp'; then $(CYGPATH_W) 'src/cpp/testControlExp.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/testControlExp.cpp'; fi`
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testControlExp-testControlExp.Tpo $(DEPDIR)/testControlExp-testControlExp.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/testControlExp.cpp' object='testControlExp-testControlExp.obj' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testControlExp_CXXFLAGS) $(CXXFLAGS) -c -o testControlExp-testControlExp.obj `if test -f 'src/cpp/testControlExp.cpp'; then $(CYGPATH_W) 'src/cpp/testControlExp.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/testControlExp.cpp'; fi`
 +
 +testVarExp-testVarExp.o: src/cpp/testVarExp.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testVarExp_CXXFLAGS) $(CXXFLAGS) -MT testVarExp-testVarExp.o -MD -MP -MF $(DEPDIR)/testVarExp-testVarExp.Tpo -c -o testVarExp-testVarExp.o `test -f 'src/cpp/testVarExp.cpp' || echo '$(srcdir)/'`src/cpp/testVarExp.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testVarExp-testVarExp.Tpo $(DEPDIR)/testVarExp-testVarExp.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/testVarExp.cpp' object='testVarExp-testVarExp.o' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testVarExp_CXXFLAGS) $(CXXFLAGS) -c -o testVarExp-testVarExp.o `test -f 'src/cpp/testVarExp.cpp' || echo '$(srcdir)/'`src/cpp/testVarExp.cpp
 +
 +testVarExp-testVarExp.obj: src/cpp/testVarExp.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testVarExp_CXXFLAGS) $(CXXFLAGS) -MT testVarExp-testVarExp.obj -MD -MP -MF $(DEPDIR)/testVarExp-testVarExp.Tpo -c -o testVarExp-testVarExp.obj `if test -f 'src/cpp/testVarExp.cpp'; then $(CYGPATH_W) 'src/cpp/testVarExp.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/testVarExp.cpp'; fi`
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testVarExp-testVarExp.Tpo $(DEPDIR)/testVarExp-testVarExp.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/testVarExp.cpp' object='testVarExp-testVarExp.obj' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testVarExp_CXXFLAGS) $(CXXFLAGS) -c -o testVarExp-testVarExp.obj `if test -f 'src/cpp/testVarExp.cpp'; then $(CYGPATH_W) 'src/cpp/testVarExp.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/testVarExp.cpp'; fi`
 +
 +mostlyclean-libtool:
 +      -rm -f *.lo
 +
 +clean-libtool:
 +      -rm -rf .libs _libs
 +install-libsciabstractSyntaxTree_la_includeHEADERS: $(libsciabstractSyntaxTree_la_include_HEADERS)
 +      @$(NORMAL_INSTALL)
 +      test -z "$(libsciabstractSyntaxTree_la_includedir)" || $(MKDIR_P) "$(DESTDIR)$(libsciabstractSyntaxTree_la_includedir)"
 +      @list='$(libsciabstractSyntaxTree_la_include_HEADERS)'; test -n "$(libsciabstractSyntaxTree_la_includedir)" || list=; \
 +      for p in $$list; do \
 +        if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 +        echo "$$d$$p"; \
 +      done | $(am__base_list) | \
 +      while read files; do \
 +        echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libsciabstractSyntaxTree_la_includedir)'"; \
 +        $(INSTALL_HEADER) $$files "$(DESTDIR)$(libsciabstractSyntaxTree_la_includedir)" || exit $$?; \
 +      done
 +
 +uninstall-libsciabstractSyntaxTree_la_includeHEADERS:
 +      @$(NORMAL_UNINSTALL)
 +      @list='$(libsciabstractSyntaxTree_la_include_HEADERS)'; test -n "$(libsciabstractSyntaxTree_la_includedir)" || list=; \
 +      files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 +      test -n "$$files" || exit 0; \
 +      echo " ( cd '$(DESTDIR)$(libsciabstractSyntaxTree_la_includedir)' && rm -f" $$files ")"; \
 +      cd "$(DESTDIR)$(libsciabstractSyntaxTree_la_includedir)" && rm -f $$files
 +
 +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 +      list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 +      unique=`for i in $$list; do \
 +          if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +        done | \
 +        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +            END { if (nonempty) { for (i in files) print i; }; }'`; \
 +      mkid -fID $$unique
 +tags: TAGS
 +
 +TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 +              $(TAGS_FILES) $(LISP)
 +      set x; \
 +      here=`pwd`; \
 +      list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 +      unique=`for i in $$list; do \
 +          if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +        done | \
 +        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +            END { if (nonempty) { for (i in files) print i; }; }'`; \
 +      shift; \
 +      if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 +        test -n "$$unique" || unique=$$empty_fix; \
 +        if test $$# -gt 0; then \
 +          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +            "$$@" $$unique; \
 +        else \
 +          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +            $$unique; \
 +        fi; \
 +      fi
 +ctags: CTAGS
 +CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 +              $(TAGS_FILES) $(LISP)
 +      list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 +      unique=`for i in $$list; do \
 +          if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +        done | \
 +        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +            END { if (nonempty) { for (i in files) print i; }; }'`; \
 +      test -z "$(CTAGS_ARGS)$$unique" \
 +        || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 +           $$unique
 +
 +GTAGS:
 +      here=`$(am__cd) $(top_builddir) && pwd` \
 +        && $(am__cd) $(top_srcdir) \
 +        && gtags -i $(GTAGS_ARGS) "$$here"
 +
 +distclean-tags:
 +      -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 +
 +check-TESTS: $(TESTS)
 +      @failed=0; all=0; xfail=0; xpass=0; skip=0; \
 +      srcdir=$(srcdir); export srcdir; \
 +      list=' $(TESTS) '; \
 +      $(am__tty_colors); \
 +      if test -n "$$list"; then \
 +        for tst in $$list; do \
 +          if test -f ./$$tst; then dir=./; \
 +          elif test -f $$tst; then dir=; \
 +          else dir="$(srcdir)/"; fi; \
 +          if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
 +            all=`expr $$all + 1`; \
 +            case " $(XFAIL_TESTS) " in \
 +            *[\ \     ]$$tst[\ \      ]*) \
 +              xpass=`expr $$xpass + 1`; \
 +              failed=`expr $$failed + 1`; \
 +              col=$$red; res=XPASS; \
 +            ;; \
 +            *) \
 +              col=$$grn; res=PASS; \
 +            ;; \
 +            esac; \
 +          elif test $$? -ne 77; then \
 +            all=`expr $$all + 1`; \
 +            case " $(XFAIL_TESTS) " in \
 +            *[\ \     ]$$tst[\ \      ]*) \
 +              xfail=`expr $$xfail + 1`; \
 +              col=$$lgn; res=XFAIL; \
 +            ;; \
 +            *) \
 +              failed=`expr $$failed + 1`; \
 +              col=$$red; res=FAIL; \
 +            ;; \
 +            esac; \
 +          else \
 +            skip=`expr $$skip + 1`; \
 +            col=$$blu; res=SKIP; \
 +          fi; \
 +          echo "$${col}$$res$${std}: $$tst"; \
 +        done; \
 +        if test "$$all" -eq 1; then \
 +          tests="test"; \
 +          All=""; \
 +        else \
 +          tests="tests"; \
 +          All="All "; \
 +        fi; \
 +        if test "$$failed" -eq 0; then \
 +          if test "$$xfail" -eq 0; then \
 +            banner="$$All$$all $$tests passed"; \
 +          else \
 +            if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
 +            banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
 +          fi; \
 +        else \
 +          if test "$$xpass" -eq 0; then \
 +            banner="$$failed of $$all $$tests failed"; \
 +          else \
 +            if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
 +            banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
 +          fi; \
 +        fi; \
 +        dashes="$$banner"; \
 +        skipped=""; \
 +        if test "$$skip" -ne 0; then \
 +          if test "$$skip" -eq 1; then \
 +            skipped="($$skip test was not run)"; \
 +          else \
 +            skipped="($$skip tests were not run)"; \
 +          fi; \
 +          test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
 +            dashes="$$skipped"; \
 +        fi; \
 +        report=""; \
 +        if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
 +          report="Please report to $(PACKAGE_BUGREPORT)"; \
 +          test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
 +            dashes="$$report"; \
 +        fi; \
 +        dashes=`echo "$$dashes" | sed s/./=/g`; \
 +        if test "$$failed" -eq 0; then \
 +          echo "$$grn$$dashes"; \
 +        else \
 +          echo "$$red$$dashes"; \
 +        fi; \
 +        echo "$$banner"; \
 +        test -z "$$skipped" || echo "$$skipped"; \
 +        test -z "$$report" || echo "$$report"; \
 +        echo "$$dashes$$std"; \
 +        test "$$failed" -eq 0; \
 +      else :; fi
 +
 +distdir: $(DISTFILES)
 +      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +      list='$(DISTFILES)'; \
 +        dist_files=`for file in $$list; do echo $$file; done | \
 +        sed -e "s|^$$srcdirstrip/||;t" \
 +            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 +      case $$dist_files in \
 +        */*) $(MKDIR_P) `echo "$$dist_files" | \
 +                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 +                         sort -u` ;; \
 +      esac; \
 +      for file in $$dist_files; do \
 +        if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 +        if test -d $$d/$$file; then \
 +          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +          if test -d "$(distdir)/$$file"; then \
 +            find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +          fi; \
 +          if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 +            cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
 +            find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +          fi; \
 +          cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 +        else \
 +          test -f "$(distdir)/$$file" \
 +          || cp -p $$d/$$file "$(distdir)/$$file" \
 +          || exit 1; \
 +        fi; \
 +      done
 +check-am: all-am
 +      $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
 +      $(MAKE) $(AM_MAKEFLAGS) check-TESTS
 +check: check-am
 +all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 +installdirs:
 +      for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libsciabstractSyntaxTree_la_includedir)"; do \
 +        test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 +      done
 +install: install-am
 +install-exec: install-exec-am
 +install-data: install-data-am
 +uninstall: uninstall-am
 +
 +install-am: all-am
 +      @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 +
 +installcheck: installcheck-am
 +install-strip:
 +      $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 +        install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 +        `test -z '$(STRIP)' || \
 +          echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 +mostlyclean-generic:
 +
 +clean-generic:
 +
 +distclean-generic:
 +      -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +      -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 +
 +maintainer-clean-generic:
 +      @echo "This command is intended for maintainers to use"
 +      @echo "it deletes files that may require special tools to rebuild."
 +clean: clean-am
 +
 +clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
 +      clean-pkglibLTLIBRARIES mostlyclean-am
 +
 +distclean: distclean-am
 +      -rm -rf ./$(DEPDIR)
 +      -rm -f Makefile
 +distclean-am: clean-am distclean-compile distclean-generic \
 +      distclean-tags
 +
 +dvi: dvi-am
 +
 +dvi-am:
 +
 +html: html-am
 +
 +html-am:
 +
 +info: info-am
 +
 +info-am:
 +
 +install-data-am: install-libsciabstractSyntaxTree_la_includeHEADERS
 +
 +install-dvi: install-dvi-am
 +
 +install-dvi-am:
 +
 +install-exec-am: install-pkglibLTLIBRARIES
 +
 +install-html: install-html-am
 +
 +install-html-am:
 +
 +install-info: install-info-am
 +
 +install-info-am:
 +
 +install-man:
 +
 +install-pdf: install-pdf-am
 +
 +install-pdf-am:
 +
 +install-ps: install-ps-am
 +
 +install-ps-am:
 +
 +installcheck-am:
 +
 +maintainer-clean: maintainer-clean-am
 +      -rm -rf ./$(DEPDIR)
 +      -rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
 +
 +mostlyclean: mostlyclean-am
 +
 +mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 +      mostlyclean-libtool
 +
 +pdf: pdf-am
 +
 +pdf-am:
 +
 +ps: ps-am
 +
 +ps-am:
 +
 +uninstall-am: uninstall-libsciabstractSyntaxTree_la_includeHEADERS \
 +      uninstall-pkglibLTLIBRARIES
 +
 +.MAKE: check-am install-am install-strip
 +
 +.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
 +      clean-checkPROGRAMS clean-generic clean-libtool \
 +      clean-pkglibLTLIBRARIES ctags distclean distclean-compile \
 +      distclean-generic distclean-libtool distclean-tags distdir dvi \
 +      dvi-am html html-am info info-am install install-am \
 +      install-data install-data-am install-dvi install-dvi-am \
 +      install-exec install-exec-am install-html install-html-am \
 +      install-info install-info-am \
 +      install-libsciabstractSyntaxTree_la_includeHEADERS install-man \
 +      install-pdf install-pdf-am install-pkglibLTLIBRARIES \
 +      install-ps install-ps-am install-strip installcheck \
 +      installcheck-am installdirs maintainer-clean \
 +      maintainer-clean-generic mostlyclean mostlyclean-compile \
 +      mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 +      tags uninstall uninstall-am \
 +      uninstall-libsciabstractSyntaxTree_la_includeHEADERS \
 +      uninstall-pkglibLTLIBRARIES
 +
 +
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -20,9 -20,7 +20,8 @@@
  ;
  Source: bin\{#BOOLEAN}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  Source: bin\{#BOOLEAN}_f.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 +Source: bin\{#BOOLEAN}_gw.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#BOOLEAN}\VERSION.xml; DestDir: {app}\modules\{#BOOLEAN}; Components: {#COMPN_SCILAB}
  Source: modules\{#BOOLEAN}\license.txt; DestDir: {app}\modules\{#BOOLEAN}; Components: {#COMPN_SCILAB}
  ;
  Source: modules\{#BOOLEAN}\sci_gateway\{#BOOLEAN}_gateway.xml; DestDir: {app}\modules\{#BOOLEAN}\sci_gateway; Components: {#COMPN_SCILAB}
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -78,8 -86,15 +78,10 @@@ src/c/eqid.c 
  src/c/exitCodeValue.c \
  src/c/getversion.c \
  src/c/dynamic_tclsci.c \
- src/c/dynamic_parallel.c
+ src/c/dynamic_parallel.c \
 -src/c/storeCommand.c \
+ src/c/backtrace.c \
+ src/c/signal_mgmt.c
  
 -CORE_CPP_SOURCES = src/cpp/hashtable_core.cpp \
 -src/cpp/namstr.cpp \
 -src/cpp/search_functions.cpp
 -
  if USE_DYNAMIC_STACK
  CORE_C_SOURCES += src/c/scimem64.c
  endif
@@@ -341,7 -332,7 +342,7 @@@ modulename=cor
  
  #### core : Conf files ####
  libscicore_la_rootdir = $(mydatadir)
- libscicore_la_root_DATA =  license.txt version.xml
 -libscicore_la_root_DATA =  license.txt 
++libscicore_la_root_DATA =  license.txt
  
  
  #### core : init scripts ####
@@@ -150,13 -153,11 +150,14 @@@ am__libscicore_algo_la_SOURCES_DIST = s
        src/c/inittypenames.c src/c/funcprot.c src/c/eqid.c \
        src/c/exitCodeValue.c src/c/getversion.c \
        src/c/dynamic_tclsci.c src/c/dynamic_parallel.c \
-       src/c/scimem64.c src/cpp/core_gw.cpp \
-       src/cpp/hashtable_core.cpp src/cpp/namstr.cpp \
-       src/cpp/search_functions.cpp src/cpp/storeCommand.cpp \
-       src/cpp/banner.cpp src/cpp/with_module.cpp src/cpp/runner.cpp \
 -      src/c/storeCommand.c src/c/backtrace.c src/c/signal_mgmt.c \
 -      src/c/scimem64.c src/cpp/hashtable_core.cpp src/cpp/namstr.cpp \
 -      src/cpp/search_functions.cpp src/fortran/clunit.f \
 -      src/fortran/getlin.f src/fortran/allowptr.f \
 -      src/fortran/isany.f src/fortran/hmcreate.f src/fortran/nextj.f \
++      src/c/backtrace.c src/c/signal_mgmt.c src/c/scimem64.c \
++      src/cpp/core_gw.cpp src/cpp/hashtable_core.cpp \
++      src/cpp/namstr.cpp src/cpp/search_functions.cpp \
++      src/cpp/storeCommand.cpp src/cpp/banner.cpp \
++      src/cpp/with_module.cpp src/cpp/runner.cpp \
 +      src/fortran/clunit.f src/fortran/getlin.f \
 +      src/fortran/allowptr.f src/fortran/isany.f \
 +      src/fortran/hmcreate.f src/fortran/nextj.f \
        src/fortran/setgetmode.f src/fortran/showstack.f \
        src/fortran/misops.f src/fortran/iseye.f src/fortran/chkvar.f \
        src/fortran/setippty.f src/fortran/compil.f \
@@@ -247,14 -254,13 +248,16 @@@ am__objects_2 = libscicore_algo_la-inff
        libscicore_algo_la-exitCodeValue.lo \
        libscicore_algo_la-getversion.lo \
        libscicore_algo_la-dynamic_tclsci.lo \
-       libscicore_algo_la-dynamic_parallel.lo $(am__objects_1)
+       libscicore_algo_la-dynamic_parallel.lo \
 -      libscicore_algo_la-storeCommand.lo \
+       libscicore_algo_la-backtrace.lo \
+       libscicore_algo_la-signal_mgmt.lo $(am__objects_1)
 -am__objects_3 = libscicore_algo_la-hashtable_core.lo \
 +am__objects_3 = libscicore_algo_la-core_gw.lo \
 +      libscicore_algo_la-hashtable_core.lo \
        libscicore_algo_la-namstr.lo \
 -      libscicore_algo_la-search_functions.lo
 +      libscicore_algo_la-search_functions.lo \
 +      libscicore_algo_la-storeCommand.lo \
 +      libscicore_algo_la-banner.lo libscicore_algo_la-with_module.lo \
 +      libscicore_algo_la-runner.lo
  @USE_DYNAMIC_STACK_TRUE@am__objects_4 = relocstack.lo
  am__objects_5 = clunit.lo getlin.lo allowptr.lo isany.lo hmcreate.lo \
        nextj.lo setgetmode.lo showstack.lo misops.lo iseye.lo \
@@@ -639,7 -643,12 +642,7 @@@ CORE_C_SOURCES = src/c/inffic.c src/c/c
        src/c/inittypenames.c src/c/funcprot.c src/c/eqid.c \
        src/c/exitCodeValue.c src/c/getversion.c \
        src/c/dynamic_tclsci.c src/c/dynamic_parallel.c \
-       $(am__append_1)
 -      src/c/storeCommand.c src/c/backtrace.c src/c/signal_mgmt.c \
 -      $(am__append_1)
 -CORE_CPP_SOURCES = src/cpp/hashtable_core.cpp \
 -src/cpp/namstr.cpp \
 -src/cpp/search_functions.cpp
 -
++      src/c/backtrace.c src/c/signal_mgmt.c $(am__append_1)
  CORE_FORTRAN_SOURCES = src/fortran/clunit.f src/fortran/getlin.f \
        src/fortran/allowptr.f src/fortran/isany.f \
        src/fortran/hmcreate.f src/fortran/nextj.f \
@@@ -824,7 -811,7 +827,7 @@@ modulename = cor
  
  #### core : Conf files ####
  libscicore_la_rootdir = $(mydatadir)
- libscicore_la_root_DATA = license.txt version.xml
 -libscicore_la_root_DATA = license.txt 
++libscicore_la_root_DATA = license.txt
  
  #### core : init scripts ####
  libscicore_la_etcdir = $(mydatadir)/etc
@@@ -1024,8 -1014,11 +1027,9 @@@ distclean-compile
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_algo_la-IsAScalar.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_algo_la-LaunchScilabSignal.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_algo_la-LoadFunctionsTab.Plo@am__quote@
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_algo_la-SCIHOME.Plo@am__quote@
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_algo_la-SetScilabEnvironment.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_algo_la-TerminateCore.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_algo_la-backtrace.Plo@am__quote@
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_algo_la-banier.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_algo_la-banner.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_algo_la-callDynamicGateway.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_algo_la-callFunctionFromGateway.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_algo_la-callinterf.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_algo_la-scirun.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_algo_la-search_functions.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_algo_la-setPrecisionFPU.Plo@am__quote@
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_algo_la-setgetSCIpath.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_algo_la-signal_mgmt.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_algo_la-stack1.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_algo_la-stack2.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_algo_la-stack3.Plo@am__quote@
@@@ -1665,6 -1716,27 +1670,20 @@@ libscicore_algo_la-dynamic_parallel.lo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_algo_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_algo_la_CFLAGS) $(CFLAGS) -c -o libscicore_algo_la-dynamic_parallel.lo `test -f 'src/c/dynamic_parallel.c' || echo '$(srcdir)/'`src/c/dynamic_parallel.c
  
 -libscicore_algo_la-storeCommand.lo: src/c/storeCommand.c
 -@am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_algo_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_algo_la_CFLAGS) $(CFLAGS) -MT libscicore_algo_la-storeCommand.lo -MD -MP -MF $(DEPDIR)/libscicore_algo_la-storeCommand.Tpo -c -o libscicore_algo_la-storeCommand.lo `test -f 'src/c/storeCommand.c' || echo '$(srcdir)/'`src/c/storeCommand.c
 -@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscicore_algo_la-storeCommand.Tpo $(DEPDIR)/libscicore_algo_la-storeCommand.Plo
 -@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='src/c/storeCommand.c' object='libscicore_algo_la-storeCommand.lo' libtool=yes @AMDEPBACKSLASH@
 -@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 -@am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_algo_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_algo_la_CFLAGS) $(CFLAGS) -c -o libscicore_algo_la-storeCommand.lo `test -f 'src/c/storeCommand.c' || echo '$(srcdir)/'`src/c/storeCommand.c
 -
+ libscicore_algo_la-backtrace.lo: src/c/backtrace.c
+ @am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_algo_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_algo_la_CFLAGS) $(CFLAGS) -MT libscicore_algo_la-backtrace.lo -MD -MP -MF $(DEPDIR)/libscicore_algo_la-backtrace.Tpo -c -o libscicore_algo_la-backtrace.lo `test -f 'src/c/backtrace.c' || echo '$(srcdir)/'`src/c/backtrace.c
+ @am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscicore_algo_la-backtrace.Tpo $(DEPDIR)/libscicore_algo_la-backtrace.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@     source='src/c/backtrace.c' object='libscicore_algo_la-backtrace.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_algo_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_algo_la_CFLAGS) $(CFLAGS) -c -o libscicore_algo_la-backtrace.lo `test -f 'src/c/backtrace.c' || echo '$(srcdir)/'`src/c/backtrace.c
+ libscicore_algo_la-signal_mgmt.lo: src/c/signal_mgmt.c
+ @am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_algo_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_algo_la_CFLAGS) $(CFLAGS) -MT libscicore_algo_la-signal_mgmt.lo -MD -MP -MF $(DEPDIR)/libscicore_algo_la-signal_mgmt.Tpo -c -o libscicore_algo_la-signal_mgmt.lo `test -f 'src/c/signal_mgmt.c' || echo '$(srcdir)/'`src/c/signal_mgmt.c
+ @am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscicore_algo_la-signal_mgmt.Tpo $(DEPDIR)/libscicore_algo_la-signal_mgmt.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@     source='src/c/signal_mgmt.c' object='libscicore_algo_la-signal_mgmt.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_algo_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_algo_la_CFLAGS) $(CFLAGS) -c -o libscicore_algo_la-signal_mgmt.lo `test -f 'src/c/signal_mgmt.c' || echo '$(srcdir)/'`src/c/signal_mgmt.c
  libscicore_algo_la-scimem64.lo: src/c/scimem64.c
  @am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_algo_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_algo_la_CFLAGS) $(CFLAGS) -MT libscicore_algo_la-scimem64.lo -MD -MP -MF $(DEPDIR)/libscicore_algo_la-scimem64.Tpo -c -o libscicore_algo_la-scimem64.lo `test -f 'src/c/scimem64.c' || echo '$(srcdir)/'`src/c/scimem64.c
  @am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscicore_algo_la-scimem64.Tpo $(DEPDIR)/libscicore_algo_la-scimem64.Plo
  #define CORE "core"
  ;
  Source: modules\{#CORE}\jar\org.scilab.modules.{#CORE}.jar;DestDir: {app}\modules\{#CORE}\jar; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 +Source: bin\{#CORE}_gw.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 +;not generated (hardcoded)
  ;
- Source: modules\{#CORE}\VERSION.xml; DestDir: {app}\modules\{#CORE}; Components: {#COMPN_SCILAB}
  Source: modules\{#CORE}\license.txt; DestDir: {app}\modules\{#CORE}; Components: {#COMPN_SCILAB}
  ;
  Source: modules\{#CORE}\sci_gateway\{#CORE}_gateway.xml; DestDir: {app}\modules\{#CORE}\sci_gateway; Components: {#COMPN_SCILAB}
@@@ -87,15 -86,9 +87,9 @@@ wchar_t* getCompilerUsedToBuildScilab(v
  * get Compiler Architecture
  * @return 'x86' or 'x64'
  */
 -char *getCompilerArchitecture(void);
 +wchar_t* getCompilerArchitecture(void);
  
  /**
- * with atlas ?
- * @return TRUE or FALSE
- */
- BOOL with_atlas(void);
- /**
  * with pvm ?
  * @return TRUE or FALSE
  */
@@@ -46,8 -46,8 +46,8 @@@
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
                                Optimization="0"
 -                              AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes"
 +                              AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../operations/includes;../../../parse/includes;../../../abstractSyntaxTree/includes;../../../types/includes;../../../symbol/includes;../../../system_env/includes;../../../io/includes"
-                               PreprocessorDefinitions="_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__"
+                               PreprocessorDefinitions="_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;__STDC__"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="0"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
 -                              AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes"
 +                              AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../operations/includes;../../../parse/includes;../../../abstractSyntaxTree/includes;../../../types/includes;../../../symbol/includes;../../../system_env/includes;../../../io/includes"
-                               PreprocessorDefinitions="_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__"
+                               PreprocessorDefinitions="_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;__STDC__"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="0"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
 -                              AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes"
 +                              AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../operations/includes;../../../parse/includes;../../../abstractSyntaxTree/includes;../../../types/includes;../../../symbol/includes;../../../system_env/includes;../../../io/includes"
-                               PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__"
+                               PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;__STDC__"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
 -                              AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes"
 +                              AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../operations/includes;../../../parse/includes;../../../abstractSyntaxTree/includes;../../../types/includes;../../../symbol/includes;../../../system_env/includes;../../../io/includes"
-                               PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__"
+                               PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;__STDC__"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
Simple merge
@@@ -1,11 -1,11 +1,11 @@@
  /*
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2010 - DIGITEO - Allan CORNET
--* 
++*
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
--* are also available at    
++* are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  */
  #include "loadversion.h"
  #include "MALLOC.h"
  #include "../../../io/includes/getenvc.h"
 +#include "os_wcsdup.h"
 +#include "charEncoding.h"
  /*--------------------------------------------------------------------------*/
 -#define TCLSCI_MODULE_NAME "tclsci"
 -#define PVM_MODULE_NAME "pvm"
 -#define PVM_OPTION_STRING "pvm"
 -#define TCLTK_OPTION_STRING "tk"
 -#define MODELICAC_OPTION_STRING "modelicac"
 -#define X86_STRING "x86"
 -#define X64_STRING "x64"
 -#define ICC_STRING "ICC"
 -#define VC_STRING "VC++"
 -#define GCC_STRING "GCC"
 -#define PGI_STRING "PGI"
 -#define SUN_STRING "SUN"
 -#define UNKNOW_STRING "UKN"
 -#define RELEASE_STRING "release"
 -#define DEBUG_STRING "debug"
  #define DEFAULT_VERSION_ARRAY_SIZE 4
 -#define SCILAB_STRING "scilab"
 +
 +/*wide char*/
 +#define TCLSCI_MODULE_NAME          L"tclsci"
 +#define PVM_MODULE_NAME             L"pvm"
 +#define PVM_OPTION_STRING           L"pvm"
 +#define TCLTK_OPTION_STRING         L"tk"
- #define ATLAS_OPTION_STRING         L"atlas"
 +#define MODELICAC_OPTION_STRING     L"modelicac"
 +#define X86_STRING                  L"x86"
 +#define X64_STRING                  L"x64"
 +#define ICC_STRING                  L"ICC"
 +#define VC_STRING                   L"VC++"
 +#define GCC_STRING                  L"GCC"
 +#define PGI_STRING                  L"PGI"
 +#define SUN_STRING                  L"SUN"
 +#define UNKNOW_STRING               L"UKN"
 +#define RELEASE_STRING              L"release"
 +#define DEBUG_STRING                L"debug"
 +#define SCILAB_STRING               L"scilab"
  /*--------------------------------------------------------------------------*/
  int *getScilabVersion(int *sizeArrayReturned)
  {
@@@ -92,8 -84,8 +91,8 @@@ int* getModuleVersion(wchar_t* _pwstMod
                int version_module_maintenance = 0;
                int version_module_revision = 0;
  
 -              if (getversionmodule(modulename, &version_module_major, &version_module_minor,
 -                      &version_module_maintenance, versionstring, 
 +              if (getversionmodule(_pwstModule, &version_module_major, &version_module_minor,
-                       &version_module_maintenance, versionstring, 
++                      &version_module_maintenance, versionstring,
                        &version_module_revision))
                {
                        returnedArray = (int *)MALLOC(sizeof(int) * DEFAULT_VERSION_ARRAY_SIZE);
@@@ -139,11 -131,11 +138,11 @@@ wchar_t* getModuleVersionInfoAsString(w
                int version_module_minor = 0;
                int version_module_maintenance = 0;
                int version_module_revision = 0;
 -              if (getversionmodule(modulename, &version_module_major, &version_module_minor,
 -                      &version_module_maintenance, versionstring, 
 +              if (getversionmodule(_pwstModule, &version_module_major, &version_module_minor,
-                       &version_module_maintenance, versionstring, 
++                      &version_module_maintenance, versionstring,
                        &version_module_revision))
                {
 -                      infoString = strdup(versionstring);
 +                      infoString = os_wcsdup(versionstring);
                }
        }
        return infoString;
@@@ -1,12 -1,12 +1,12 @@@
  /*
   * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
   * Copyright (C) 2006 - INRIA - Allan CORNET
-  * Copyright (C) 2010 - DIGITEO - Antoine ELIAS
-  * 
+  * Copyright (C) 2011 - DIGITEO - Allan CORNET
 - * 
++ *
   * This file must be used under the terms of the CeCILL.
   * This source file is licensed as described in the file COPYING, which
   * you should have received as part of this distribution.  The terms
-- * are also available at    
++ * are also available at
   * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
   *
   */
  #include "localization.h"
  #include "stricmp.h"
  #include "FileExist.h"
 -#include "version.h"
 -#ifdef _MSC_VER
 -#include "strdup_windows.h"
 -#endif
 +#include "os_strdup.h"
  #include "getshortpathname.h"
 -/*--------------------------------------------------------------------------*/ 
 -BOOL getversionmodule(char *modulename,
 +#include "charEncoding.h"
- /*--------------------------------------------------------------------------*/ 
++#include "version.h"
++/*--------------------------------------------------------------------------*/
 +BOOL getversionmodule(wchar_t* _pwstModule,
                        int *sci_version_major,
                        int *sci_version_minor,
                        int *sci_version_maintenance,
@@@ -71,6 -68,7 +72,7 @@@
                  int version_minor=0;
                  int version_maintenance=0;
                  int version_revision=0;
 -                char *version_string=0;
++                wchar_t *pwstSciVersionString=0;
  
                  {
                      BOOL bConvert = FALSE;
@@@ -83,7 -81,7 +85,7 @@@
                      }
                  }
  
--                if (doc == NULL) 
++                if (doc == NULL)
                  {
                      fprintf(stderr,_("Error: Could not parse file %s\n"), filename_VERSION_module);
                      return FALSE;
                  xpathCtxt = xmlXPathNewContext(doc);
                  xpathObj = xmlXPathEval((const xmlChar*)"//MODULE_VERSION/VERSION", xpathCtxt);
  
--                if(xpathObj && xpathObj->nodesetval->nodeMax) 
++                if(xpathObj && xpathObj->nodesetval->nodeMax)
                  {
  
                      xmlAttrPtr attrib=xpathObj->nodesetval->nodeTab[0]->properties;
                      while (attrib != NULL)
--                    { 
++                    {
                          if (xmlStrEqual (attrib->name, (const xmlChar*) "major"))
--                        { 
++                        {
                              /* we found <major> */
                              const char *str=(const char*)attrib->children->content;
                              version_major=atoi(str);
                          }
                          else if (xmlStrEqual (attrib->name, (const xmlChar*)"minor"))
--                        { 
++                        {
                              /* we found <minor> */
                              const char *str=(const char*)attrib->children->content;
                              version_minor=atoi(str);
                          }
                          else if (xmlStrEqual (attrib->name, (const xmlChar*)"maintenance"))
--                        { 
++                        {
                              /* we found <maintenance> */
                              const char *str=(const char*)attrib->children->content;
                              version_maintenance=atoi(str);
                          }
                          else if (xmlStrEqual (attrib->name, (const xmlChar*)"revision"))
--                        { 
++                        {
                              /* we found <revision> */
                              const char *str=(const char*)attrib->children->content;
                              version_revision=atoi(str);
                      *sci_version_minor=version_minor;
                      *sci_version_maintenance=version_maintenance;
                      *sci_version_revision=version_revision;
 -                    strncpy(sci_version_string,version_string,1024);
 -                    if (version_string) {FREE(version_string);version_string=NULL;}
++                    wcscpy(_pwstSciVersionString, pwstSciVersionString);
++                    if (pwstSciVersionString)
++                    {
++                        FREE(pwstSciVersionString);
++                        pwstSciVersionString=NULL;
++                    }
                  }
                  else
                  {
              }
  
              if (encoding) {FREE(encoding);encoding=NULL;}
-             bOK=TRUE;
+             bOK = TRUE;
+         }
+         else
+         {
+             // version.xml does not exist but module exists then we returns scilab version
+             *sci_version_major =  SCI_VERSION_MAJOR;
+             *sci_version_minor = SCI_VERSION_MINOR;
+             *sci_version_maintenance = SCI_VERSION_MAINTENANCE;
+             *sci_version_revision = SCI_VERSION_TIMESTAMP;
 -            strcpy(sci_version_string, "");
++            wcscpy(_pwstSciVersionString, L"");
+             bOK = TRUE;
          }
  
          if (filename_VERSION_module) {FREE(filename_VERSION_module);filename_VERSION_module=NULL;}
      }
      return bOK;
  }
 -/*--------------------------------------------------------------------------*/ 
++/*--------------------------------------------------------------------------*/
@@@ -5,11 -5,12 +5,12 @@@
   * Copyright (C) 1998-2008 - INRIA - Serge STEER
   * Copyright (C) 1998-2008 - INRIA - Sylvestre LEDRU
   * Copyright (C) 1998-2008 - INRIA - Bruno JOFRET
-  * 
+  * Copyright (C) 2011 - DIGITEO - Allan CORNET
 - * 
++ *
   * This file must be used under the terms of the CeCILL.
   * This source file is licensed as described in the file COPYING, which
   * you should have received as part of this distribution.  The terms
-- * are also available at    
++ * are also available at
   * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
   *
   * Please note that piece of code will be rewrited for the Scilab 6 family
@@@ -1224,200 -1228,210 +1225,210 @@@ int C2F(getmatdims)(int *number,int *m,
  
  int C2F(getrhsvar)(int *number,char *typex,int *m,int *n,int *lr,unsigned long type_len)
  {
-       int ierr = 0,il1 = 0,ild1 = 0,nn = 0;
-       int lrr = 0;
-       char *fname = Get_Iname();
-       char **items = NULL, namex[nlgh+1];
-       unsigned char Type = *(unsigned char *) typex;
-       int topk = 0,ltype = 0, m1 = 0, n1 = 0, lc = 0,lr1 = 0, it = 0, lw = 0, ile = 0, ils = 0, ix1 = 0,ix2 = 0;
-       int mnel = 0,icol = 0;
-       SciSparse *Sp = NULL;
-       SciIntMat *Im = NULL;
-       /* we accept a call to getrhsvar after a createvarfromptr call */
-       if ( *number > Rhs && *number > Nbvars ) {
-               Scierror(999,_("%s: bad call to %s! (1rst argument).\n"),fname,"getrhsvar");
-               return FALSE;
-       }
-       Nbvars = Max(Nbvars,*number);
-       lw = *number + Top - Rhs;
-       if (*number > intersiz) {
-               Scierror(999,_("%s: (%s) too many arguments in the stack edit stack.h and enlarge intersiz.\n"),fname,"getrhsvar");
-               return FALSE;
-       }
-       if (overloadtype(&lw,fname,&Type) == 0) return FALSE;
-       topk = Top;
-       switch ( Type )
-       {
-       case 'c' :
-               *n = 1;
-               if (! C2F(getsmat)(fname,&topk,&lw,&m1,&n1,&cx1,&cx1,lr,m, nlgh))
-                       return FALSE;
-               ix2 = *m * *n;
-               /* in case where ix2 is 0 in2str adds the \0 char after the end of
-               the storage of the variable, so it writes over the next variable
-               tp avoid this pb we shift up by one the location where the
-               data is written*/
-               lrr=*lr;
-               if (ix2==0) lrr--;
-               C2F(in2str)(&ix2, istk(*lr), cstk(cadr(*lr)), ix2 + 1);
-               *lr = cadr(*lr);
-               C2F(intersci).ntypes[*number - 1] = Type ;
-               C2F(intersci).iwhere[*number - 1] = *Lstk(lw);
-               C2F(intersci).lad[*number - 1] = *lr;
-               break;
-       case 'd' :
-               if (! C2F(getmat)(fname, &topk, &lw, &it, m, n, lr, &lc, nlgh)) return FALSE;
-               C2F(intersci).ntypes[*number - 1] = Type ;
-               C2F(intersci).iwhere[*number - 1] = *Lstk(lw);
-               C2F(intersci).lad[*number - 1] = *lr;
-               break ;
-       case 'z' :
-               if (! C2F(getmat)(fname, &topk, &lw, &it, m, n, lr, &lc, nlgh)) return FALSE;
-               ix2 = *m * *n;
-               if ((it != 1) && (ix2 !=0))
-               {
-                       Scierror(999,_("%s: Wrong type for argument: Complex expected.\n"),fname);
-                       return FALSE;
-               };
-               if (!(*lr % 2) ) {  /* bad adress (lr is even) shift up the stack */
-                       double2z(stk(*lr), stk(*lr)-1, ix2, ix2);
-                       *istk(iadr(*lr)-4)=133;
-                       *istk(iadr(*lr)-3)=iadr(*lr + 2*ix2-1);
-                       *istk( iadr(*lr + 2*ix2-1) )= *m;
-                       *istk( iadr(*lr + 2*ix2-1) +1 )= *n;
-                       C2F(intersci).ntypes[*number - 1] = Type ;
-                       C2F(intersci).iwhere[*number - 1] = *Lstk(lw);
-                       C2F(intersci).lad[*number - 1] = *lr-1;
-                       *lr = sadr(*lr-1);
-               }
-               else {
-                       SciToF77(stk(*lr), ix2, ix2);
-                       C2F(intersci).ntypes[*number - 1] = Type ;
-                       C2F(intersci).iwhere[*number - 1] = *Lstk(lw);
-                       C2F(intersci).lad[*number - 1] = *lr;
-                       *lr = sadr(*lr);
-               };
-               break ;
-       case 'r' :
-               if (! C2F(getmat)(fname, &topk, &lw, &it, m, n, lr, &lc, nlgh))  return FALSE;
-               ix1 = *m * *n;
-               C2F(simple)(&ix1, stk(*lr), sstk(iadr(*lr)));
-               *lr = iadr(*lr);
-               C2F(intersci).ntypes[*number - 1] = Type ;
-               C2F(intersci).iwhere[*number - 1] = *Lstk(lw);
-               C2F(intersci).lad[*number - 1] = *lr;
-               break;
-       case 'i' :
-               if (! C2F(getmat)(fname, &topk, &lw, &it, m, n, lr, &lc, nlgh)) return FALSE;
-               ix1 = *m * *n;
-               C2F(entier)(&ix1, stk(*lr), istk(iadr(*lr)));
-               *lr = iadr(*lr) ;
-               C2F(intersci).ntypes[*number - 1] = Type ;
-               C2F(intersci).iwhere[*number - 1] = *Lstk(lw);
-               C2F(intersci).lad[*number - 1] = *lr;
-               break;
-       case 'b' :
-               if (! C2F(getbmat)(fname, &topk, &lw, m, n, lr, nlgh))  return FALSE;
-               C2F(intersci).ntypes[*number - 1] = Type ;
-               C2F(intersci).iwhere[*number - 1] = *Lstk(lw);
-               C2F(intersci).lad[*number - 1] = *lr;
-               break;
-       case 'l' :    
-       case 't' :    
-       case 'm' :
-               *n = 1;
-               if (! C2F(getilist)(fname, &topk, &lw, m, n, lr, nlgh))  return FALSE;
-               /* No data conversion for list members ichar(type)='$' */
-               Type = '$' ;
-               C2F(intersci).ntypes[*number - 1] = Type ;
-               C2F(intersci).iwhere[*number - 1] = *Lstk(lw);
-               C2F(intersci).lad[*number - 1] = *lr;
-               break;
-       case 'S' :
-               /** getwsmat : must be back in stack1.c from xawelm.f */
-               if (! C2F(getwsmat)(fname,&topk,&lw,m,n,&il1,&ild1, nlgh)) return FALSE;
-               nn= (*m)*(*n);
-               ScilabMStr2CM(istk(il1),&nn,istk(ild1),&items,&ierr);
-               if ( ierr == 1) return FALSE;
-               Type = '$';
-               /*
-               * Warning : lr must have the proper size when calling getrhsvar
-               * char **Str1; .... GetRhsVar(...., &lr)
-               */
-               *((char ***) lr) = items ;
-               C2F(intersci).ntypes[*number - 1] = Type ;
-               C2F(intersci).iwhere[*number - 1] = *Lstk(lw);
-               C2F(intersci).lad[*number - 1] = *lr;
-               break;
-       case 's' :
-               /* sparse matrices */
-               Sp = (SciSparse *) lr ;
-               if (! C2F(getsparse)(fname,&topk,&lw,&it,m,n,&(Sp->nel),&mnel,&icol,&lr1,&lc,nlgh))
-                       return FALSE;
-               Sp->m = *m ; Sp->n = *n ; Sp->it = it;
-               Sp->mnel = istk(mnel);
-               Sp->icol = istk(icol);
-               Sp->R = stk(lr1);
-               Sp->I = (it==1) ? stk(lc): NULL;
-               Type = '$';
-               C2F(intersci).ntypes[*number - 1] = Type ;
-               C2F(intersci).iwhere[*number - 1] = *Lstk(lw);
-               C2F(intersci).lad[*number - 1] = *lr;
-               break;
-       case 'I' :
-               /* int matrices */
-               Im = (SciIntMat *) lr ;
-               if (! C2F(getimat)(fname,&topk,&lw,&it,m,n,&lr1,nlgh))
-                       return FALSE;
-               Im->m = *m ; Im->n = *n ; Im->it = it; Im->l = lr1;
-               Im->D = istk(lr1);
-               Type = '$';
-               C2F(intersci).ntypes[*number - 1] = Type ;
-               C2F(intersci).iwhere[*number - 1] = *Lstk(lw);
-               C2F(intersci).lad[*number - 1] = *lr;
-               break;
-       case 'f' :
-               /* XXXXXX : gros bug ici car getexternal a besoin de savoir
-               pour quelle fonction on recupere un external
-               or ici on presuppose que c'est setfeval
-               de plus on ne sait pas exactement de quel type d'external il s'agit
-               */
-               /*      int function getrhsvar(number,type,m,n,lr) */
-               *lr = *Lstk(lw);
-               ils = iadr(*lr) + 1;
-               *m = *istk(ils);
-               ile = ils + *m * nsiz + 1;
-               *n = *istk(ile);
-               if (! C2F(getexternal)(fname, &topk, &lw, namex, &ltype, C2F(setfeval), nlgh,
-                       nlgh)) {
-                               return FALSE;
-               }
-               Type = '$';
-               C2F(intersci).ntypes[*number - 1] = Type ;
-               C2F(intersci).iwhere[*number - 1] = *Lstk(lw);
-               C2F(intersci).lad[*number - 1] = *lr;
-               break;
-       case 'p' :
-               if (! C2F(getpointer)(fname, &topk, &lw,lr, nlgh)) return FALSE;
-               C2F(intersci).ntypes[*number - 1] = Type ;
-               C2F(intersci).iwhere[*number - 1] = *Lstk(lw);
-               C2F(intersci).lad[*number - 1] = *lr;
-               break;
-       case 'h' :
-               if (! C2F(gethmat)(fname, &topk, &lw, m, n, lr, nlgh)) return FALSE;
-               C2F(intersci).ntypes[*number - 1] = Type ;
-               C2F(intersci).iwhere[*number - 1] = *Lstk(lw);
-               C2F(intersci).lad[*number - 1] = *lr;
-               break ;
-       }
-       return TRUE;
+     int ierr = 0,il1 = 0,ild1 = 0,nn = 0;
+     int lrr = 0;
+     char *fname = Get_Iname();
+     char **items = NULL, namex[nlgh+1];
+     unsigned char Type = *(unsigned char *) typex;
+     int topk = 0,ltype = 0, m1 = 0, n1 = 0, lc = 0,lr1 = 0, it = 0, lw = 0, ile = 0, ils = 0, ix1 = 0,ix2 = 0;
+     int mnel = 0,icol = 0;
+     SciSparse *Sp = NULL;
+     SciIntMat *Im = NULL;
+     /* we accept a call to getrhsvar after a createvarfromptr call */
+     if ( *number > Rhs && *number > Nbvars ) {
+         Scierror(999,_("%s: bad call to %s! (1rst argument).\n"),fname,"getrhsvar");
+         return FALSE;
+     }
+     Nbvars = Max(Nbvars,*number);
+     lw = *number + Top - Rhs;
+     if (*number > intersiz) {
+         Scierror(999,_("%s: (%s) too many arguments in the stack edit stack.h and enlarge intersiz.\n"),fname,"getrhsvar");
+         return FALSE;
+     }
+     if (overloadtype(&lw,fname,&Type) == 0) return FALSE;
+     topk = Top;
+     switch ( Type )
+     {
+     case 'c' :
+         *n = 1;
+         if (! C2F(getsmat)(fname,&topk,&lw,&m1,&n1,&cx1,&cx1,lr,m, nlgh))
+         {
+             return FALSE;
+         }
+         if ((m1 != 1) || (n1 != 1))
+         {
+             /* bug 8768 check dimensions */
+             Scierror(999, _("%s: Wrong size for input argument #%d: A string expected.\n"), fname, *number);
+             return FALSE;
+         }
+         ix2 = *m * *n;
+         /* in case where ix2 is 0 in2str adds the \0 char after the end of
+         the storage of the variable, so it writes over the next variable
+         tp avoid this pb we shift up by one the location where the
+         data is written*/
+         lrr=*lr;
+         if (ix2==0) lrr--;
+         C2F(in2str)(&ix2, istk(*lr), cstk(cadr(*lr)), ix2 + 1);
+         *lr = cadr(*lr);
+         C2F(intersci).ntypes[*number - 1] = Type ;
+         C2F(intersci).iwhere[*number - 1] = *Lstk(lw);
+         C2F(intersci).lad[*number - 1] = *lr;
+         break;
+     case 'd' :
+         if (! C2F(getmat)(fname, &topk, &lw, &it, m, n, lr, &lc, nlgh)) return FALSE;
+         C2F(intersci).ntypes[*number - 1] = Type ;
+         C2F(intersci).iwhere[*number - 1] = *Lstk(lw);
+         C2F(intersci).lad[*number - 1] = *lr;
+         break ;
+     case 'z' :
+         if (! C2F(getmat)(fname, &topk, &lw, &it, m, n, lr, &lc, nlgh)) return FALSE;
+         ix2 = *m * *n;
+         if ((it != 1) && (ix2 !=0))
+         {
+             Scierror(999,_("%s: Wrong type for argument: Complex expected.\n"),fname);
+             return FALSE;
+         };
+         if (!(*lr % 2) ) {  /* bad adress (lr is even) shift up the stack */
+             double2z(stk(*lr), stk(*lr)-1, ix2, ix2);
+             *istk(iadr(*lr)-4)=133;
+             *istk(iadr(*lr)-3)=iadr(*lr + 2*ix2-1);
+             *istk( iadr(*lr + 2*ix2-1) )= *m;
+             *istk( iadr(*lr + 2*ix2-1) +1 )= *n;
+             C2F(intersci).ntypes[*number - 1] = Type ;
+             C2F(intersci).iwhere[*number - 1] = *Lstk(lw);
+             C2F(intersci).lad[*number - 1] = *lr-1;
+             *lr = sadr(*lr-1);
+         }
+         else {
+             SciToF77(stk(*lr), ix2, ix2);
+             C2F(intersci).ntypes[*number - 1] = Type ;
+             C2F(intersci).iwhere[*number - 1] = *Lstk(lw);
+             C2F(intersci).lad[*number - 1] = *lr;
+             *lr = sadr(*lr);
+         };
+         break ;
+     case 'r' :
+         if (! C2F(getmat)(fname, &topk, &lw, &it, m, n, lr, &lc, nlgh))  return FALSE;
+         ix1 = *m * *n;
+         C2F(simple)(&ix1, stk(*lr), sstk(iadr(*lr)));
+         *lr = iadr(*lr);
+         C2F(intersci).ntypes[*number - 1] = Type ;
+         C2F(intersci).iwhere[*number - 1] = *Lstk(lw);
+         C2F(intersci).lad[*number - 1] = *lr;
+         break;
+     case 'i' :
+         if (! C2F(getmat)(fname, &topk, &lw, &it, m, n, lr, &lc, nlgh)) return FALSE;
+         ix1 = *m * *n;
+         C2F(entier)(&ix1, stk(*lr), istk(iadr(*lr)));
+         *lr = iadr(*lr) ;
+         C2F(intersci).ntypes[*number - 1] = Type ;
+         C2F(intersci).iwhere[*number - 1] = *Lstk(lw);
+         C2F(intersci).lad[*number - 1] = *lr;
+         break;
+     case 'b' :
+         if (! C2F(getbmat)(fname, &topk, &lw, m, n, lr, nlgh))  return FALSE;
+         C2F(intersci).ntypes[*number - 1] = Type ;
+         C2F(intersci).iwhere[*number - 1] = *Lstk(lw);
+         C2F(intersci).lad[*number - 1] = *lr;
+         break;
 -    case 'l' :    
 -    case 't' :    
++    case 'l' :
++    case 't' :
+     case 'm' :
+         *n = 1;
+         if (! C2F(getilist)(fname, &topk, &lw, m, n, lr, nlgh))  return FALSE;
+         /* No data conversion for list members ichar(type)='$' */
+         Type = '$' ;
+         C2F(intersci).ntypes[*number - 1] = Type ;
+         C2F(intersci).iwhere[*number - 1] = *Lstk(lw);
+         C2F(intersci).lad[*number - 1] = *lr;
+         break;
+     case 'S' :
+         /** getwsmat : must be back in stack1.c from xawelm.f */
+         if (! C2F(getwsmat)(fname,&topk,&lw,m,n,&il1,&ild1, nlgh)) return FALSE;
+         nn= (*m)*(*n);
+         ScilabMStr2CM(istk(il1),&nn,istk(ild1),&items,&ierr);
+         if ( ierr == 1) return FALSE;
+         Type = '$';
+         /*
+         * Warning : lr must have the proper size when calling getrhsvar
+         * char **Str1; .... GetRhsVar(...., &lr)
+         */
+         *((char ***) lr) = items ;
+         C2F(intersci).ntypes[*number - 1] = Type ;
+         C2F(intersci).iwhere[*number - 1] = *Lstk(lw);
+         C2F(intersci).lad[*number - 1] = *lr;
+         break;
+     case 's' :
+         /* sparse matrices */
+         Sp = (SciSparse *) lr ;
+         if (! C2F(getsparse)(fname,&topk,&lw,&it,m,n,&(Sp->nel),&mnel,&icol,&lr1,&lc,nlgh))
+             return FALSE;
+         Sp->m = *m ; Sp->n = *n ; Sp->it = it;
+         Sp->mnel = istk(mnel);
+         Sp->icol = istk(icol);
+         Sp->R = stk(lr1);
+         Sp->I = (it==1) ? stk(lc): NULL;
+         Type = '$';
+         C2F(intersci).ntypes[*number - 1] = Type ;
+         C2F(intersci).iwhere[*number - 1] = *Lstk(lw);
+         C2F(intersci).lad[*number - 1] = *lr;
+         break;
+     case 'I' :
+         /* int matrices */
+         Im = (SciIntMat *) lr ;
+         if (! C2F(getimat)(fname,&topk,&lw,&it,m,n,&lr1,nlgh))
+             return FALSE;
+         Im->m = *m ; Im->n = *n ; Im->it = it; Im->l = lr1;
+         Im->D = istk(lr1);
+         Type = '$';
+         C2F(intersci).ntypes[*number - 1] = Type ;
+         C2F(intersci).iwhere[*number - 1] = *Lstk(lw);
+         C2F(intersci).lad[*number - 1] = *lr;
+         break;
+     case 'f' :
+         /* XXXXXX : gros bug ici car getexternal a besoin de savoir
+         pour quelle fonction on recupere un external
+         or ici on presuppose que c'est setfeval
+         de plus on ne sait pas exactement de quel type d'external il s'agit
+         */
+         /*      int function getrhsvar(number,type,m,n,lr) */
+         *lr = *Lstk(lw);
+         ils = iadr(*lr) + 1;
+         *m = *istk(ils);
+         ile = ils + *m * nsiz + 1;
+         *n = *istk(ile);
+         if (! C2F(getexternal)(fname, &topk, &lw, namex, &ltype, C2F(setfeval), nlgh,
+             nlgh)) {
+                 return FALSE;
+         }
+         Type = '$';
+         C2F(intersci).ntypes[*number - 1] = Type ;
+         C2F(intersci).iwhere[*number - 1] = *Lstk(lw);
+         C2F(intersci).lad[*number - 1] = *lr;
+         break;
+     case 'p' :
+         if (! C2F(getpointer)(fname, &topk, &lw,lr, nlgh)) return FALSE;
+         C2F(intersci).ntypes[*number - 1] = Type ;
+         C2F(intersci).iwhere[*number - 1] = *Lstk(lw);
+         C2F(intersci).lad[*number - 1] = *lr;
+         break;
+     case 'h' :
+         if (! C2F(gethmat)(fname, &topk, &lw, m, n, lr, nlgh)) return FALSE;
+         C2F(intersci).ntypes[*number - 1] = Type ;
+         C2F(intersci).iwhere[*number - 1] = *Lstk(lw);
+         C2F(intersci).lad[*number - 1] = *lr;
+         break ;
+     }
+     return TRUE;
  }
  
  
@@@ -1883,182 -1897,164 +1894,164 @@@ int C2F(callscifun)(char *string,unsign
  
  int C2F(scifunction)(int *number,int *ptr,int *mlhs,int *mrhs)
  {
-   int cx26 = 26;
-   int ix1, ix, k, intop, lw;
-   int imode,ireftop;
+     int cx26 = 26;
+     int ix1, ix, k, intop, lw;
+     int imode,ireftop;
  
-   if ( intersci_push() == 0 )
+     if ( intersci_push() == 0 )
      {
-       Scierror(999,_("%s: No more memory.\n"),"scifunction");
-       goto L9999;
-     }
-   /*     macro execution inside a builtin gateway*/
-   intop = Top;
-   Top = Top - Rhs + *number + *mrhs - 1;
-   ++C2F(recu).pt;
-   if (C2F(recu).pt > psiz) {
-     SciError(cx26);
-     goto L9999;
-   }
-   C2F(recu).ids[C2F(recu).pt * nsiz - nsiz] = Lhs;
-   C2F(recu).ids[C2F(recu).pt * nsiz - (nsiz-1)] = Rhs;
-   C2F(recu).rstk[C2F(recu).pt - 1] = 1001;
-   Lhs = *mlhs;
-   Rhs = *mrhs;
-   ++C2F(recu).niv;
-   C2F(com).fun = 0;
-   C2F(com).fin = *ptr;
-   C2F(recu).icall = 5;
-   C2F(recu).krec = -1;
-   /* ************************** copied from callinter.h */
-  L60:
-   C2F(parse)();
-   /* parse has exited for a built-in evaluation */
-   if (C2F(com).fun == 99) {
-     if( Err>0 ||C2F(errgst).err1>0) {
-       imode=abs(C2F(errgst).errct)/100000 % 8;
-       if (imode !=3) {
-       goto L97;
-       }
-     }
+         Scierror(999,_("%s: No more memory.\n"),"scifunction");
+         goto L9999;
+     }
+     /*     macro execution inside a builtin gateway*/
+     intop = Top;
+     Top = Top - Rhs + *number + *mrhs - 1;
+     ++C2F(recu).pt;
+     if (C2F(recu).pt > psiz) {
+         SciError(cx26);
+         goto L9999;
+     }
+     C2F(recu).ids[C2F(recu).pt * nsiz - nsiz] = Lhs;
+     C2F(recu).ids[C2F(recu).pt * nsiz - (nsiz-1)] = Rhs;
+     C2F(recu).rstk[C2F(recu).pt - 1] = 1001;
+     Lhs = *mlhs;
+     Rhs = *mrhs;
+     ++C2F(recu).niv;
      C2F(com).fun = 0;
-     goto L200;
-   }
-   if (Err > 0)  goto L97;
-   if ( isRecursionCallToFunction() )
-   {
-         int gw = getRecursionGatewayToCall();
-         if (gw == END_OVERLOAD)
-         {
-                 goto L96;
-         } 
-         else if (gw == ERROR_GW_ID)
-         {
-                 goto L89;
-         }
-         else
-         {
-                 k = gw;
-         }
-         goto L95;
-   }
-   if ( isRecursionCallToFunction() )
-   {
-         int gw = getRecursionGatewayToCall();
-         if (gw == END_OVERLOAD)
-         {
-                 goto L96;
-         } 
-         else if (gw == ERROR_GW_ID)
-         {
-                 goto L89;
-         }
-         else
-         {
-                 k = gw;
-         }
-         goto L95;
-   }
-  L89:
-   if (Top < Rhs) {
-     Scierror(22,_("%s: Recursion problems. Sorry ...\n"),"scifunction");
-     goto L97;
-   }
-   if (Top - Rhs + Lhs + 1 >= Bot) {
-     Scierror(18,_("%s: Too many names.\n"),"scifunction");
-     goto L97;
-   }
-   /*     ireftop used to reset top if an error occurs during 
-        the function evaluation*/
-   ireftop=Top-Max(0,Rhs);
-   goto L91;
-  L90:
-   if (Err > 0) goto L97;
-   /**/
-  L91:
-   k = C2F(com).fun;
-   C2F(com).fun = 0;
-   if (k == C2F(recu).krec) {
-     Scierror(22,_("%s: Recursion problems. Sorry ...\n"),"scifunction");
-     goto L97;
-   }
-   C2F(recu).krec = -1;
-   if (k == 0) goto L60;
-  L95:
-   if (! C2F(allowptr)(&k)) C2F(ref2val)();
-   C2F(recu).krec = k;
-   C2F(callinterf)(&k);
-   C2F(recu).krec = -1;
-   if (C2F(com).fun >= 0) {
-     if (Top - Lhs + 1 > 0) {
-       C2F(iset)(&Rhs, &cx0, &C2F(vstk).infstk[Top - Lhs], &cx1);
-     }
-     if(C2F(recu).paus > 0) goto L91;
-     if (C2F(errgst).err1 > 0) Top=ireftop;
-     goto L90;
-   }
-   /*    called interface ask for a scilab function to perform the function (fun=-1)
-    *     the function name is given in ids(1,pt+1)
-    */
-   /*     call ref2val removed here because if forces overloading function to
-    *     be called by value
-    C2F(ref2val)();*/
-   C2F(com).fun = 0;
-   C2F(funs)(&C2F(recu).ids[(C2F(recu).pt + 1)* nsiz - nsiz]);
-   if (Err > 0) goto L97;
-   if (C2F(com).fun > 0) {
-     if (C2F(isbyref)(&C2F(com).fun)==0) C2F(ref2val)();
+     C2F(com).fin = *ptr;
+     C2F(recu).icall = 5;
+     C2F(recu).krec = -1;
+     /* ************************** copied from callinter.h */
+ L60:
+     C2F(parse)();
+     /* parse has exited for a built-in evaluation */
+     if (C2F(com).fun == 99) {
+         if( Err>0 ||C2F(errgst).err1>0) {
+             imode=abs(C2F(errgst).errct)/100000 % 8;
+             if (imode !=3) {
+                 goto L97;
+             }
+         }
+         C2F(com).fun = 0;
+         goto L200;
+     }
+     if (Err > 0)  goto L97;
+     if ( isRecursionCallToFunction() )
+     {
+         int gw = getRecursionGatewayToCall();
+         if (gw == END_OVERLOAD)
+         {
+             goto L96;
 -        } 
++        }
+         else if (gw == ERROR_GW_ID)
+         {
+             goto L89;
+         }
+         else
+         {
+             k = gw;
+         }
+         goto L95;
+     }
+     if ( isRecursionCallToFunction() )
+     {
+         int gw = getRecursionGatewayToCall();
+         if (gw == END_OVERLOAD)
+         {
+             goto L96;
 -        } 
++        }
+         else if (gw == ERROR_GW_ID)
+         {
+             goto L89;
+         }
+         else
+         {
+             k = gw;
+         }
+         goto L95;
+     }
+ L89:
+     if (Top < Rhs) {
+         Scierror(22,_("%s: Recursion problems. Sorry ...\n"),"scifunction");
+         goto L97;
+     }
+     if (Top - Rhs + Lhs + 1 >= Bot) {
+         Scierror(18,_("%s: Too many names.\n"),"scifunction");
+         goto L97;
+     }
 -    /*     ireftop used to reset top if an error occurs during 
++    /*     ireftop used to reset top if an error occurs during
+     the function evaluation*/
+     ireftop=Top-Max(0,Rhs);
      goto L91;
-   }
-   if (Fin == 0) {
-     SciError(246);
+ L90:
      if (Err > 0) goto L97;
-     goto L90;
-   }
-   ++C2F(recu).pt;
-   Fin = *Lstk(C2F(com).fin);
-   C2F(recu).rstk[C2F(recu).pt - 1] = 910;
-   C2F(recu).icall = 5;
-   C2F(com).fun = 0;
-   /*     *call*  macro */
-   goto L60;
-  L96:
-   --C2F(recu).pt;
-   goto L90;
-  L97: /* error handling */
-   if((C2F(recu).niv > 0) && (C2F(recu).paus > 0)) {
-     C2F(com).fun=0;
+     /**/
+ L91:
+     k = C2F(com).fun;
+     C2F(com).fun = 0;
+     if (k == C2F(recu).krec) {
+         Scierror(22,_("%s: Recursion problems. Sorry ...\n"),"scifunction");
+         goto L97;
+     }
+     C2F(recu).krec = -1;
+     if (k == 0) goto L60;
+ L95:
+     if (! C2F(allowptr)(&k)) C2F(ref2val)();
+     C2F(recu).krec = k;
+     C2F(callinterf)(&k);
+     C2F(recu).krec = -1;
+     if (C2F(com).fun >= 0) {
+         if (Top - Lhs + 1 > 0) {
+             C2F(iset)(&Rhs, &cx0, &C2F(vstk).infstk[Top - Lhs], &cx1);
+         }
+         if(C2F(recu).paus > 0) goto L91;
+         if (C2F(errgst).err1 > 0) Top=ireftop;
+         goto L90;
+     }
+     /*    called interface ask for a scilab function to perform the function (fun=-1)
+     *     the function name is given in ids(1,pt+1)
+     */
+     /*     call ref2val removed here because if forces overloading function to
+     *     be called by value
+     C2F(ref2val)();*/
+     C2F(com).fun = 0;
+     C2F(funs)(&C2F(recu).ids[(C2F(recu).pt + 1)* nsiz - nsiz]);
+     if (Err > 0) goto L97;
+     if (C2F(com).fun > 0) {
+         if (C2F(isbyref)(&C2F(com).fun)==0) C2F(ref2val)();
+         goto L91;
+     }
+     if (Fin == 0) {
+         SciError(246);
+         if (Err > 0) goto L97;
+         goto L90;
+     }
+     ++C2F(recu).pt;
+     Fin = *Lstk(C2F(com).fin);
+     C2F(recu).rstk[C2F(recu).pt - 1] = 910;
+     C2F(recu).icall = 5;
+     C2F(com).fun = 0;
+     /*     *call*  macro */
      goto L60;
-   }
-   goto L9999;
-   /* ************************** end of copy*/
-   L200:
-   Lhs = C2F(recu).ids[C2F(recu).pt * nsiz -nsiz ];
-   Rhs = C2F(recu).ids[C2F(recu).pt * nsiz -(nsiz-1)];
-   --C2F(recu).pt;
-   --C2F(recu).niv;
-   /* + */
-   Top = intop;
-   ix1 = *mlhs;
-   intersci_pop();
-   for (ix = 1; ix <= ix1; ++ix) {
-     lw = Top - Rhs + *number + ix - 1;
-     C2F(intersci).ntypes[lw - 1] = '$';
-   }
-   return TRUE;
+ L96:
+     --C2F(recu).pt;
+     goto L90;
  
-  L9999:
-   Top = intop;
-   --C2F(recu).niv;
-   if(C2F(errgst).err1>0) {
+ L97: /* error handling */
+     if((C2F(recu).niv > 0) && (C2F(recu).paus > 0)) {
+         C2F(com).fun=0;
+         goto L60;
+     }
+     goto L9999;
+     /* ************************** end of copy*/
+ L200:
      Lhs = C2F(recu).ids[C2F(recu).pt * nsiz -nsiz ];
      Rhs = C2F(recu).ids[C2F(recu).pt * nsiz -(nsiz-1)];
      --C2F(recu).pt;
@@@ -2080,81 -2094,81 +2091,81 @@@ L9999
  
  int C2F(scistring)(int *ifirst,char *thestring,int *mlhs,int *mrhs,unsigned long thestring_len)
  {
-       int ret = FALSE;
-       int ifin = 0, ifun = 0, tops = 0, moutputs = 0;
-       int id[nsiz];
-       int lf = 0, op = 0, ile = 0, ils = 0, nnn = thestring_len, ninputs = 0;
-       if (nnn <= 2) 
-       {
-               op = C2F(getopcode)(thestring, thestring_len);
-       }
-       if (op == 0) 
-       {
-               C2F(cvname)(id, thestring, &cx0, nnn);
-               Fin = 0;
-               tops = Top;
-               Top = Top - Rhs + *ifirst + *mrhs - 1;
-               C2F(funs)(id);
-               Top = tops;
-               if (Fin == 0)
-               {
-                       Scierror(999,_("%s: %s is not a Scilab function.\n"),"scistring",get_fname(thestring,thestring_len));
-                       return ret;
-               }
-               if (C2F(com).fun <= 0) 
-               {
-                       lf = *Lstk(Fin);
-                       ils = iadr(lf) + 1;
-                       moutputs = *istk(ils);
-                       ile = ils + moutputs * nsiz + 1;
-                       ninputs = *istk(ile);
-                       /*
-                       *   ninputs=actual number of inputs, moutputs=actual number of outputs
-                       *   of thestring: checking mlhs=ninputs and mrhs=moutputs not done.
-                       */
-                       ret = C2F(scifunction)(ifirst, &lf, mlhs, mrhs);
-               } 
-               else 
-               {
-                       ifin = Fin;
-                       ifun = C2F(com).fun;
-                       ret = C2F(scibuiltin)(ifirst, &ifun, &ifin, mlhs, mrhs);
-               }
-       } 
-       else 
-       {
-               ret = C2F(sciops)(ifirst, &op, mlhs, mrhs);
-       }
-       return ret;
+     int ret = FALSE;
+     int ifin = 0, ifun = 0, tops = 0, moutputs = 0;
+     int id[nsiz];
+     int lf = 0, op = 0, ile = 0, ils = 0, nnn = thestring_len, ninputs = 0;
 -    if (nnn <= 2) 
++    if (nnn <= 2)
+     {
+         op = C2F(getopcode)(thestring, thestring_len);
+     }
 -    if (op == 0) 
++    if (op == 0)
+     {
+         C2F(cvname)(id, thestring, &cx0, nnn);
+         Fin = 0;
+         tops = Top;
+         Top = Top - Rhs + *ifirst + *mrhs - 1;
+         C2F(funs)(id);
+         Top = tops;
+         if (Fin == 0)
+         {
+             Scierror(999,_("%s: %s is not a Scilab function.\n"),"scistring",get_fname(thestring,thestring_len));
+             return ret;
+         }
 -        if (C2F(com).fun <= 0) 
++        if (C2F(com).fun <= 0)
+         {
+             lf = *Lstk(Fin);
+             ils = iadr(lf) + 1;
+             moutputs = *istk(ils);
+             ile = ils + moutputs * nsiz + 1;
+             ninputs = *istk(ile);
+             /*
+             *   ninputs=actual number of inputs, moutputs=actual number of outputs
+             *   of thestring: checking mlhs=ninputs and mrhs=moutputs not done.
+             */
+             ret = C2F(scifunction)(ifirst, &lf, mlhs, mrhs);
 -        } 
 -        else 
++        }
++        else
+         {
+             ifin = Fin;
+             ifun = C2F(com).fun;
+             ret = C2F(scibuiltin)(ifirst, &ifun, &ifin, mlhs, mrhs);
+         }
 -    } 
 -    else 
++    }
++    else
+     {
+         ret = C2F(sciops)(ifirst, &op, mlhs, mrhs);
+     }
+     return ret;
  }
  
  int C2F(getopcode)(char *string,unsigned long string_len)
  {
-       unsigned char ch = string[0];
-       int op = 0;
-       if (  string_len >= 2) 
-       {
-               /* .op  or op. */
-               if ( ch  == '.') ch = string[1];
-               op += 51;
-       }
-       switch ( ch )
-       {
-               case  '*'  :  op += 47; break;
-               case  '+'  :  op += 45; break;
-               case  '-'  :  op += 46; break;
-               case  '\'' :  op += 53; break;
-               case  '/'  :  op += 48; break;
-               case  '\\' :  op += 49; break;
-               case  '^'  :  op += 62; break;
-               default : op = 0; break;
-       }
-       return op;
+     unsigned char ch = string[0];
+     int op = 0;
 -    if (  string_len >= 2) 
++    if (  string_len >= 2)
+     {
+         /* .op  or op. */
+         if ( ch  == '.') ch = string[1];
+         op += 51;
+     }
+     switch ( ch )
+     {
+     case  '*'  :  op += 47; break;
+     case  '+'  :  op += 45; break;
+     case  '-'  :  op += 46; break;
+     case  '\'' :  op += 53; break;
+     case  '/'  :  op += 48; break;
+     case  '\\' :  op += 49; break;
+     case  '^'  :  op += 62; break;
+     default : op = 0; break;
+     }
+     return op;
  }
  
  /*---------------------------------------------------------------------
  
  int C2F(scibuiltin)(int *number,int *ifun,int *ifin,int *mlhs,int *mrhs)
  {
-   int srhs, slhs;
-   int ix, k, intop, lw, pt0;
-   int imode,ireftop;
-   intop = Top;
+     int srhs, slhs;
+     int ix, k, intop, lw, pt0;
+     int imode,ireftop;
+     intop = Top;
  
-   if ( intersci_push() == 0 )
+     if ( intersci_push() == 0 )
      {
-       Scierror(999,_("%s: No more memory.\n"),"scifunction");
-       goto L9999;
-     }
-   Top = Top - Rhs + *number + *mrhs - 1;
-   slhs = Lhs;
-   srhs = Rhs;
-   Lhs = *mlhs;
-   Rhs = *mrhs;
-   C2F(recu).krec = -1;
-   pt0 = C2F(recu).pt;
-   ++C2F(recu).niv;
-   goto L90;
-   /* ***************************** copied from callinter.h  */
-  L60:
-   C2F(parse)();
-   if (C2F(com).fun == 99) {
-     if( Err>0 ||C2F(errgst).err1>0) {
-       imode=abs(C2F(errgst).errct)/100000 % 8;
-       if (imode !=3) goto L97;
-     }
-     C2F(com).fun = 0;
-     goto L200;
-   }
-   if (Err > 0) goto L97;
-   if ( isRecursionCallToFunction() )
-   {
-         int gw = getRecursionGatewayToCall();
-         if (gw == END_OVERLOAD)
-         {
-                 goto L96;
-         } 
-         else if (gw == ERROR_GW_ID)
-         {
-                 goto L89;
-         }
-         else
-         {
-                 k = gw;
-         }
-         goto L95;
-   }
-  L89:
-   if (Top < Rhs) {
-     Scierror(22,_("%s: Recursion problems. Sorry ...\n"),_("built in"));
-     goto L97;
-   }
-   if (Top - Rhs + Lhs + 1 >= Bot) {
-     Scierror(18,_("%s: Too many names.\n"),"");
-     goto L97;
-   }
-   /*     ireftop used to reset top if an error occurs during 
-        the function evaluation*/
-   ireftop=Top-Max(0,Rhs);
-   goto L91;
-  L90:
-   if (Err > 0)  goto L97;
-   /**/
-  L91:
-   k = C2F(com).fun;
-   C2F(com).fun = 0;
-   if (k == C2F(recu).krec) {
-     Scierror(22,_("%s: Recursion problems. Sorry ...\n"),_("built in"));
-     goto L9999;
-   }
-   C2F(recu).krec = -1;
-   if (k == 0)  goto L60;
-  L95:
-   if (! C2F(allowptr)(&k))  C2F(ref2val)();
-   C2F(recu).krec = k;
-   C2F(callinterf)(&k);
-   C2F(recu).krec = -1;
-   if (C2F(com).fun >= 0) {
-     if (Top - Lhs + 1 > 0) {
-       C2F(iset)(&Lhs, &cx0, &C2F(vstk).infstk[Top - Lhs], &cx1);
-     }
-     if(C2F(recu).paus > 0) goto L91;
-     if (C2F(errgst).err1 > 0) Top=ireftop;
+         Scierror(999,_("%s: No more memory.\n"),"scifunction");
+         goto L9999;
+     }
+     Top = Top - Rhs + *number + *mrhs - 1;
+     slhs = Lhs;
+     srhs = Rhs;
+     Lhs = *mlhs;
+     Rhs = *mrhs;
+     C2F(recu).krec = -1;
+     pt0 = C2F(recu).pt;
+     ++C2F(recu).niv;
      goto L90;
-   }
-   /*    called interface ask for a sci function to perform the function (fun=-1)*/
-   /*     the function name is given in ids(1,pt+1) */
-   C2F(ref2val)();
-   C2F(com).fun = 0;
-   C2F(funs)(&C2F(recu).ids[(C2F(recu).pt + 1)* nsiz - nsiz]);
-   if (Err > 0)  goto L97;
-   if (C2F(com).fun > 0) {
-     if (C2F(isbyref)(&C2F(com).fun)==0) C2F(ref2val)();
-     goto L91;
-   }
-   if (Fin == 0) {
-     SciError(246);
+     /* ***************************** copied from callinter.h  */
+ L60:
+     C2F(parse)();
+     if (C2F(com).fun == 99) {
+         if( Err>0 ||C2F(errgst).err1>0) {
+             imode=abs(C2F(errgst).errct)/100000 % 8;
+             if (imode !=3) goto L97;
+         }
+         C2F(com).fun = 0;
+         goto L200;
+     }
      if (Err > 0) goto L97;
-     goto L90;
-   }
-   ++C2F(recu).pt;
-   Fin = *Lstk(C2F(com).fin);
-   C2F(recu).rstk[C2F(recu).pt - 1] = 910;
-   C2F(recu).icall = 5;
-   C2F(com).fun = 0;
-   /*     *call*  macro */
-   goto L60;
-  L96:
-   --C2F(recu).pt;
-   goto L90;
-  L97: /* error handling */
-   if((C2F(recu).niv > 0) && (C2F(recu).paus > 0)) {
-     C2F(com).fun=0;
+     if ( isRecursionCallToFunction() )
+     {
+         int gw = getRecursionGatewayToCall();
+         if (gw == END_OVERLOAD)
+         {
+             goto L96;
 -        } 
++        }
+         else if (gw == ERROR_GW_ID)
+         {
+             goto L89;
+         }
+         else
+         {
+             k = gw;
+         }
+         goto L95;
+     }
+ L89:
+     if (Top < Rhs) {
+         Scierror(22,_("%s: Recursion problems. Sorry ...\n"),_("built in"));
+         goto L97;
+     }
+     if (Top - Rhs + Lhs + 1 >= Bot) {
+         Scierror(18,_("%s: Too many names.\n"),"");
+         goto L97;
+     }
 -    /*     ireftop used to reset top if an error occurs during 
++    /*     ireftop used to reset top if an error occurs during
+     the function evaluation*/
+     ireftop=Top-Max(0,Rhs);
+     goto L91;
+ L90:
+     if (Err > 0)  goto L97;
+     /**/
+ L91:
+     k = C2F(com).fun;
+     C2F(com).fun = 0;
+     if (k == C2F(recu).krec) {
+         Scierror(22,_("%s: Recursion problems. Sorry ...\n"),_("built in"));
+         goto L9999;
+     }
+     C2F(recu).krec = -1;
+     if (k == 0)  goto L60;
+ L95:
+     if (! C2F(allowptr)(&k))  C2F(ref2val)();
+     C2F(recu).krec = k;
+     C2F(callinterf)(&k);
+     C2F(recu).krec = -1;
+     if (C2F(com).fun >= 0) {
+         if (Top - Lhs + 1 > 0) {
+             C2F(iset)(&Lhs, &cx0, &C2F(vstk).infstk[Top - Lhs], &cx1);
+         }
+         if(C2F(recu).paus > 0) goto L91;
+         if (C2F(errgst).err1 > 0) Top=ireftop;
+         goto L90;
+     }
+     /*    called interface ask for a sci function to perform the function (fun=-1)*/
+     /*     the function name is given in ids(1,pt+1) */
+     C2F(ref2val)();
+     C2F(com).fun = 0;
+     C2F(funs)(&C2F(recu).ids[(C2F(recu).pt + 1)* nsiz - nsiz]);
+     if (Err > 0)  goto L97;
+     if (C2F(com).fun > 0) {
+         if (C2F(isbyref)(&C2F(com).fun)==0) C2F(ref2val)();
+         goto L91;
+     }
+     if (Fin == 0) {
+         SciError(246);
+         if (Err > 0) goto L97;
+         goto L90;
+     }
+     ++C2F(recu).pt;
+     Fin = *Lstk(C2F(com).fin);
+     C2F(recu).rstk[C2F(recu).pt - 1] = 910;
+     C2F(recu).icall = 5;
+     C2F(com).fun = 0;
+     /*     *call*  macro */
      goto L60;
-   }
-   /* ************************** end of copy */
-  L200:
-   Lhs = slhs;
-   Rhs = srhs;
-   --C2F(recu).niv;
-   Top = intop;
-   intersci_pop();
-   for (ix = 0 ; ix < *mlhs ; ++ix) {
-     lw = Top - Rhs + *number + ix ;
-     C2F(intersci).ntypes[lw - 1] = '$';
-   }
-   return TRUE;
-  L9999:
-   Top = intop;
-   --C2F(recu).niv;
-   intersci_pop();
-   return FALSE;
+ L96:
+     --C2F(recu).pt;
+     goto L90;
+ L97: /* error handling */
+     if((C2F(recu).niv > 0) && (C2F(recu).paus > 0)) {
+         C2F(com).fun=0;
+         goto L60;
+     }
+     /* ************************** end of copy */
+ L200:
+     Lhs = slhs;
+     Rhs = srhs;
+     --C2F(recu).niv;
+     Top = intop;
+     intersci_pop();
+     for (ix = 0 ; ix < *mlhs ; ++ix) {
+         lw = Top - Rhs + *number + ix ;
+         C2F(intersci).ntypes[lw - 1] = '$';
+     }
+     return TRUE;
+ L9999:
+     Top = intop;
+     --C2F(recu).niv;
+     intersci_pop();
+     return FALSE;
  }
  
  /*---------------------------------------------------------------------
@@@ -2496,49 -2510,49 +2507,49 @@@ int C2F(maxvol)(int *lw,char *lw_type,u
  
  static int Check_references()
  {
-       int ivar ;
-       for (ivar = 1; ivar <= Rhs ; ++ivar)
-               {
-                       unsigned char Type = (unsigned char)C2F(intersci).ntypes[ivar - 1];
-                       if ( Type != '$')
-                               {
-                                       int lw = ivar + Top - Rhs;
-                                       int il = iadr(*Lstk(lw));
-                                       if ( *istk(il) < 0)
-                                               {
-                                                       int m,n,it,size;
-                                                       /* back conversion if necessary of a reference */
-                                                       if ( *istk(il) < 0)  il = iadr(*istk(il +1));
-                                                       m =*istk(il +1);
-                                                       n =*istk(il +2);
-                                                       it = *istk(il +3);
-                                                       switch ( Type ) {
-                                                               case 'i' :
-                                                               case 'r' :
-                                                               case 'd' :
-                                                                       size  = m * n * (it + 1); 
-                                                                       break;
-                                                               case 'z' :
-                                                                       size  = 0;
-                                                                       break; /* size is unsued for 'z' in ConvertData;*/
-                                                               case 'c' :
-                                                                       size =*istk(il + 4  +1) - *istk(il + 4 ); 
-                                                                       break;
-                                                               case 'b' :
-                                                                       size = m*n ; 
-                                                                       break;
-                                                               default:
-                                                                       return FALSE;
-                                                       }
-                                                       ConvertData(&Type,size,C2F(intersci).lad[ivar - 1]);
-                                                       C2F(intersci).ntypes[ivar - 1] = '$';
-                                               }
-                               }
-                       else
-                               {
-                               }
-               }
-       return TRUE;
+     int ivar ;
+     for (ivar = 1; ivar <= Rhs ; ++ivar)
+     {
+         unsigned char Type = (unsigned char)C2F(intersci).ntypes[ivar - 1];
+         if ( Type != '$')
+         {
+             int lw = ivar + Top - Rhs;
+             int il = iadr(*Lstk(lw));
+             if ( *istk(il) < 0)
+             {
+                 int m,n,it,size;
+                 /* back conversion if necessary of a reference */
+                 if ( *istk(il) < 0)  il = iadr(*istk(il +1));
+                 m =*istk(il +1);
+                 n =*istk(il +2);
+                 it = *istk(il +3);
+                 switch ( Type ) {
+                                 case 'i' :
+                                 case 'r' :
+                                 case 'd' :
 -                                    size  = m * n * (it + 1); 
++                                    size  = m * n * (it + 1);
+                                     break;
+                                 case 'z' :
+                                     size  = 0;
+                                     break; /* size is unsued for 'z' in ConvertData;*/
+                                 case 'c' :
 -                                    size =*istk(il + 4  +1) - *istk(il + 4 ); 
++                                    size =*istk(il + 4  +1) - *istk(il + 4 );
+                                     break;
+                                 case 'b' :
 -                                    size = m*n ; 
++                                    size = m*n ;
+                                     break;
+                                 default:
+                                     return FALSE;
+                 }
+                 ConvertData(&Type,size,C2F(intersci).lad[ivar - 1]);
+                 C2F(intersci).ntypes[ivar - 1] = '$';
+             }
+         }
+         else
+         {
+         }
+     }
+     return TRUE;
  }
  
  
@@@ -2928,34 -2942,34 +2939,34 @@@ char *ArgPosition(int i
  
  char *ArgsPosition(int i,int j)
  {
-   char * tmp_buffer_1 = NULL, * tmp_buffer_2 = NULL;
-   if ( i > 0 && i <= 4 )
+     char * tmp_buffer_1 = NULL, * tmp_buffer_2 = NULL;
+     if ( i > 0 && i <= 4 )
      {
-       if ( j > 0 && j <= 4 ) {
-       tmp_buffer_1 = CharPosition(i-1);
-       tmp_buffer_2 = CharPosition(j-1);
-       sprintf(arg_position,_("%s and %s arguments"),tmp_buffer_1,tmp_buffer_2);
-       FREE(tmp_buffer_1);
-       FREE(tmp_buffer_2);
-       }
-       else 
-       {
-         tmp_buffer_1 = CharPosition(i-1);
-         sprintf(arg_position,_("%s argument and argument %d"),tmp_buffer_1,j);
-         FREE(tmp_buffer_1);
-       }
-     }
-   else
+         if ( j > 0 && j <= 4 ) {
+             tmp_buffer_1 = CharPosition(i-1);
+             tmp_buffer_2 = CharPosition(j-1);
+             sprintf(arg_position,_("%s and %s arguments"),tmp_buffer_1,tmp_buffer_2);
+             FREE(tmp_buffer_1);
+             FREE(tmp_buffer_2);
+         }
 -        else 
++        else
+         {
+             tmp_buffer_1 = CharPosition(i-1);
+             sprintf(arg_position,_("%s argument and argument %d"),tmp_buffer_1,j);
+             FREE(tmp_buffer_1);
+         }
+     }
+     else
      {
-       if ( j > 0 && j <= 4 ) {
-       tmp_buffer_1 = CharPosition(j-1);
-       sprintf(arg_position,_("%s argument and argument %d"),tmp_buffer_1,i);
-       FREE(tmp_buffer_1);
-       }
-       else
-       sprintf(arg_position,_("arguments %d and %d"),i,j);
+         if ( j > 0 && j <= 4 ) {
+             tmp_buffer_1 = CharPosition(j-1);
+             sprintf(arg_position,_("%s argument and argument %d"),tmp_buffer_1,i);
+             FREE(tmp_buffer_1);
+         }
+         else
+             sprintf(arg_position,_("arguments %d and %d"),i,j);
      }
-   return arg_position;
+     return arg_position;
  }
  
  
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -57,9 -55,9 +57,9 @@@ modulename=dynamic_lin
  
  #### dynamic_link : Conf files ####
  libscidynamic_link_la_rootdir = $(mydatadir)
- libscidynamic_link_la_root_DATA =  license.txt version.xml
+ libscidynamic_link_la_root_DATA =  license.txt 
  
 -#### dynamic_link : init scripts #### 
 +#### dynamic_link : init scripts ####
  libscidynamic_link_la_etcdir = $(mydatadir)/etc
  libscidynamic_link_la_etc_DATA = etc/dynamic_link.quit etc/dynamic_link.start
  
@@@ -482,9 -474,9 +482,9 @@@ modulename = dynamic_lin
  
  #### dynamic_link : Conf files ####
  libscidynamic_link_la_rootdir = $(mydatadir)
- libscidynamic_link_la_root_DATA = license.txt version.xml
+ libscidynamic_link_la_root_DATA = license.txt 
  
 -#### dynamic_link : init scripts #### 
 +#### dynamic_link : init scripts ####
  libscidynamic_link_la_etcdir = $(mydatadir)/etc
  libscidynamic_link_la_etc_DATA = etc/dynamic_link.quit etc/dynamic_link.start
  
Simple merge
@@@ -440,10 -436,9 +441,10 @@@ target_alias = @target_alias
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 +yacc_present = @yacc_present@
  modulename = fftw
  pkglib_LTLIBRARIES = libscifftw.la
- noinst_LTLIBRARIES = libscifftw-algo.la
+ @FFTW_TRUE@noinst_LTLIBRARIES = libscifftw-algo.la
  libscifftw_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION) $(FFTW3_LIB)
  
  #### fftw : Conf files ####
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -18,9 -18,6 +18,8 @@@
  ;
  #define FILEIO "fileio"
  ;
 +Source: bin\{#FILEIO}_gw.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 +;
- Source: modules\{#FILEIO}\VERSION.xml; DestDir: {app}\modules\{#FILEIO}; Components: {#COMPN_SCILAB}
  Source: modules\{#FILEIO}\license.txt; DestDir: {app}\modules\{#FILEIO}; Components: {#COMPN_SCILAB}
  ;
  Source: modules\{#FILEIO}\sci_gateway\{#FILEIO}_gateway.xml; DestDir: {app}\modules\{#FILEIO}\sci_gateway; Components: {#COMPN_SCILAB}
Simple merge
@@@ -1,12 -1,12 +1,13 @@@
  /*
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2006 - INRIA - Pierre MARECHAL
 +* Copyright (C) 2011 - Digiteo - Cedric DELAMARRE
+ * Copyright (C) 2011 - DIGITEO - Allan CORNET
 -* 
 +*
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
--* are also available at    
++* are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  */
  #include "getrelativefilename.h"
  #include "MALLOC.h"
  #include "PATH_MAX.h"
+ #include "strsubst.h"
+ /* ================================================================================== */
+ static char *normalizeFileSeparator(const char *path);
++static wchar_t *normalizeFileSeparatorW(const wchar_t *path);
  /* ================================================================================== */
  // getrelativefilename
  //
  // For example, if the current directory is C:\foo\bar and the filename C:\foo\whee\text.txt is given,
  // GetRelativeFilename will return ..\whee\text.txt.
  /* ================================================================================== */
  char* getrelativefilename(char *currentDirectory, char *absoluteFilename)
  {
-       // declarations - put here so this should work in a C compiler
-       int afMarker = 0, rfMarker = 0;
-       int cdLen = 0, afLen = 0;
-       int i = 0;
-       int levels = 0;
-       char *relativeFilename= (char*)MALLOC(PATH_MAX*sizeof(char));
-       cdLen = (int)strlen(currentDirectory);
-       afLen = (int)strlen(absoluteFilename);
-       // make sure the names are not too short
-       if( cdLen < ABSOLUTE_NAME_START+1 || afLen < ABSOLUTE_NAME_START+1)
-       {
-               // fix bug 2181
-               strcpy(relativeFilename, absoluteFilename);
-               return relativeFilename;
-       }
-       // Handle DOS names that are on different drives:
-       if(tolower(currentDirectory[0]) != tolower(absoluteFilename[0]))
-       {
-               // not on the same drive, so only absolute filename will do
-               strcpy(relativeFilename, absoluteFilename);
-               return relativeFilename;
-       }
-       // they are on the same drive, find out how much of the current directory
-       // is in the absolute filename
-       i = ABSOLUTE_NAME_START;
+     // declarations - put here so this should work in a C compiler
+     int afMarker = 0, rfMarker = 0;
+     int cdLen = 0, afLen = 0;
+     int i = 0;
+     int levels = 0;
+     char *relativeFilename= (char*)MALLOC(PATH_MAX*sizeof(char));
+     char *_currentDirectory = normalizeFileSeparator(currentDirectory);
+     char *_absoluteFilename = normalizeFileSeparator(absoluteFilename);
+     cdLen = (int)strlen(_currentDirectory);
+     afLen = (int)strlen(_absoluteFilename);
+     // make sure the names are not too short
+     if( cdLen < ABSOLUTE_NAME_START+1 || afLen < ABSOLUTE_NAME_START+1)
+     {
+         // fix bug 2181
+         strcpy(relativeFilename, _absoluteFilename);
+         if (_currentDirectory) {FREE(_currentDirectory); _currentDirectory = NULL;}
+         if (_absoluteFilename) {FREE(_absoluteFilename); _absoluteFilename = NULL;}
+         return relativeFilename;
+     }
+     // Handle DOS names that are on different drives:
+     if(tolower(_currentDirectory[0]) != tolower(_absoluteFilename[0]))
+     {
+         // not on the same drive, so only absolute filename will do
+         strcpy(relativeFilename, _absoluteFilename);
+         if (_currentDirectory) {FREE(_currentDirectory); _currentDirectory = NULL;}
+         if (_absoluteFilename) {FREE(_absoluteFilename); _absoluteFilename = NULL;}
+         return relativeFilename;
+     }
+     // they are on the same drive, find out how much of the current directory
+     // is in the absolute filename
+     i = ABSOLUTE_NAME_START;
  
  #if defined(_MSC_VER)
-       while(i < afLen && i < cdLen && tolower(currentDirectory[i])==tolower(absoluteFilename[i]) )
-       {
-               i++;
-       }
+     while(i < afLen && i < cdLen && tolower(_currentDirectory[i]) == tolower(_absoluteFilename[i]) )
+     {
+         i++;
+     }
  #else
-       while(i < afLen && i < cdLen && currentDirectory[i] == absoluteFilename[i])
-       {
-               i++;
-       }
+     while(i < afLen && i < cdLen && _currentDirectory[i] == _absoluteFilename[i])
+     {
+         i++;
+     }
  #endif
  
-       if(i == cdLen && (absoluteFilename[i] == DIR_SEPARATOR[0] || absoluteFilename[i-1] == DIR_SEPARATOR[0]))
-       {
-               // the whole current directory name is in the file name,
-               // so we just trim off the current directory name to get the
-               // current file name.
-               if(absoluteFilename[i] == DIR_SEPARATOR[0])
-               {
-                       // a directory name might have a trailing slash but a relative
-                       // file name should not have a leading one...
-                       i++;
-               }
-               strcpy(relativeFilename, &absoluteFilename[i]);
-               return relativeFilename;
-       }
-       // The file is not in a child directory of the current directory, so we
-       // need to step back the appropriate number of parent directories by
-       // using "..\"s.  First find out how many levels deeper we are than the
-       // common directory
-       afMarker = i;
-       levels = 1;
-       // count the number of directory levels we have to go up to get to the
-       // common directory
-       while(i < cdLen)
-       {
-               i++;
-               if(currentDirectory[i] == DIR_SEPARATOR[0])
-               {
-                       // make sure it's not a trailing slash
-                       i++;
-                       if(currentDirectory[i] != '\0')
-                       {
-                               levels++;
-                       }
-               }
-       }
-       // move the absolute filename marker back to the start of the directory name
-       // that it has stopped in.
-       while(afMarker > 0 && absoluteFilename[afMarker-1] != DIR_SEPARATOR[0])
-       {
-               afMarker--;
-       }
-       // check that the result will not be too long
-       if(levels * 3 + afLen - afMarker > PATH_MAX)
-       {
-               return NULL;
-       }
-       // add the appropriate number of "..\"s.
-       rfMarker = 0;
-       for(i = 0; i < levels; i++)
-       {
-               relativeFilename[rfMarker++] = '.';
-               relativeFilename[rfMarker++] = '.';
-               relativeFilename[rfMarker++] = DIR_SEPARATOR[0];
-       }
-       // copy the rest of the filename into the result string
-       strcpy(&relativeFilename[rfMarker], &absoluteFilename[afMarker]);
-       return relativeFilename;
+     if(i == cdLen && (_absoluteFilename[i] == DIR_SEPARATOR[0] || _absoluteFilename[i-1] == DIR_SEPARATOR[0]))
+     {
+         // the whole current directory name is in the file name,
+         // so we just trim off the current directory name to get the
+         // current file name.
+         if(_absoluteFilename[i] == DIR_SEPARATOR[0])
+         {
+             // a directory name might have a trailing slash but a relative
+             // file name should not have a leading one...
+             i++;
+         }
+         strcpy(relativeFilename, &_absoluteFilename[i]);
+         if (_currentDirectory) {FREE(_currentDirectory); _currentDirectory = NULL;}
+         if (_absoluteFilename) {FREE(_absoluteFilename); _absoluteFilename = NULL;}
+         return relativeFilename;
+     }
+     // The file is not in a child directory of the current directory, so we
+     // need to step back the appropriate number of parent directories by
+     // using "..\"s.  First find out how many levels deeper we are than the
+     // common directory
+     afMarker = i;
+     levels = 1;
+     // count the number of directory levels we have to go up to get to the
+     // common directory
+     while(i < cdLen)
+     {
+         i++;
+         if(_currentDirectory[i] == DIR_SEPARATOR[0])
+         {
+             // make sure it's not a trailing slash
+             i++;
+             if(_currentDirectory[i] != '\0')
+             {
+                 levels++;
+             }
+         }
+     }
+     // move the absolute filename marker back to the start of the directory name
+     // that it has stopped in.
+     while(afMarker > 0 && _absoluteFilename[afMarker-1] != DIR_SEPARATOR[0])
+     {
+         afMarker--;
+     }
+     // check that the result will not be too long
+     if(levels * 3 + afLen - afMarker > PATH_MAX)
+     {
+         if (_currentDirectory) {FREE(_currentDirectory); _currentDirectory = NULL;}
+         if (_absoluteFilename) {FREE(_absoluteFilename); _absoluteFilename = NULL;}
+         return NULL;
+     }
+     // add the appropriate number of "..\"s.
+     rfMarker = 0;
+     for(i = 0; i < levels; i++)
+     {
+         relativeFilename[rfMarker++] = '.';
+         relativeFilename[rfMarker++] = '.';
+         relativeFilename[rfMarker++] = DIR_SEPARATOR[0];
+     }
+     // copy the rest of the filename into the result string
+     strcpy(&relativeFilename[rfMarker], &_absoluteFilename[afMarker]);
+     if (_currentDirectory) {FREE(_currentDirectory); _currentDirectory = NULL;}
+     if (_absoluteFilename) {FREE(_absoluteFilename); _absoluteFilename = NULL;}
+     return relativeFilename;
  }
 +
 +wchar_t* getrelativefilenameW(wchar_t *currentDirectory, wchar_t *absoluteFilename)
 +{
 +      // declarations - put here so this should work in a C compiler
 +      int afMarker = 0, rfMarker = 0;
 +      int cdLen = 0, afLen = 0;
 +      int i = 0;
 +      int levels = 0;
 +      wchar_t *relativeFilename= (wchar_t*)MALLOC(PATH_MAX*sizeof(wchar_t));
++    wchar_t *_currentDirectory = normalizeFileSeparatorW(currentDirectory);
++    wchar_t *_absoluteFilename = normalizeFileSeparatorW(absoluteFilename);
 +
-       cdLen = (int)wcslen(currentDirectory);
-       afLen = (int)wcslen(absoluteFilename);
++      cdLen = (int)wcslen(_currentDirectory);
++      afLen = (int)wcslen(_absoluteFilename);
 +
 +      // make sure the names are not too short
 +      if( cdLen < ABSOLUTE_NAME_START+1 || afLen < ABSOLUTE_NAME_START+1)
 +      {
 +              // fix bug 2181
-               wcscpy(relativeFilename, absoluteFilename);
++              wcscpy(relativeFilename, _absoluteFilename);
 +              return relativeFilename;
 +      }
 +
 +      // Handle DOS names that are on different drives:
-       if(tolower(currentDirectory[0]) != tolower(absoluteFilename[0]))
++      if(tolower(_currentDirectory[0]) != tolower(_absoluteFilename[0]))
 +      {
 +              // not on the same drive, so only absolute filename will do
-               wcscpy(relativeFilename, absoluteFilename);
++              wcscpy(relativeFilename, _absoluteFilename);
 +              return relativeFilename;
 +      }
 +
 +      // they are on the same drive, find out how much of the current directory
 +      // is in the absolute filename
 +      i = ABSOLUTE_NAME_START;
 +
 +#if defined(_MSC_VER)
-       while(i < afLen && i < cdLen && tolower(currentDirectory[i])==tolower(absoluteFilename[i]) )
++      while(i < afLen && i < cdLen && tolower(_currentDirectory[i])==tolower(_absoluteFilename[i]) )
 +      {
 +              i++;
 +      }
 +#else
-       while(i < afLen && i < cdLen && currentDirectory[i] == absoluteFilename[i])
++      while(i < afLen && i < cdLen && _currentDirectory[i] == _absoluteFilename[i])
 +      {
 +              i++;
 +      }
 +#endif
 +
-       if(i == cdLen && (absoluteFilename[i] == DIR_SEPARATOR[0] || absoluteFilename[i-1] == DIR_SEPARATOR[0]))
++      if(i == cdLen && (_absoluteFilename[i] == DIR_SEPARATOR[0] || _absoluteFilename[i-1] == DIR_SEPARATOR[0]))
 +      {
 +              // the whole current directory name is in the file name,
 +              // so we just trim off the current directory name to get the
 +              // current file name.
-               if(absoluteFilename[i] == DIR_SEPARATOR[0])
++              if(_absoluteFilename[i] == DIR_SEPARATOR[0])
 +              {
 +                      // a directory name might have a trailing slash but a relative
 +                      // file name should not have a leading one...
 +                      i++;
 +              }
 +
-               wcscpy(relativeFilename, &absoluteFilename[i]);
++              wcscpy(relativeFilename, &_absoluteFilename[i]);
 +              return relativeFilename;
 +      }
 +
 +      // The file is not in a child directory of the current directory, so we
 +      // need to step back the appropriate number of parent directories by
 +      // using "..\"s.  First find out how many levels deeper we are than the
 +      // common directory
 +      afMarker = i;
 +      levels = 1;
 +
 +      // count the number of directory levels we have to go up to get to the
 +      // common directory
 +      while(i < cdLen)
 +      {
 +              i++;
-               if(currentDirectory[i] == DIR_SEPARATOR[0])
++              if(_currentDirectory[i] == DIR_SEPARATOR[0])
 +              {
 +                      // make sure it's not a trailing slash
 +                      i++;
 +                      if(currentDirectory[i] != '\0')
 +                      {
 +                              levels++;
 +                      }
 +              }
 +      }
 +
 +      // move the absolute filename marker back to the start of the directory name
 +      // that it has stopped in.
-       while(afMarker > 0 && absoluteFilename[afMarker-1] != DIR_SEPARATOR[0])
++      while(afMarker > 0 && _absoluteFilename[afMarker-1] != DIR_SEPARATOR[0])
 +      {
 +              afMarker--;
 +      }
 +
 +      // check that the result will not be too long
 +      if(levels * 3 + afLen - afMarker > PATH_MAX)
 +      {
 +              return NULL;
 +      }
 +
 +      // add the appropriate number of "..\"s.
 +      rfMarker = 0;
 +      for(i = 0; i < levels; i++)
 +      {
 +              relativeFilename[rfMarker++] = '.';
 +              relativeFilename[rfMarker++] = '.';
 +              relativeFilename[rfMarker++] = DIR_SEPARATOR[0];
 +      }
 +
 +      // copy the rest of the filename into the result string
-       wcscpy(&relativeFilename[rfMarker], &absoluteFilename[afMarker]);
++      wcscpy(&relativeFilename[rfMarker], &_absoluteFilename[afMarker]);
 +
 +      return relativeFilename;
 +}
 +
+ /* ================================================================================== */
+ char *normalizeFileSeparator(const char *path)
+ {
+ #define WINDOWS_FILESEPARATOR "\\"
+ #define OTHERS_FILESEPARATOR "/"
+     char *normalizedPath = NULL;
+     if (path)
+     {
+ #ifdef _MSC_VER
+         normalizedPath = strsub((char*)path, OTHERS_FILESEPARATOR, DIR_SEPARATOR);
+ #else
+         normalizedPath = strsub((char*)path, WINDOWS_FILESEPARATOR, DIR_SEPARATOR);
+ #endif
+     }
+     return normalizedPath;
+ }
++
++wchar_t *normalizeFileSeparatorW(const wchar_t *path)
++{
++    // TODO : Implement strsubW to have same behaviour.
++    return path;
++}
+ /* ================================================================================== */
++
Simple merge
Simple merge
@@@ -20,9 -20,7 +20,8 @@@
  ;
  Source: bin\{#FUNCTIONS}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  Source: bin\{#FUNCTIONS}_f.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 +Source: bin\{#FUNCTIONS}_gw.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#FUNCTIONS}\VERSION.xml; DestDir: {app}\modules\{#FUNCTIONS}; Components: {#COMPN_SCILAB}
  Source: modules\{#FUNCTIONS}\license.txt; DestDir: {app}\modules\{#FUNCTIONS}; Components: {#COMPN_SCILAB}
  ;
  Source: modules\{#FUNCTIONS}\sci_gateway\{#FUNCTIONS}_gateway.xml; DestDir: {app}\modules\{#FUNCTIONS}\sci_gateway; Components: {#COMPN_SCILAB}
index cc164bf,0000000..b19d022
mode 100644,000000..100644
--- /dev/null
@@@ -1,920 -1,0 +1,920 @@@
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
 +# @configure_input@
 +
 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
 +# with or without modifications, as long as this notice is preserved.
 +
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 +# PARTICULAR PURPOSE.
 +
 +@SET_MAKE@
 +
 +
 +VPATH = @srcdir@
 +pkgdatadir = $(datadir)/@PACKAGE@
 +pkgincludedir = $(includedir)/@PACKAGE@
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
 +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 +install_sh_DATA = $(install_sh) -c -m 644
 +install_sh_PROGRAM = $(install_sh) -c
 +install_sh_SCRIPT = $(install_sh) -c
 +INSTALL_HEADER = $(INSTALL_DATA)
 +transform = $(program_transform_name)
 +NORMAL_INSTALL = :
 +PRE_INSTALL = :
 +POST_INSTALL = :
 +NORMAL_UNINSTALL = :
 +PRE_UNINSTALL = :
 +POST_UNINSTALL = :
 +build_triplet = @build@
 +host_triplet = @host@
 +check_PROGRAMS = testFunctionManager$(EXEEXT)
 +TESTS = testFunctionManager$(EXEEXT)
 +subdir = modules/functions_manager
 +DIST_COMMON = $(libscifunctions_manager_la_include_HEADERS) \
 +      $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
-       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
-       $(top_srcdir)/m4/intel_compiler.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
++      $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
++      $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
++      $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
 +      $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
 +      $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
 +      $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
 +      $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
 +      $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 +      $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 +      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 +      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 +      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 +      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 +      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +      $(ACLOCAL_M4)
 +mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 +CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
 +CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
 +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 +am__vpath_adj = case $$p in \
 +    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
 +    *) f=$$p;; \
 +  esac;
 +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
 +am__install_max = 40
 +am__nobase_strip_setup = \
 +  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
 +am__nobase_strip = \
 +  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
 +am__nobase_list = $(am__nobase_strip_setup); \
 +  for p in $$list; do echo "$$p $$p"; done | \
 +  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
 +  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
 +    if (++n[$$2] == $(am__install_max)) \
 +      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
 +    END { for (dir in files) print dir, files[dir] }'
 +am__base_list = \
 +  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
 +  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 +am__installdirs = "$(DESTDIR)$(pkglibdir)" \
 +      "$(DESTDIR)$(libscifunctions_manager_la_includedir)"
 +LTLIBRARIES = $(pkglib_LTLIBRARIES)
 +libscifunctions_manager_la_DEPENDENCIES = $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
 +      $(top_builddir)/modules/matio/libscimatio.la
 +am__objects_1 = libscifunctions_manager_la-funcmanager.lo
 +am_libscifunctions_manager_la_OBJECTS = $(am__objects_1)
 +libscifunctions_manager_la_OBJECTS =  \
 +      $(am_libscifunctions_manager_la_OBJECTS)
 +libscifunctions_manager_la_LINK = $(LIBTOOL) --tag=CXX \
 +      $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
 +      $(libscifunctions_manager_la_CXXFLAGS) $(CXXFLAGS) \
 +      $(AM_LDFLAGS) $(LDFLAGS) -o $@
 +am_testFunctionManager_OBJECTS =  \
 +      testFunctionManager-test-function.$(OBJEXT) \
 +      testFunctionManager-foo.$(OBJEXT) \
 +      testFunctionManager-cosinus.$(OBJEXT)
 +testFunctionManager_OBJECTS = $(am_testFunctionManager_OBJECTS)
 +testFunctionManager_DEPENDENCIES =  \
 +      $(top_builddir)/modules/types/libsciTypes.la \
 +      $(top_builddir)/modules/functions_manager/libscifunctions_manager.la
 +testFunctionManager_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 +      $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
 +      $(testFunctionManager_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 +      $(LDFLAGS) -o $@
 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 +depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 +am__depfiles_maybe = depfiles
 +am__mv = mv -f
 +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +      $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +      --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +      $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 +CXXLD = $(CXX)
 +CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +      --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 +      $(LDFLAGS) -o $@
 +SOURCES = $(libscifunctions_manager_la_SOURCES) \
 +      $(testFunctionManager_SOURCES)
 +DIST_SOURCES = $(libscifunctions_manager_la_SOURCES) \
 +      $(testFunctionManager_SOURCES)
 +HEADERS = $(libscifunctions_manager_la_include_HEADERS)
 +ETAGS = etags
 +CTAGS = ctags
 +am__tty_colors = \
 +red=; grn=; lgn=; blu=; std=
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +ACLOCAL = @ACLOCAL@
 +ALL_LINGUAS = @ALL_LINGUAS@
 +AMTAR = @AMTAR@
 +ANT = @ANT@
 +ANTLR = @ANTLR@
 +AR = @AR@
 +AUTOCONF = @AUTOCONF@
 +AUTOHEADER = @AUTOHEADER@
 +AUTOMAKE = @AUTOMAKE@
 +AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
 +AWK = @AWK@
 +BATIK = @BATIK@
 +BLAS_LIBS = @BLAS_LIBS@
 +BSH = @BSH@
 +CC = @CC@
 +CCDEPMODE = @CCDEPMODE@
 +CFLAGS = @CFLAGS@
 +CHECKSTYLE = @CHECKSTYLE@
 +COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
 +COMMONS_IO = @COMMONS_IO@
 +COMMONS_LOGGING = @COMMONS_LOGGING@
 +CPP = @CPP@
 +CPPFLAGS = @CPPFLAGS@
 +CXX = @CXX@
 +CXXCPP = @CXXCPP@
 +CXXDEPMODE = @CXXDEPMODE@
 +CXXFLAGS = @CXXFLAGS@
 +CYGPATH_W = @CYGPATH_W@
 +DEFS = @DEFS@
 +DEMOTOOLS_ENABLE = @DEMOTOOLS_ENABLE@
 +DEPDIR = @DEPDIR@
 +DOCBOOK_ROOT = @DOCBOOK_ROOT@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
 +ECHO_C = @ECHO_C@
 +ECHO_N = @ECHO_N@
 +ECHO_T = @ECHO_T@
 +EGREP = @EGREP@
 +EXEEXT = @EXEEXT@
 +F77 = @F77@
 +FFLAGS = @FFLAGS@
 +FFTW3_LIB = @FFTW3_LIB@
 +FFTW_ENABLE = @FFTW_ENABLE@
 +FGREP = @FGREP@
 +FLEXDOCK = @FLEXDOCK@
 +FLIBS = @FLIBS@
 +FOP = @FOP@
 +GENHTML = @GENHTML@
 +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 +GIWS_BIN = @GIWS_BIN@
 +GLUEGEN_RT = @GLUEGEN_RT@
 +GMSGFMT = @GMSGFMT@
 +GMSGFMT_015 = @GMSGFMT_015@
 +GRAPHICS_ENABLE = @GRAPHICS_ENABLE@
 +GREP = @GREP@
 +GUI_ENABLE = @GUI_ENABLE@
 +HDF5_CFLAGS = @HDF5_CFLAGS@
 +HDF5_ENABLE = @HDF5_ENABLE@
 +HDF5_LIBS = @HDF5_LIBS@
 +HELP_ENABLE = @HELP_ENABLE@
 +INSTALL = @INSTALL@
 +INSTALL_DATA = @INSTALL_DATA@
 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
 +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 +INTLLIBS = @INTLLIBS@
 +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 +JAR = @JAR@
 +JAVA = @JAVA@
 +JAVAC = @JAVAC@
 +JAVAC_DEBUG = @JAVAC_DEBUG@
 +JAVADOC = @JAVADOC@
 +JAVAH = @JAVAH@
 +JAVASCI_ENABLE = @JAVASCI_ENABLE@
 +JAVA_ENABLE = @JAVA_ENABLE@
 +JAVA_G = @JAVA_G@
 +JAVA_HOME = @JAVA_HOME@
 +JAVA_JNI_INCLUDE = @JAVA_JNI_INCLUDE@
 +JAVA_JNI_LIBS = @JAVA_JNI_LIBS@
 +JDB = @JDB@
 +JEUCLID_CORE = @JEUCLID_CORE@
 +JGRAPHX = @JGRAPHX@
 +JHALL = @JHALL@
 +JHDF5 = @JHDF5@
 +JLATEXMATH = @JLATEXMATH@
 +JLATEXMATH_FOP = @JLATEXMATH_FOP@
 +JOGL = @JOGL@
 +JROSETTA_API = @JROSETTA_API@
 +JROSETTA_ENGINE = @JROSETTA_ENGINE@
 +JUNIT = @JUNIT@
 +LAPACK_LIBS = @LAPACK_LIBS@
 +LCOV = @LCOV@
 +LD = @LD@
 +LDFLAGS = @LDFLAGS@
 +LEX = @LEX@
 +LEXLIB = @LEXLIB@
 +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 +LIBICONV = @LIBICONV@
 +LIBINTL = @LIBINTL@
 +LIBM = @LIBM@
 +LIBOBJS = @LIBOBJS@
 +LIBS = @LIBS@
 +LIBTOOL = @LIBTOOL@
 +LIPO = @LIPO@
 +LN_S = @LN_S@
 +LOOKS = @LOOKS@
 +LTLIBICONV = @LTLIBICONV@
 +LTLIBINTL = @LTLIBINTL@
 +LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAKEINFO = @MAKEINFO@
 +MATIO_CFLAGS = @MATIO_CFLAGS@
 +MATIO_ENABLE = @MATIO_ENABLE@
 +MATIO_LIBS = @MATIO_LIBS@
 +MKDIR_P = @MKDIR_P@
 +MSGCAT = @MSGCAT@
 +MSGFMT = @MSGFMT@
 +MSGFMT_015 = @MSGFMT_015@
 +MSGMERGE = @MSGMERGE@
 +NM = @NM@
 +NMEDIT = @NMEDIT@
 +OBJDUMP = @OBJDUMP@
 +OBJEXT = @OBJEXT@
 +OCAMLC = @OCAMLC@
 +OCAMLDEP = @OCAMLDEP@
 +OCAMLLEX = @OCAMLLEX@
 +OCAMLOPT = @OCAMLOPT@
 +OCAMLYACC = @OCAMLYACC@
 +OPENMP_CFLAGS = @OPENMP_CFLAGS@
 +OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
 +OPENMP_ENABLE = @OPENMP_ENABLE@
 +OPENMP_LIBS = @OPENMP_LIBS@
 +OTOOL = @OTOOL@
 +OTOOL64 = @OTOOL64@
 +PACKAGE = @PACKAGE@
 +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 +PACKAGE_NAME = @PACKAGE_NAME@
 +PACKAGE_STRING = @PACKAGE_STRING@
 +PACKAGE_TARNAME = @PACKAGE_TARNAME@
 +PACKAGE_URL = @PACKAGE_URL@
 +PACKAGE_VERSION = @PACKAGE_VERSION@
 +PATH_SEPARATOR = @PATH_SEPARATOR@
 +PCRE_CFLAGS = @PCRE_CFLAGS@
 +PCRE_CONFIG = @PCRE_CONFIG@
 +PCRE_LIBS = @PCRE_LIBS@
 +PCRE_VERSION = @PCRE_VERSION@
 +PKG_CONFIG = @PKG_CONFIG@
 +POSUB = @POSUB@
 +POW_LIB = @POW_LIB@
 +PVMGETARCH = @PVMGETARCH@
 +PVM_ARCH = @PVM_ARCH@
 +PVM_ENABLE = @PVM_ENABLE@
 +PVM_INCLUDE = @PVM_INCLUDE@
 +PVM_LIB = @PVM_LIB@
 +PYTHON = @PYTHON@
 +QDOX = @QDOX@
 +RANLIB = @RANLIB@
 +RELOCATABLE = @RELOCATABLE@
 +RT_LIB = @RT_LIB@
 +SAXON = @SAXON@
 +SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
 +SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
 +SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
 +SCILAB_VERSION_MAJOR = @SCILAB_VERSION_MAJOR@
 +SCILAB_VERSION_MINOR = @SCILAB_VERSION_MINOR@
 +SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SET_RELOCATABLE = @SET_RELOCATABLE@
 +SHELL = @SHELL@
 +SKINLF = @SKINLF@
 +SPLINT = @SPLINT@
 +STRIP = @STRIP@
 +SWIG_BIN = @SWIG_BIN@
 +SWIG_JAVA = @SWIG_JAVA@
 +SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
 +TCLTK_LIBS = @TCLTK_LIBS@
 +TCL_INC_PATH = @TCL_INC_PATH@
 +TESTNG = @TESTNG@
 +TK_INC_PATH = @TK_INC_PATH@
 +UMFPACK_ENABLE = @UMFPACK_ENABLE@
 +UMFPACK_LIB = @UMFPACK_LIB@
 +USE_NLS = @USE_NLS@
 +VERSION = @VERSION@
 +WITH_OCAML = @WITH_OCAML@
 +WITH_TKSCI = @WITH_TKSCI@
 +XCOS_ENABLE = @XCOS_ENABLE@
 +XGETTEXT = @XGETTEXT@
 +XGETTEXT_015 = @XGETTEXT_015@
 +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 +XMKMF = @XMKMF@
 +XMLGRAPHICS_COMMONS = @XMLGRAPHICS_COMMONS@
 +XML_APIS_EXT = @XML_APIS_EXT@
 +XML_CONFIG = @XML_CONFIG@
 +XML_FLAGS = @XML_FLAGS@
 +XML_LIBS = @XML_LIBS@
 +XML_VERSION = @XML_VERSION@
 +X_CFLAGS = @X_CFLAGS@
 +X_EXTRA_LIBS = @X_EXTRA_LIBS@
 +X_LIBS = @X_LIBS@
 +X_PRE_LIBS = @X_PRE_LIBS@
 +YACC = @YACC@
 +YFLAGS = @YFLAGS@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
 +ac_ct_CC = @ac_ct_CC@
 +ac_ct_CXX = @ac_ct_CXX@
 +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 +ac_ct_F77 = @ac_ct_F77@
 +am__include = @am__include@
 +am__leading_dot = @am__leading_dot@
 +am__quote = @am__quote@
 +am__tar = @am__tar@
 +am__untar = @am__untar@
 +bindir = @bindir@
 +build = @build@
 +build_alias = @build_alias@
 +build_cpu = @build_cpu@
 +build_os = @build_os@
 +build_vendor = @build_vendor@
 +builddir = @builddir@
 +cxx_present = @cxx_present@
 +datadir = @datadir@
 +datarootdir = @datarootdir@
 +docdir = @docdir@
 +dvidir = @dvidir@
 +exec_prefix = @exec_prefix@
 +host = @host@
 +host_alias = @host_alias@
 +host_cpu = @host_cpu@
 +host_os = @host_os@
 +host_vendor = @host_vendor@
 +htmldir = @htmldir@
 +includedir = @includedir@
 +infodir = @infodir@
 +install_sh = @install_sh@
 +libdir = @libdir@
 +libexecdir = @libexecdir@
 +localedir = @localedir@
 +localstatedir = @localstatedir@
 +mandir = @mandir@
 +mkdir_p = @mkdir_p@
 +oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
 +psdir = @psdir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +srcdir = @srcdir@
 +sysconfdir = @sysconfdir@
 +target_alias = @target_alias@
 +top_build_prefix = @top_build_prefix@
 +top_builddir = @top_builddir@
 +top_srcdir = @top_srcdir@
 +yacc_present = @yacc_present@
 +FUNCTION_MANAGER_CPP_SOURCES = src/cpp/funcmanager.cpp
 +pkglib_LTLIBRARIES = libscifunctions_manager.la
 +libscifunctions_manager_la_SOURCES = $(FUNCTION_MANAGER_CPP_SOURCES)
 +libscifunctions_manager_la_CXXFLAGS = -I$(top_builddir)/modules/types/includes/ \
 +                                              -I$(top_builddir)/modules/core/includes/ \
 +                                              -I$(top_builddir)/modules/string/includes/ \
 +                                              -I$(top_builddir)/modules/symbol/includes/ \
 +                                              -I$(top_builddir)/modules/elementary_functions/includes/ \
 +                                              -I$(top_builddir)/modules/operations/includes/ \
 +                                              -I$(top_builddir)/modules/system_env/includes/ \
 +                                              -I$(top_builddir)/modules/api_scilab/includes/ \
 +                                              -I$(top_builddir)/modules/fileio/includes/ \
 +                                              -I$(top_builddir)/modules/abstractSyntaxTree/includes/ \
 +                                              -I$(top_builddir)/modules/parse/includes/ \
 +                                              -I$(top_builddir)/modules/output_stream/includes/ \
 +                                              -Iincludes/ \
 +                                              -Isrc/cpp \
 +                                              $(XML_FLAGS)
 +
 +libscifunctions_manager_la_LIBADD = $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
 +                                      $(top_builddir)/modules/matio/libscimatio.la
 +
 +libscifunctions_manager_la_includedir = $(pkgincludedir)/Types
 +libscifunctions_manager_la_include_HEADERS = 
 +
 +####################
 +####################
 +check_INCLUDES = -I$(top_builddir)/modules/types/includes/ \
 +                              -Iincludes/ \
 +                              -Isrc/cpp
 +
 +testFunctionManager_SOURCES = src/cpp/test-function.cpp \
 +                                      src/cpp/foo.cpp \
 +                                      src/cpp/cosinus.cpp
 +
 +testFunctionManager_CXXFLAGS = $(check_INCLUDES)
 +testFunctionManager_LDADD = $(top_builddir)/modules/types/libsciTypes.la \
 +                                      $(top_builddir)/modules/functions_manager/libscifunctions_manager.la
 +
 +all: all-am
 +
 +.SUFFIXES:
 +.SUFFIXES: .cpp .lo .o .obj
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 +      @for dep in $?; do \
 +        case '$(am__configure_deps)' in \
 +          *$$dep*) \
 +            ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
 +              && { if test -f $@; then exit 0; else break; fi; }; \
 +            exit 1;; \
 +        esac; \
 +      done; \
 +      echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign modules/functions_manager/Makefile'; \
 +      $(am__cd) $(top_srcdir) && \
 +        $(AUTOMAKE) --foreign modules/functions_manager/Makefile
 +.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +      @case '$?' in \
 +        *config.status*) \
 +          cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 +        *) \
 +          echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 +          cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 +      esac;
 +
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 +      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 +      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 +      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(am__aclocal_m4_deps):
 +install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 +      @$(NORMAL_INSTALL)
 +      test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
 +      @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
 +      list2=; for p in $$list; do \
 +        if test -f $$p; then \
 +          list2="$$list2 $$p"; \
 +        else :; fi; \
 +      done; \
 +      test -z "$$list2" || { \
 +        echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
 +        $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
 +      }
 +
 +uninstall-pkglibLTLIBRARIES:
 +      @$(NORMAL_UNINSTALL)
 +      @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
 +      for p in $$list; do \
 +        $(am__strip_dir) \
 +        echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
 +        $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
 +      done
 +
 +clean-pkglibLTLIBRARIES:
 +      -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
 +      @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
 +        dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
 +        test "$$dir" != "$$p" || dir=.; \
 +        echo "rm -f \"$${dir}/so_locations\""; \
 +        rm -f "$${dir}/so_locations"; \
 +      done
 +libscifunctions_manager.la: $(libscifunctions_manager_la_OBJECTS) $(libscifunctions_manager_la_DEPENDENCIES) 
 +      $(libscifunctions_manager_la_LINK) -rpath $(pkglibdir) $(libscifunctions_manager_la_OBJECTS) $(libscifunctions_manager_la_LIBADD) $(LIBS)
 +
 +clean-checkPROGRAMS:
 +      @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
 +      echo " rm -f" $$list; \
 +      rm -f $$list || exit $$?; \
 +      test -n "$(EXEEXT)" || exit 0; \
 +      list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 +      echo " rm -f" $$list; \
 +      rm -f $$list
 +testFunctionManager$(EXEEXT): $(testFunctionManager_OBJECTS) $(testFunctionManager_DEPENDENCIES) 
 +      @rm -f testFunctionManager$(EXEEXT)
 +      $(testFunctionManager_LINK) $(testFunctionManager_OBJECTS) $(testFunctionManager_LDADD) $(LIBS)
 +
 +mostlyclean-compile:
 +      -rm -f *.$(OBJEXT)
 +
 +distclean-compile:
 +      -rm -f *.tab.c
 +
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifunctions_manager_la-funcmanager.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testFunctionManager-cosinus.Po@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testFunctionManager-foo.Po@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testFunctionManager-test-function.Po@am__quote@
 +
 +.cpp.o:
 +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXXCOMPILE) -c -o $@ $<
 +
 +.cpp.obj:
 +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 +
 +.cpp.lo:
 +@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LTCXXCOMPILE) -c -o $@ $<
 +
 +libscifunctions_manager_la-funcmanager.lo: src/cpp/funcmanager.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscifunctions_manager_la_CXXFLAGS) $(CXXFLAGS) -MT libscifunctions_manager_la-funcmanager.lo -MD -MP -MF $(DEPDIR)/libscifunctions_manager_la-funcmanager.Tpo -c -o libscifunctions_manager_la-funcmanager.lo `test -f 'src/cpp/funcmanager.cpp' || echo '$(srcdir)/'`src/cpp/funcmanager.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscifunctions_manager_la-funcmanager.Tpo $(DEPDIR)/libscifunctions_manager_la-funcmanager.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/funcmanager.cpp' object='libscifunctions_manager_la-funcmanager.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscifunctions_manager_la_CXXFLAGS) $(CXXFLAGS) -c -o libscifunctions_manager_la-funcmanager.lo `test -f 'src/cpp/funcmanager.cpp' || echo '$(srcdir)/'`src/cpp/funcmanager.cpp
 +
 +testFunctionManager-test-function.o: src/cpp/test-function.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFunctionManager_CXXFLAGS) $(CXXFLAGS) -MT testFunctionManager-test-function.o -MD -MP -MF $(DEPDIR)/testFunctionManager-test-function.Tpo -c -o testFunctionManager-test-function.o `test -f 'src/cpp/test-function.cpp' || echo '$(srcdir)/'`src/cpp/test-function.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testFunctionManager-test-function.Tpo $(DEPDIR)/testFunctionManager-test-function.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/test-function.cpp' object='testFunctionManager-test-function.o' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFunctionManager_CXXFLAGS) $(CXXFLAGS) -c -o testFunctionManager-test-function.o `test -f 'src/cpp/test-function.cpp' || echo '$(srcdir)/'`src/cpp/test-function.cpp
 +
 +testFunctionManager-test-function.obj: src/cpp/test-function.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFunctionManager_CXXFLAGS) $(CXXFLAGS) -MT testFunctionManager-test-function.obj -MD -MP -MF $(DEPDIR)/testFunctionManager-test-function.Tpo -c -o testFunctionManager-test-function.obj `if test -f 'src/cpp/test-function.cpp'; then $(CYGPATH_W) 'src/cpp/test-function.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/test-function.cpp'; fi`
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testFunctionManager-test-function.Tpo $(DEPDIR)/testFunctionManager-test-function.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/test-function.cpp' object='testFunctionManager-test-function.obj' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFunctionManager_CXXFLAGS) $(CXXFLAGS) -c -o testFunctionManager-test-function.obj `if test -f 'src/cpp/test-function.cpp'; then $(CYGPATH_W) 'src/cpp/test-function.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/test-function.cpp'; fi`
 +
 +testFunctionManager-foo.o: src/cpp/foo.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFunctionManager_CXXFLAGS) $(CXXFLAGS) -MT testFunctionManager-foo.o -MD -MP -MF $(DEPDIR)/testFunctionManager-foo.Tpo -c -o testFunctionManager-foo.o `test -f 'src/cpp/foo.cpp' || echo '$(srcdir)/'`src/cpp/foo.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testFunctionManager-foo.Tpo $(DEPDIR)/testFunctionManager-foo.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/foo.cpp' object='testFunctionManager-foo.o' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFunctionManager_CXXFLAGS) $(CXXFLAGS) -c -o testFunctionManager-foo.o `test -f 'src/cpp/foo.cpp' || echo '$(srcdir)/'`src/cpp/foo.cpp
 +
 +testFunctionManager-foo.obj: src/cpp/foo.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFunctionManager_CXXFLAGS) $(CXXFLAGS) -MT testFunctionManager-foo.obj -MD -MP -MF $(DEPDIR)/testFunctionManager-foo.Tpo -c -o testFunctionManager-foo.obj `if test -f 'src/cpp/foo.cpp'; then $(CYGPATH_W) 'src/cpp/foo.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/foo.cpp'; fi`
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testFunctionManager-foo.Tpo $(DEPDIR)/testFunctionManager-foo.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/foo.cpp' object='testFunctionManager-foo.obj' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFunctionManager_CXXFLAGS) $(CXXFLAGS) -c -o testFunctionManager-foo.obj `if test -f 'src/cpp/foo.cpp'; then $(CYGPATH_W) 'src/cpp/foo.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/foo.cpp'; fi`
 +
 +testFunctionManager-cosinus.o: src/cpp/cosinus.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFunctionManager_CXXFLAGS) $(CXXFLAGS) -MT testFunctionManager-cosinus.o -MD -MP -MF $(DEPDIR)/testFunctionManager-cosinus.Tpo -c -o testFunctionManager-cosinus.o `test -f 'src/cpp/cosinus.cpp' || echo '$(srcdir)/'`src/cpp/cosinus.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testFunctionManager-cosinus.Tpo $(DEPDIR)/testFunctionManager-cosinus.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/cosinus.cpp' object='testFunctionManager-cosinus.o' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFunctionManager_CXXFLAGS) $(CXXFLAGS) -c -o testFunctionManager-cosinus.o `test -f 'src/cpp/cosinus.cpp' || echo '$(srcdir)/'`src/cpp/cosinus.cpp
 +
 +testFunctionManager-cosinus.obj: src/cpp/cosinus.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFunctionManager_CXXFLAGS) $(CXXFLAGS) -MT testFunctionManager-cosinus.obj -MD -MP -MF $(DEPDIR)/testFunctionManager-cosinus.Tpo -c -o testFunctionManager-cosinus.obj `if test -f 'src/cpp/cosinus.cpp'; then $(CYGPATH_W) 'src/cpp/cosinus.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/cosinus.cpp'; fi`
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testFunctionManager-cosinus.Tpo $(DEPDIR)/testFunctionManager-cosinus.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/cosinus.cpp' object='testFunctionManager-cosinus.obj' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFunctionManager_CXXFLAGS) $(CXXFLAGS) -c -o testFunctionManager-cosinus.obj `if test -f 'src/cpp/cosinus.cpp'; then $(CYGPATH_W) 'src/cpp/cosinus.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/cosinus.cpp'; fi`
 +
 +mostlyclean-libtool:
 +      -rm -f *.lo
 +
 +clean-libtool:
 +      -rm -rf .libs _libs
 +install-libscifunctions_manager_la_includeHEADERS: $(libscifunctions_manager_la_include_HEADERS)
 +      @$(NORMAL_INSTALL)
 +      test -z "$(libscifunctions_manager_la_includedir)" || $(MKDIR_P) "$(DESTDIR)$(libscifunctions_manager_la_includedir)"
 +      @list='$(libscifunctions_manager_la_include_HEADERS)'; test -n "$(libscifunctions_manager_la_includedir)" || list=; \
 +      for p in $$list; do \
 +        if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 +        echo "$$d$$p"; \
 +      done | $(am__base_list) | \
 +      while read files; do \
 +        echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libscifunctions_manager_la_includedir)'"; \
 +        $(INSTALL_HEADER) $$files "$(DESTDIR)$(libscifunctions_manager_la_includedir)" || exit $$?; \
 +      done
 +
 +uninstall-libscifunctions_manager_la_includeHEADERS:
 +      @$(NORMAL_UNINSTALL)
 +      @list='$(libscifunctions_manager_la_include_HEADERS)'; test -n "$(libscifunctions_manager_la_includedir)" || list=; \
 +      files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 +      test -n "$$files" || exit 0; \
 +      echo " ( cd '$(DESTDIR)$(libscifunctions_manager_la_includedir)' && rm -f" $$files ")"; \
 +      cd "$(DESTDIR)$(libscifunctions_manager_la_includedir)" && rm -f $$files
 +
 +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 +      list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 +      unique=`for i in $$list; do \
 +          if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +        done | \
 +        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +            END { if (nonempty) { for (i in files) print i; }; }'`; \
 +      mkid -fID $$unique
 +tags: TAGS
 +
 +TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 +              $(TAGS_FILES) $(LISP)
 +      set x; \
 +      here=`pwd`; \
 +      list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 +      unique=`for i in $$list; do \
 +          if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +        done | \
 +        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +            END { if (nonempty) { for (i in files) print i; }; }'`; \
 +      shift; \
 +      if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 +        test -n "$$unique" || unique=$$empty_fix; \
 +        if test $$# -gt 0; then \
 +          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +            "$$@" $$unique; \
 +        else \
 +          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +            $$unique; \
 +        fi; \
 +      fi
 +ctags: CTAGS
 +CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 +              $(TAGS_FILES) $(LISP)
 +      list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 +      unique=`for i in $$list; do \
 +          if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +        done | \
 +        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +            END { if (nonempty) { for (i in files) print i; }; }'`; \
 +      test -z "$(CTAGS_ARGS)$$unique" \
 +        || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 +           $$unique
 +
 +GTAGS:
 +      here=`$(am__cd) $(top_builddir) && pwd` \
 +        && $(am__cd) $(top_srcdir) \
 +        && gtags -i $(GTAGS_ARGS) "$$here"
 +
 +distclean-tags:
 +      -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 +
 +check-TESTS: $(TESTS)
 +      @failed=0; all=0; xfail=0; xpass=0; skip=0; \
 +      srcdir=$(srcdir); export srcdir; \
 +      list=' $(TESTS) '; \
 +      $(am__tty_colors); \
 +      if test -n "$$list"; then \
 +        for tst in $$list; do \
 +          if test -f ./$$tst; then dir=./; \
 +          elif test -f $$tst; then dir=; \
 +          else dir="$(srcdir)/"; fi; \
 +          if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
 +            all=`expr $$all + 1`; \
 +            case " $(XFAIL_TESTS) " in \
 +            *[\ \     ]$$tst[\ \      ]*) \
 +              xpass=`expr $$xpass + 1`; \
 +              failed=`expr $$failed + 1`; \
 +              col=$$red; res=XPASS; \
 +            ;; \
 +            *) \
 +              col=$$grn; res=PASS; \
 +            ;; \
 +            esac; \
 +          elif test $$? -ne 77; then \
 +            all=`expr $$all + 1`; \
 +            case " $(XFAIL_TESTS) " in \
 +            *[\ \     ]$$tst[\ \      ]*) \
 +              xfail=`expr $$xfail + 1`; \
 +              col=$$lgn; res=XFAIL; \
 +            ;; \
 +            *) \
 +              failed=`expr $$failed + 1`; \
 +              col=$$red; res=FAIL; \
 +            ;; \
 +            esac; \
 +          else \
 +            skip=`expr $$skip + 1`; \
 +            col=$$blu; res=SKIP; \
 +          fi; \
 +          echo "$${col}$$res$${std}: $$tst"; \
 +        done; \
 +        if test "$$all" -eq 1; then \
 +          tests="test"; \
 +          All=""; \
 +        else \
 +          tests="tests"; \
 +          All="All "; \
 +        fi; \
 +        if test "$$failed" -eq 0; then \
 +          if test "$$xfail" -eq 0; then \
 +            banner="$$All$$all $$tests passed"; \
 +          else \
 +            if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
 +            banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
 +          fi; \
 +        else \
 +          if test "$$xpass" -eq 0; then \
 +            banner="$$failed of $$all $$tests failed"; \
 +          else \
 +            if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
 +            banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
 +          fi; \
 +        fi; \
 +        dashes="$$banner"; \
 +        skipped=""; \
 +        if test "$$skip" -ne 0; then \
 +          if test "$$skip" -eq 1; then \
 +            skipped="($$skip test was not run)"; \
 +          else \
 +            skipped="($$skip tests were not run)"; \
 +          fi; \
 +          test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
 +            dashes="$$skipped"; \
 +        fi; \
 +        report=""; \
 +        if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
 +          report="Please report to $(PACKAGE_BUGREPORT)"; \
 +          test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
 +            dashes="$$report"; \
 +        fi; \
 +        dashes=`echo "$$dashes" | sed s/./=/g`; \
 +        if test "$$failed" -eq 0; then \
 +          echo "$$grn$$dashes"; \
 +        else \
 +          echo "$$red$$dashes"; \
 +        fi; \
 +        echo "$$banner"; \
 +        test -z "$$skipped" || echo "$$skipped"; \
 +        test -z "$$report" || echo "$$report"; \
 +        echo "$$dashes$$std"; \
 +        test "$$failed" -eq 0; \
 +      else :; fi
 +
 +distdir: $(DISTFILES)
 +      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +      list='$(DISTFILES)'; \
 +        dist_files=`for file in $$list; do echo $$file; done | \
 +        sed -e "s|^$$srcdirstrip/||;t" \
 +            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 +      case $$dist_files in \
 +        */*) $(MKDIR_P) `echo "$$dist_files" | \
 +                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 +                         sort -u` ;; \
 +      esac; \
 +      for file in $$dist_files; do \
 +        if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 +        if test -d $$d/$$file; then \
 +          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +          if test -d "$(distdir)/$$file"; then \
 +            find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +          fi; \
 +          if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 +            cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
 +            find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +          fi; \
 +          cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 +        else \
 +          test -f "$(distdir)/$$file" \
 +          || cp -p $$d/$$file "$(distdir)/$$file" \
 +          || exit 1; \
 +        fi; \
 +      done
 +check-am: all-am
 +      $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
 +      $(MAKE) $(AM_MAKEFLAGS) check-TESTS
 +check: check-am
 +all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 +installdirs:
 +      for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libscifunctions_manager_la_includedir)"; do \
 +        test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 +      done
 +install: install-am
 +install-exec: install-exec-am
 +install-data: install-data-am
 +uninstall: uninstall-am
 +
 +install-am: all-am
 +      @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 +
 +installcheck: installcheck-am
 +install-strip:
 +      $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 +        install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 +        `test -z '$(STRIP)' || \
 +          echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 +mostlyclean-generic:
 +
 +clean-generic:
 +
 +distclean-generic:
 +      -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +      -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 +
 +maintainer-clean-generic:
 +      @echo "This command is intended for maintainers to use"
 +      @echo "it deletes files that may require special tools to rebuild."
 +clean: clean-am
 +
 +clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
 +      clean-pkglibLTLIBRARIES mostlyclean-am
 +
 +distclean: distclean-am
 +      -rm -rf ./$(DEPDIR)
 +      -rm -f Makefile
 +distclean-am: clean-am distclean-compile distclean-generic \
 +      distclean-tags
 +
 +dvi: dvi-am
 +
 +dvi-am:
 +
 +html: html-am
 +
 +html-am:
 +
 +info: info-am
 +
 +info-am:
 +
 +install-data-am: install-libscifunctions_manager_la_includeHEADERS
 +
 +install-dvi: install-dvi-am
 +
 +install-dvi-am:
 +
 +install-exec-am: install-pkglibLTLIBRARIES
 +
 +install-html: install-html-am
 +
 +install-html-am:
 +
 +install-info: install-info-am
 +
 +install-info-am:
 +
 +install-man:
 +
 +install-pdf: install-pdf-am
 +
 +install-pdf-am:
 +
 +install-ps: install-ps-am
 +
 +install-ps-am:
 +
 +installcheck-am:
 +
 +maintainer-clean: maintainer-clean-am
 +      -rm -rf ./$(DEPDIR)
 +      -rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
 +
 +mostlyclean: mostlyclean-am
 +
 +mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 +      mostlyclean-libtool
 +
 +pdf: pdf-am
 +
 +pdf-am:
 +
 +ps: ps-am
 +
 +ps-am:
 +
 +uninstall-am: uninstall-libscifunctions_manager_la_includeHEADERS \
 +      uninstall-pkglibLTLIBRARIES
 +
 +.MAKE: check-am install-am install-strip
 +
 +.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
 +      clean-checkPROGRAMS clean-generic clean-libtool \
 +      clean-pkglibLTLIBRARIES ctags distclean distclean-compile \
 +      distclean-generic distclean-libtool distclean-tags distdir dvi \
 +      dvi-am html html-am info info-am install install-am \
 +      install-data install-data-am install-dvi install-dvi-am \
 +      install-exec install-exec-am install-html install-html-am \
 +      install-info install-info-am \
 +      install-libscifunctions_manager_la_includeHEADERS install-man \
 +      install-pdf install-pdf-am install-pkglibLTLIBRARIES \
 +      install-ps install-ps-am install-strip installcheck \
 +      installcheck-am installdirs maintainer-clean \
 +      maintainer-clean-generic mostlyclean mostlyclean-compile \
 +      mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 +      tags uninstall uninstall-am \
 +      uninstall-libscifunctions_manager_la_includeHEADERS \
 +      uninstall-pkglibLTLIBRARIES
 +
 +
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -54,7 -54,7 +54,7 @@@ static gw_generic_table Tab[]
        {sci_printfigure, "printfigure"},
        {sci_exportUI, "exportUI"},
        {sci_printsetupbox,"printsetupbox"},
--      {sci_toprint,"toprint"},
++      {NULL, ""}, // toprint
        {sci_uigetfile,"uigetfile"},
        {sci_usecanvas,"usecanvas"},
        {sci_displaytree,"uiDisplayTree"},
@@@ -27,100 -28,132 +28,132 @@@ extern "C
  #include "getScilabJavaVM.h"
  #include "getFullFilename.h"
  #include "loadOnUseClassPath.h"
+ #include "WindowList.h"
 -#include "warningmode.h"
++#include "sci_warning.h"
  }
+ /*--------------------------------------------------------------------------*/
  static BOOL loadedDep = FALSE;
  /*--------------------------------------------------------------------------*/
  using namespace org_scilab_modules_gui_bridge;
  /*--------------------------------------------------------------------------*/
- int sci_toprint(char *fname,unsigned long l)
 -static int sci_toprint_one_rhs(const char *fname);
 -static int sci_toprint_two_rhs(const char *fname);
++static int sci_toprint_one_rhs(const char *fname, int* _piKey);
++static int sci_toprint_two_rhs(const char *fname, int* _piKey);
+ /*--------------------------------------------------------------------------*/
 -int sci_toprint(char *fname,unsigned long l)
++int sci_toprint(char *fname, int* _piKey)
  {
-     int l1 = 0, m1 = 0, n1 = 0;
-     int *paramoutINT = new int[1];
-     *paramoutINT=(int)FALSE;
      CheckRhs(1,2);
      CheckLhs(0,1);
  
      if (!loadedDep)
      {
-       loadOnUseClassPath("pdf_ps_eps_graphic_export");
-       loadedDep=TRUE;
+         loadOnUseClassPath("pdf_ps_eps_graphic_export");
+         loadedDep = TRUE;
      }
  
-     /* File or figure print */
      if (Rhs == 1)
      {
-         /* File print */
-         if (GetType(1) == sci_strings)
-         {
-             char **params = NULL;
 -        return sci_toprint_one_rhs(fname);
++        return sci_toprint_one_rhs(fname, _piKey);
+     }
+     else
+     {
 -        return sci_toprint_two_rhs(fname);
++        return sci_toprint_two_rhs(fname, _piKey);
+     }
+     return 0;
+ }
+ /*--------------------------------------------------------------------------*/
 -static int sci_toprint_one_rhs(const char *fname)
++static int sci_toprint_one_rhs(const char *fname, int* _piKey)
+ {
+     SciErr sciErr;
+     int *piAddressVarOne = NULL;
 -    sciErr = getVarAddressFromPosition(pvApiCtx, 1, &piAddressVarOne);
++    sciErr = getVarAddressFromPosition(_piKey, 1, &piAddressVarOne);
+     if(sciErr.iErr)
+     {
+         printError(&sciErr, 0);
+         return 0;
+     }
  
-             GetRhsVar(1,MATRIX_OF_STRING_DATATYPE,&m1,&n1,&params);
-             if ((m1*n1) == 1)
 -    if (isStringType(pvApiCtx, piAddressVarOne))
++    if (isStringType(_piKey, piAddressVarOne))
+     {
+         char *fileName = NULL;
+         BOOL iRet = FALSE;
 -        if (getAllocatedSingleString(pvApiCtx, piAddressVarOne, &fileName) == 0)
++        if (getAllocatedSingleString(_piKey, piAddressVarOne, &fileName) == 0)
+         {
+             char *fullName = getFullFilename(fileName);
+             freeAllocatedSingleString(fileName);
+             if (fullName)
              {
-                 char *fullName = NULL;
-                 fullName = getFullFilename(params[0]);
-                 if (fullName)
+                 if (FileExist(fullName))
                  {
-                     if (FileExist(fullName))
+                     try
                      {
-                         *paramoutINT = (int)CallScilabBridge::printFile(getScilabJavaVM(), fullName); 
+                         iRet = (int)CallScilabBridge::printFile(getScilabJavaVM(), fullName);
                      }
-                     else 
+                     catch (const GiwsException::JniException& e)
                      {
-                         sciprint(_("%s: The file %s does not exist.\n"), fname, fullName);
-                         *paramoutINT = (int)(FALSE);
+                         FREE(fullName);
+                         fullName = NULL;
+                         Scierror(999,_("%s: An exception occurred: %s\n%s\n"), fname, e.getJavaDescription().c_str(), e.getJavaExceptionName().c_str());
+                         return 0;
                      }
                  }
                  else
                  {
-                     *paramoutINT = (int)(FALSE);
+                     if (getWarningMode())
+                     {
+                         sciprint(_("%s: The file %s does not exist.\n"), fname, fullName);
+                     }
+                     iRet = FALSE;
                  }
-                 freeArrayOfString(params, 1);
-             }
-             else
-             {
-                 freeArrayOfString(params, m1 * n1);
-                 Scierror(999,_("%s: Wrong size for input argument #%d: String expected.\n"),fname,1);
-                 return FALSE;
+                 FREE(fullName);
+                 fullName = NULL;
              }
 -            createScalarBoolean(pvApiCtx, Rhs + 1, iRet);
++            createScalarBoolean(_piKey, Rhs + 1, iRet);
+             LhsVar(1) = Rhs + 1;
+             PutLhsVar();
          }
          else
          {
-             /* Figure print */
-             if (GetType(1) == sci_matrix)
+             Scierror(999,_("%s: Memory allocation error.\n"), fname);
+         }
+     }
 -    else if (isDoubleType(pvApiCtx, piAddressVarOne))
++    else if (isDoubleType(_piKey, piAddressVarOne))
+     {
 -        if (isScalar(pvApiCtx, piAddressVarOne))
++        if (isScalar(_piKey, piAddressVarOne))
+         {
+             double dValue = 0.;
 -            if (!getScalarDouble(pvApiCtx, piAddressVarOne, &dValue))
++            if (!getScalarDouble(_piKey, piAddressVarOne, &dValue))
              {
-                 if (IsAScalar(1))
+                 int num_win = (int)dValue;
+                 BOOL iRet = FALSE;
+                 if (num_win < 0)
                  {
-                     int num_win=-2;
-                     GetRhsVar(1,MATRIX_OF_INTEGER_DATATYPE,&m1,&n1,&l1);
-                     num_win=*istk(l1);
-                     if (num_win>=0)
-                     {
-                       try
-                       {
-                           *paramoutINT = (int)CallScilabBridge::printFigure(getScilabJavaVM(), num_win, FALSE, FALSE);
-                       }
-                       catch (const GiwsException::JniException& e)
-                       {
-                           Scierror(999,_("%s: An exception occurred: %s\n%s\n"), fname, e.getJavaDescription().c_str(), e.getJavaExceptionName().c_str());
-                       }
+                     Scierror(999,_("%s: Wrong value for input argument #%d: Non-negative integers expected.\n"), fname);
+                     return 0;
+                 }
  
-                     }
-                     else
-                     {
-                         Scierror(999,_("%s: Wrong value for input argument #%d: Non-negative integers expected.\n"),fname);
-                         return FALSE;
-                     }
+                 if (!sciIsExistingFigure((int) num_win))
+                 {
+                     Scierror(999, "%s: Figure with figure_id %d does not exist.\n",fname, (int) num_win);
+                     return 0;
                  }
-                 else
+                 try
                  {
-                     Scierror(999,_("%s: Wrong type for input argument #%d: Non-negative integer expected.\n"),fname,1);
-                     return FALSE;
+                     iRet = (int)CallScilabBridge::printFigure(getScilabJavaVM(), num_win, FALSE, FALSE);
                  }
+                 catch (const GiwsException::JniException& e)
+                 {
+                     Scierror(999,_("%s: An exception occurred: %s\n%s\n"), fname, e.getJavaDescription().c_str(), e.getJavaExceptionName().c_str());
+                     return 0;
+                 }
 -                createScalarBoolean(pvApiCtx, Rhs + 1, iRet);
++                createScalarBoolean(_piKey, Rhs + 1, iRet);
+                 LhsVar(1) = Rhs + 1;
+                 PutLhsVar();
              }
              else
              {
      }
      else
      {
-         /* Character string print */
-         if (GetType(1) == sci_strings)
-         {
-             /** TODO rewrite this part using CPP instructions */
+         Scierror(999,_("%s: Wrong type for input argument #%d.\n"), fname, 1);
+     }
+     return 0;
+ }
+ /*--------------------------------------------------------------------------*/
 -static int sci_toprint_two_rhs(const char *fname)
++static int sci_toprint_two_rhs(const char *fname, int* _piKey)
+ {
+     SciErr sciErr;
+     int *piAddressVarOne = NULL;
+     int *piAddressVarTwo = NULL;
 -    sciErr = getVarAddressFromPosition(pvApiCtx, 1, &piAddressVarOne);
++    sciErr = getVarAddressFromPosition(_piKey, 1, &piAddressVarOne);
+     if(sciErr.iErr)
+     {
+         printError(&sciErr, 0);
+         return 0;
+     }
  
-             char **Str=NULL;
-             char *param2=NULL;
-             char *lines=NULL;
 -    sciErr = getVarAddressFromPosition(pvApiCtx, 2, &piAddressVarTwo);
++    sciErr = getVarAddressFromPosition(_piKey, 2, &piAddressVarTwo);
+     if(sciErr.iErr)
+     {
+         printError(&sciErr, 0);
+         return 0;
+     }
  
-             if (GetType(2) == sci_strings)
 -    if (isStringType(pvApiCtx, piAddressVarOne))
++    if (isStringType(_piKey, piAddressVarOne))
+     {
 -        if (isScalar(pvApiCtx, piAddressVarTwo))
++        if (isScalar(_piKey, piAddressVarTwo))
+         {
 -            if (isStringType(pvApiCtx, piAddressVarTwo))
++            if (isStringType(_piKey, piAddressVarTwo))
              {