summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2011-02-27 17:31:06 +0100
committerVincent COUVERT <vincent.couvert@scilab.org>2011-03-04 14:17:29 +0100
commit7f156ddcca91f4d9d8a70d5929dddc1b9bb34f45 (patch)
tree7f1d9e084385ef49367b61471c7e41112fcfecdc
parent8472524f6535ff7bcba8d41ae98c3cecd7dbe14c (diff)
downloadscilab-7f156ddcca91f4d9d8a70d5929dddc1b9bb34f45.zip
scilab-7f156ddcca91f4d9d8a70d5929dddc1b9bb34f45.tar.gz
* Option --without-scicos renamed to --without-xcos
* Bug 7049 fixed - jgraphx version was checked even if the --without-xcos flag is set. Change-Id: I5583a208672fe027705819a8520fa542b4298119
-rw-r--r--scilab/CHANGES_5.3.X15
-rw-r--r--scilab/Makefile.in2
-rwxr-xr-xscilab/configure1674
-rw-r--r--scilab/configure.ac166
-rw-r--r--scilab/contrib/Makefile.in2
-rw-r--r--scilab/etc/modules.xml.in4
-rw-r--r--scilab/libs/MALLOC/Makefile.in2
-rw-r--r--scilab/libs/Makefile.in2
-rw-r--r--scilab/libs/doublylinkedlist/Makefile.in2
-rw-r--r--scilab/libs/dynamiclibrary/Makefile.in2
-rw-r--r--scilab/libs/hashtable/Makefile.in2
-rw-r--r--scilab/libs/libst/Makefile.in2
-rw-r--r--scilab/modules/Makefile.am2
-rw-r--r--scilab/modules/Makefile.in4
-rw-r--r--scilab/modules/action_binding/Makefile.in2
-rw-r--r--scilab/modules/api_scilab/Makefile.in2
-rw-r--r--scilab/modules/arnoldi/Makefile.in2
-rw-r--r--scilab/modules/atoms/Makefile.in2
-rw-r--r--scilab/modules/boolean/Makefile.in2
-rw-r--r--scilab/modules/cacsd/Makefile.in2
-rw-r--r--scilab/modules/call_scilab/Makefile.in2
-rw-r--r--scilab/modules/commons/Makefile.in2
-rw-r--r--scilab/modules/compatibility_functions/Makefile.in2
-rw-r--r--scilab/modules/completion/Makefile.in2
-rw-r--r--scilab/modules/console/Makefile.in2
-rw-r--r--scilab/modules/core/Makefile.in2
-rw-r--r--scilab/modules/core/includes/machine.h.in6
-rw-r--r--scilab/modules/data_structures/Makefile.in2
-rw-r--r--scilab/modules/demo_tools/Makefile.in2
-rw-r--r--scilab/modules/demo_tools/macros/demo_gui.sci327
-rw-r--r--scilab/modules/development_tools/Makefile.in2
-rw-r--r--scilab/modules/development_tools/src/fake/Makefile.in2
-rw-r--r--scilab/modules/differential_equations/Makefile.in2
-rw-r--r--scilab/modules/double/Makefile.in2
-rw-r--r--scilab/modules/dynamic_link/Makefile.in2
-rw-r--r--scilab/modules/elementary_functions/Makefile.in2
-rw-r--r--scilab/modules/fftw/Makefile.in2
-rw-r--r--scilab/modules/fileio/Makefile.in2
-rw-r--r--scilab/modules/functions/Makefile.in2
-rw-r--r--scilab/modules/genetic_algorithms/Makefile.in2
-rw-r--r--scilab/modules/graph/Makefile.in2
-rw-r--r--scilab/modules/graphic_export/Makefile.in2
-rw-r--r--scilab/modules/graphics/Makefile.in2
-rw-r--r--scilab/modules/gui/Makefile.in2
-rw-r--r--scilab/modules/hdf5/Makefile.in2
-rw-r--r--scilab/modules/helptools/Makefile.in2
-rw-r--r--scilab/modules/history_browser/Makefile.in2
-rw-r--r--scilab/modules/history_manager/Makefile.in2
-rw-r--r--scilab/modules/integer/Makefile.in2
-rw-r--r--scilab/modules/interpolation/Makefile.in2
-rw-r--r--scilab/modules/intersci/Makefile.in2
-rw-r--r--scilab/modules/io/Makefile.in2
-rw-r--r--scilab/modules/javasci/Makefile.in2
-rw-r--r--scilab/modules/jvm/Makefile.in2
-rw-r--r--scilab/modules/linear_algebra/Makefile.in2
-rw-r--r--scilab/modules/localization/Makefile.in2
-rw-r--r--scilab/modules/m2sci/Makefile.in2
-rw-r--r--scilab/modules/maple2scilab/Makefile.in2
-rw-r--r--scilab/modules/matio/Makefile.in2
-rw-r--r--scilab/modules/mexlib/Makefile.in2
-rw-r--r--scilab/modules/modules_manager/Makefile.in2
-rw-r--r--scilab/modules/optimization/Makefile.in2
-rw-r--r--scilab/modules/output_stream/Makefile.in2
-rw-r--r--scilab/modules/overloading/Makefile.in2
-rw-r--r--scilab/modules/parallel/Makefile.in2
-rw-r--r--scilab/modules/parameters/Makefile.in2
-rw-r--r--scilab/modules/polynomials/Makefile.in2
-rw-r--r--scilab/modules/pvm/Makefile.in2
-rw-r--r--scilab/modules/randlib/Makefile.in2
-rw-r--r--scilab/modules/renderer/Makefile.in2
-rw-r--r--scilab/modules/scicos/Makefile.am2
-rw-r--r--scilab/modules/scicos/Makefile.in894
-rw-r--r--scilab/modules/scicos/Makefile.modelica.am4
-rw-r--r--scilab/modules/scicos_blocks/Makefile.am2
-rw-r--r--scilab/modules/scicos_blocks/Makefile.in2103
-rw-r--r--scilab/modules/scinotes/Makefile.in2
-rw-r--r--scilab/modules/shell/Makefile.in2
-rw-r--r--scilab/modules/signal_processing/Makefile.in2
-rw-r--r--scilab/modules/simulated_annealing/Makefile.in2
-rw-r--r--scilab/modules/sound/Makefile.in2
-rw-r--r--scilab/modules/sparse/Makefile.in2
-rw-r--r--scilab/modules/special_functions/Makefile.in2
-rw-r--r--scilab/modules/spreadsheet/Makefile.in2
-rw-r--r--scilab/modules/statistics/Makefile.in2
-rw-r--r--scilab/modules/string/Makefile.in2
-rw-r--r--scilab/modules/symbolic/Makefile.in2
-rw-r--r--scilab/modules/tclsci/Makefile.in2
-rw-r--r--scilab/modules/texmacs/Makefile.in2
-rw-r--r--scilab/modules/time/Makefile.in2
-rw-r--r--scilab/modules/types/Makefile.in2
-rw-r--r--scilab/modules/ui_data/Makefile.in2
-rw-r--r--scilab/modules/umfpack/Makefile.in2
-rw-r--r--scilab/modules/windows_tools/Makefile.in2
-rw-r--r--scilab/modules/xcos/Makefile.am4
-rw-r--r--scilab/modules/xcos/Makefile.in8
95 files changed, 2407 insertions, 2968 deletions
diff --git a/scilab/CHANGES_5.3.X b/scilab/CHANGES_5.3.X
index caebe97..bfdce22 100644
--- a/scilab/CHANGES_5.3.X
+++ b/scilab/CHANGES_5.3.X
@@ -9,13 +9,26 @@ Scinotes:
9 definition of foo. 9 definition of foo.
10 10
11 11
12Compilation:
13============
14
15* Option --without-scicos renamed to --without-xcos
16
17* Option --without-ocaml renamed to --without-modelica
18
19* Bug 7049 fixed - jgraphx version was checked even if the --without-xcos
20 flag is set.
21
22* Bug 9018 fixed - --without-xcos disabled the detection of jhdf5 but was still
23 building xcos.
24
25
12Bug fixes: 26Bug fixes:
13========== 27==========
14 28
15* bug 9113 fixed - setlookandfeel could lead to an exception. 29* bug 9113 fixed - setlookandfeel could lead to an exception.
16 30
17 31
18
19 Changes between version 5.3.0 and 5.3.1 of Scilab 32 Changes between version 5.3.0 and 5.3.1 of Scilab
20 ================================================= 33 =================================================
21 34
diff --git a/scilab/Makefile.in b/scilab/Makefile.in
index 415ca26..84aebb7 100644
--- a/scilab/Makefile.in
+++ b/scilab/Makefile.in
@@ -486,7 +486,6 @@ RANLIB = @RANLIB@
486RELOCATABLE = @RELOCATABLE@ 486RELOCATABLE = @RELOCATABLE@
487RT_LIB = @RT_LIB@ 487RT_LIB = @RT_LIB@
488SAXON = @SAXON@ 488SAXON = @SAXON@
489SCICOS_ENABLE = @SCICOS_ENABLE@
490SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 489SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
491SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 490SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
492SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 491SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -512,6 +511,7 @@ USE_NLS = @USE_NLS@
512VERSION = @VERSION@ 511VERSION = @VERSION@
513WITH_OCAML = @WITH_OCAML@ 512WITH_OCAML = @WITH_OCAML@
514WITH_TKSCI = @WITH_TKSCI@ 513WITH_TKSCI = @WITH_TKSCI@
514XCOS_ENABLE = @XCOS_ENABLE@
515XGETTEXT = @XGETTEXT@ 515XGETTEXT = @XGETTEXT@
516XGETTEXT_015 = @XGETTEXT_015@ 516XGETTEXT_015 = @XGETTEXT_015@
517XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 517XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/configure b/scilab/configure
index 2db427f..b35488e 100755
--- a/scilab/configure
+++ b/scilab/configure
@@ -691,19 +691,6 @@ FFTW_FALSE
691FFTW_TRUE 691FFTW_TRUE
692FFTW_ENABLE 692FFTW_ENABLE
693FFTW3_LIB 693FFTW3_LIB
694SCICOS_FALSE
695SCICOS_TRUE
696OCAML_FALSE
697OCAML_TRUE
698SCICOS_ENABLE
699JHDF5
700WITH_OCAML
701OCAMLLEX
702OCAMLYACC
703OCAMLDEP
704OCAMLOPT
705OCAMLC
706RT_LIB
707POSUB 694POSUB
708LTLIBINTL 695LTLIBINTL
709LIBINTL 696LIBINTL
@@ -768,6 +755,7 @@ JOGL
768SKINLF 755SKINLF
769LOOKS 756LOOKS
770FLEXDOCK 757FLEXDOCK
758JHDF5
771JGRAPHX 759JGRAPHX
772ANT 760ANT
773JDB 761JDB
@@ -777,6 +765,18 @@ JAVAH
777JAVA_G 765JAVA_G
778JAVA 766JAVA
779JAVAC 767JAVAC
768XCOS_FALSE
769XCOS_TRUE
770OCAML_FALSE
771OCAML_TRUE
772XCOS_ENABLE
773WITH_OCAML
774OCAMLLEX
775OCAMLYACC
776OCAMLDEP
777OCAMLOPT
778OCAMLC
779RT_LIB
780HDF5_FALSE 780HDF5_FALSE
781HDF5_TRUE 781HDF5_TRUE
782HDF5_ENABLE 782HDF5_ENABLE
@@ -945,13 +945,13 @@ with_fink_prefix
945with_hdf5 945with_hdf5
946with_hdf5_include 946with_hdf5_include
947with_hdf5_library 947with_hdf5_library
948with_xcos
949with_modelica
948with_jdk 950with_jdk
949with_ant 951with_ant
950enable_nls 952enable_nls
951with_libiconv_prefix 953with_libiconv_prefix
952with_libintl_prefix 954with_libintl_prefix
953with_scicos
954with_ocaml
955with_fftw 955with_fftw
956with_fftw_include 956with_fftw_include
957with_fftw_library 957with_fftw_library
@@ -1686,14 +1686,14 @@ Optional Packages:
1686 --without-hdf5 Disable the interface to the HDF5 library 1686 --without-hdf5 Disable the interface to the HDF5 library
1687 --with-hdf5-include=DIR Set the path to the HDF5 headers 1687 --with-hdf5-include=DIR Set the path to the HDF5 headers
1688 --with-hdf5-library=DIR Set the path to the HDF5 libraries 1688 --with-hdf5-library=DIR Set the path to the HDF5 libraries
1689 --without-xcos Disable Xcos
1690 --without-modelica Disable the OCaml module (modelica)
1689 --with-jdk=DIR use JDK from DIR 1691 --with-jdk=DIR use JDK from DIR
1690 --with-ant=DIR Use ant from DIR 1692 --with-ant=DIR Use ant from DIR
1691 --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib 1693 --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
1692 --without-libiconv-prefix don't search for libiconv in includedir and libdir 1694 --without-libiconv-prefix don't search for libiconv in includedir and libdir
1693 --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib 1695 --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
1694 --without-libintl-prefix don't search for libintl in includedir and libdir 1696 --without-libintl-prefix don't search for libintl in includedir and libdir
1695 --without-scicos Disable Scicos
1696 --without-ocaml Disable the OCaml modules (modelica)
1697 --without-fftw Disable the interface to the FFTW 3 library 1697 --without-fftw Disable the interface to the FFTW 3 library
1698 --with-fftw-include=DIR Set the path to the FFTW headers 1698 --with-fftw-include=DIR Set the path to the FFTW headers
1699 --with-fftw-library=DIR Set the path to the FFTW libraries 1699 --with-fftw-library=DIR Set the path to the FFTW libraries
@@ -9915,6 +9915,340 @@ else
9915fi 9915fi
9916 9916
9917 9917
9918#################
9919## XCOS
9920#################
9921
9922
9923# Check whether --with-xcos was given.
9924if test "${with_xcos+set}" = set; then :
9925 withval=$with_xcos;
9926fi
9927
9928
9929
9930# Check whether --with-modelica was given.
9931if test "${with_modelica+set}" = set; then :
9932 withval=$with_modelica;
9933fi
9934
9935
9936
9937XCOS_ENABLE=no
9938
9939if test "$with_xcos" != no -a "$GUI_ENABLE" != no; then
9940
9941$as_echo "#define WITH_XCOS /**/" >>confdefs.h
9942
9943
9944 save_LIBS="$LIBS"
9945
9946 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
9947$as_echo_n "checking for clock_gettime in -lrt... " >&6; }
9948if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then :
9949 $as_echo_n "(cached) " >&6
9950else
9951 ac_check_lib_save_LIBS=$LIBS
9952LIBS="-lrt $LIBS"
9953cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9954/* end confdefs.h. */
9955
9956/* Override any GCC internal prototype to avoid an error.
9957 Use char because int might match the return type of a GCC
9958 builtin and then its argument prototype would still apply. */
9959#ifdef __cplusplus
9960extern "C"
9961#endif
9962char clock_gettime ();
9963int
9964main ()
9965{
9966return clock_gettime ();
9967 ;
9968 return 0;
9969}
9970_ACEOF
9971if ac_fn_c_try_link "$LINENO"; then :
9972 ac_cv_lib_rt_clock_gettime=yes
9973else
9974 ac_cv_lib_rt_clock_gettime=no
9975fi
9976rm -f core conftest.err conftest.$ac_objext \
9977 conftest$ac_exeext conftest.$ac_ext
9978LIBS=$ac_check_lib_save_LIBS
9979fi
9980{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5
9981$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
9982if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then :
9983 RT_LIB="-lrt";
9984
9985$as_echo "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h
9986
9987else
9988 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: librt: library missing (Cannot find symbol clock_gettime). Check if librt is installed (it is usually provided by the libc) and if the version is correct" >&5
9989$as_echo "$as_me: WARNING: librt: library missing (Cannot find symbol clock_gettime). Check if librt is installed (it is usually provided by the libc) and if the version is correct" >&2;}
9990
9991fi
9992
9993 LIBS="$save_LIBS"
9994
9995
9996
9997#################
9998## ocaml which only called when using Xcos
9999#################
10000
10001 if test "$with_modelica" != no; then
10002
10003# checking for ocamlc
10004 OCAMLC=
10005 OCAMLOPT=
10006 OCAMLDEP=
10007 # Extract the first word of "ocamlc", so it can be a program name with args.
10008set dummy ocamlc; ac_word=$2
10009{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10010$as_echo_n "checking for $ac_word... " >&6; }
10011if test "${ac_cv_prog_OCAMLC+set}" = set; then :
10012 $as_echo_n "(cached) " >&6
10013else
10014 if test -n "$OCAMLC"; then
10015 ac_cv_prog_OCAMLC="$OCAMLC" # Let the user override the test.
10016else
10017as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10018for as_dir in $PATH
10019do
10020 IFS=$as_save_IFS
10021 test -z "$as_dir" && as_dir=.
10022 for ac_exec_ext in '' $ac_executable_extensions; do
10023 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
10024 ac_cv_prog_OCAMLC="ocamlc"
10025 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10026 break 2
10027 fi
10028done
10029 done
10030IFS=$as_save_IFS
10031
10032 test -z "$ac_cv_prog_OCAMLC" && ac_cv_prog_OCAMLC="no"
10033fi
10034fi
10035OCAMLC=$ac_cv_prog_OCAMLC
10036if test -n "$OCAMLC"; then
10037 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLC" >&5
10038$as_echo "$OCAMLC" >&6; }
10039else
10040 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10041$as_echo "no" >&6; }
10042fi
10043
10044
10045 if test "$OCAMLC" = no; then
10046 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ocamlc not found. Mandatory to build the Scicos modelica compiler (Use --without-ocaml to disable the Modelica compiler)." >&5
10047$as_echo "$as_me: WARNING: ocamlc not found. Mandatory to build the Scicos modelica compiler (Use --without-ocaml to disable the Modelica compiler)." >&2;}
10048 fi
10049 # Extract the first word of "ocamlopt", so it can be a program name with args.
10050set dummy ocamlopt; ac_word=$2
10051{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10052$as_echo_n "checking for $ac_word... " >&6; }
10053if test "${ac_cv_prog_OCAMLOPT+set}" = set; then :
10054 $as_echo_n "(cached) " >&6
10055else
10056 if test -n "$OCAMLOPT"; then
10057 ac_cv_prog_OCAMLOPT="$OCAMLOPT" # Let the user override the test.
10058else
10059as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10060for as_dir in $PATH
10061do
10062 IFS=$as_save_IFS
10063 test -z "$as_dir" && as_dir=.
10064 for ac_exec_ext in '' $ac_executable_extensions; do
10065 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
10066 ac_cv_prog_OCAMLOPT="ocamlopt"
10067 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10068 break 2
10069 fi
10070done
10071 done
10072IFS=$as_save_IFS
10073
10074 test -z "$ac_cv_prog_OCAMLOPT" && ac_cv_prog_OCAMLOPT="no"
10075fi
10076fi
10077OCAMLOPT=$ac_cv_prog_OCAMLOPT
10078if test -n "$OCAMLOPT"; then
10079 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLOPT" >&5
10080$as_echo "$OCAMLOPT" >&6; }
10081else
10082 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10083$as_echo "no" >&6; }
10084fi
10085
10086
10087 if test "$OCAMLOPT" = no; then
10088 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ocamlopt not found. Mandatory to build the Scicos modelica compiler." >&5
10089$as_echo "$as_me: WARNING: ocamlopt not found. Mandatory to build the Scicos modelica compiler." >&2;}
10090 fi
10091 # Extract the first word of "ocamldep", so it can be a program name with args.
10092set dummy ocamldep; ac_word=$2
10093{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10094$as_echo_n "checking for $ac_word... " >&6; }
10095if test "${ac_cv_prog_OCAMLDEP+set}" = set; then :
10096 $as_echo_n "(cached) " >&6
10097else
10098 if test -n "$OCAMLDEP"; then
10099 ac_cv_prog_OCAMLDEP="$OCAMLDEP" # Let the user override the test.
10100else
10101as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10102for as_dir in $PATH
10103do
10104 IFS=$as_save_IFS
10105 test -z "$as_dir" && as_dir=.
10106 for ac_exec_ext in '' $ac_executable_extensions; do
10107 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
10108 ac_cv_prog_OCAMLDEP="ocamldep"
10109 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10110 break 2
10111 fi
10112done
10113 done
10114IFS=$as_save_IFS
10115
10116 test -z "$ac_cv_prog_OCAMLDEP" && ac_cv_prog_OCAMLDEP="no"
10117fi
10118fi
10119OCAMLDEP=$ac_cv_prog_OCAMLDEP
10120if test -n "$OCAMLDEP"; then
10121 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLDEP" >&5
10122$as_echo "$OCAMLDEP" >&6; }
10123else
10124 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10125$as_echo "no" >&6; }
10126fi
10127
10128
10129 if test "$OCAMLDEP" = no; then
10130 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ocamldep not found. Mandatory to build the Scicos modelica compiler." >&5
10131$as_echo "$as_me: WARNING: ocamldep not found. Mandatory to build the Scicos modelica compiler." >&2;}
10132 fi
10133 # Extract the first word of "ocamlyacc", so it can be a program name with args.
10134set dummy ocamlyacc; ac_word=$2
10135{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10136$as_echo_n "checking for $ac_word... " >&6; }
10137if test "${ac_cv_prog_OCAMLYACC+set}" = set; then :
10138 $as_echo_n "(cached) " >&6
10139else
10140 if test -n "$OCAMLYACC"; then
10141 ac_cv_prog_OCAMLYACC="$OCAMLYACC" # Let the user override the test.
10142else
10143as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10144for as_dir in $PATH
10145do
10146 IFS=$as_save_IFS
10147 test -z "$as_dir" && as_dir=.
10148 for ac_exec_ext in '' $ac_executable_extensions; do
10149 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
10150 ac_cv_prog_OCAMLYACC="ocamlyacc"
10151 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10152 break 2
10153 fi
10154done
10155 done
10156IFS=$as_save_IFS
10157
10158 test -z "$ac_cv_prog_OCAMLYACC" && ac_cv_prog_OCAMLYACC="no"
10159fi
10160fi
10161OCAMLYACC=$ac_cv_prog_OCAMLYACC
10162if test -n "$OCAMLYACC"; then
10163 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLYACC" >&5
10164$as_echo "$OCAMLYACC" >&6; }
10165else
10166 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10167$as_echo "no" >&6; }
10168fi
10169
10170
10171 if test "$OCAMLYACC" = no; then
10172 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ocamlyacc not found. Mandatory to build the Scicos modelica compiler." >&5
10173$as_echo "$as_me: WARNING: ocamlyacc not found. Mandatory to build the Scicos modelica compiler." >&2;}
10174 fi
10175 # Extract the first word of "ocamllex", so it can be a program name with args.
10176set dummy ocamllex; ac_word=$2
10177{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10178$as_echo_n "checking for $ac_word... " >&6; }
10179if test "${ac_cv_prog_OCAMLLEX+set}" = set; then :
10180 $as_echo_n "(cached) " >&6
10181else
10182 if test -n "$OCAMLLEX"; then
10183 ac_cv_prog_OCAMLLEX="$OCAMLLEX" # Let the user override the test.
10184else
10185as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10186for as_dir in $PATH
10187do
10188 IFS=$as_save_IFS
10189 test -z "$as_dir" && as_dir=.
10190 for ac_exec_ext in '' $ac_executable_extensions; do
10191 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
10192 ac_cv_prog_OCAMLLEX="ocamllex"
10193 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10194 break 2
10195 fi
10196done
10197 done
10198IFS=$as_save_IFS
10199
10200 test -z "$ac_cv_prog_OCAMLLEX" && ac_cv_prog_OCAMLLEX="no"
10201fi
10202fi
10203OCAMLLEX=$ac_cv_prog_OCAMLLEX
10204if test -n "$OCAMLLEX"; then
10205 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLLEX" >&5
10206$as_echo "$OCAMLLEX" >&6; }
10207else
10208 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10209$as_echo "no" >&6; }
10210fi
10211
10212
10213 if test "$OCAMLLEX" = no; then
10214 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ocamllex not found. Mandatory to build the Scicos modelica compiler." >&5
10215$as_echo "$as_me: WARNING: ocamllex not found. Mandatory to build the Scicos modelica compiler." >&2;}
10216 fi
10217
10218$as_echo "#define WITH_OCAML /**/" >>confdefs.h
10219
10220
10221
10222
10223
10224
10225
10226
10227
10228
10229 fi
10230 XCOS_ENABLE=yes
10231
10232fi
10233
10234
10235
10236 if test "$with_modelica" != no -a "$OCAMLC" != no -a "$OCAMLOPT" != no; then
10237 OCAML_TRUE=
10238 OCAML_FALSE='#'
10239else
10240 OCAML_TRUE='#'
10241 OCAML_FALSE=
10242fi
10243
10244 if test "$XCOS_ENABLE" != no; then
10245 XCOS_TRUE=
10246 XCOS_FALSE='#'
10247else
10248 XCOS_TRUE='#'
10249 XCOS_FALSE=
10250fi
10251
9918 10252
9919########################### 10253###########################
9920## test for JAVA compiler 10254## test for JAVA compiler
@@ -10160,7 +10494,7 @@ $as_echo "$ac_java_classpath" >&6; }
10160$as_echo_n "checking to see if the java compiler works... " >&6; } 10494$as_echo_n "checking to see if the java compiler works... " >&6; }
10161 10495
10162 cat << \EOF > conftest.java 10496 cat << \EOF > conftest.java
10163// #line 10163 "configure" 10497// #line 10497 "configure"
10164 10498
10165 10499
10166public class conftest { 10500public class conftest {
@@ -10226,7 +10560,7 @@ $as_echo_n "checking type of jvm... " >&6; }
10226 if test "x$ac_java_jvm_name" = "x" ; then 10560 if test "x$ac_java_jvm_name" = "x" ; then
10227 10561
10228 cat << \EOF > conftest.java 10562 cat << \EOF > conftest.java
10229// #line 10229 "configure" 10563// #line 10563 "configure"
10230import gnu.java.io.EncodingManager; 10564import gnu.java.io.EncodingManager;
10231 10565
10232public class conftest { 10566public class conftest {
@@ -10290,7 +10624,7 @@ $as_echo_n "checking java API version... " >&6; }
10290 10624
10291 10625
10292 cat << \EOF > conftest.java 10626 cat << \EOF > conftest.java
10293// #line 10293 "configure" 10627// #line 10627 "configure"
10294import java.nio.charset.Charset; 10628import java.nio.charset.Charset;
10295 10629
10296public class conftest { 10630public class conftest {
@@ -10335,7 +10669,7 @@ EOF
10335 10669
10336 10670
10337 cat << \EOF > conftest.java 10671 cat << \EOF > conftest.java
10338// #line 10338 "configure" 10672// #line 10672 "configure"
10339import java.lang.StringBuilder; 10673import java.lang.StringBuilder;
10340 10674
10341public class conftest { 10675public class conftest {
@@ -11676,14 +12010,16 @@ fi
11676 12010
11677 12011
11678 case "$host_os" in 12012 case "$host_os" in
11679 *Darwin* | *darwin*) 12013 *Darwin* | *darwin*)
11680 JAVA_HOME="";; 12014 JAVA_HOME=""
12015 ;;
11681 esac 12016 esac
11682 12017
11683 12018
11684 if test "$with_gui" != no; then 12019 if test "$with_gui" != no; then
11685 12020
11686 # jgraphx 12021 if test $XCOS_ENABLE = yes; then
12022 # jgraphx
11687 12023
11688 { $as_echo "$as_me:${as_lineno-$LINENO}: checking jgraphx" >&5 12024 { $as_echo "$as_me:${as_lineno-$LINENO}: checking jgraphx" >&5
11689$as_echo_n "checking jgraphx... " >&6; } 12025$as_echo_n "checking jgraphx... " >&6; }
@@ -11704,7 +12040,7 @@ $as_echo_n "checking jgraphx... " >&6; }
11704 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12040 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11705 12041
11706 cat << \EOF > conftest.java 12042 cat << \EOF > conftest.java
11707// #line 11707 "configure" 12043// #line 12043 "configure"
11708import com.mxgraph.model.mxCell; 12044import com.mxgraph.model.mxCell;
11709 12045
11710public class conftest { 12046public class conftest {
@@ -11787,7 +12123,7 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar jgraphx us
11787 fi 12123 fi
11788 fi 12124 fi
11789 12125
11790 JGRAPHX=$PACKAGE_JAR_FILE 12126 JGRAPHX=$PACKAGE_JAR_FILE
11791 12127
11792 12128
11793 12129
@@ -11798,7 +12134,7 @@ $as_echo_n "checking minimal version (1.4.1.0) of jgraphx... " >&6; }
11798 if test "x=" == "x"; then 12134 if test "x=" == "x"; then
11799 12135
11800 cat << \EOF > conftest.java 12136 cat << \EOF > conftest.java
11801// #line 11801 "configure" 12137// #line 12137 "configure"
11802import com.mxgraph.view.mxGraph; 12138import com.mxgraph.view.mxGraph;
11803 12139
11804public class conftest { 12140public class conftest {
@@ -11849,7 +12185,7 @@ EOF
11849 else 12185 else
11850 12186
11851 cat << \EOF > conftest.java 12187 cat << \EOF > conftest.java
11852// #line 11852 "configure" 12188// #line 12188 "configure"
11853import com.mxgraph.view.mxGraph; 12189import com.mxgraph.view.mxGraph;
11854 12190
11855public class conftest { 12191public class conftest {
@@ -11901,6 +12237,298 @@ EOF
11901 ac_java_classpath=$saved_ac_java_classpath 12237 ac_java_classpath=$saved_ac_java_classpath
11902 12238
11903 12239
12240 # Java HDF5 is only needed for Xcos
12241 if test $HDF5_ENABLE = yes -a "$with_xcos" != no -a "$with_gui" != no; then
12242
12243
12244 # HDF5 java lib
12245
12246 { $as_echo "$as_me:${as_lineno-$LINENO}: checking jhdf5" >&5
12247$as_echo_n "checking jhdf5... " >&6; }
12248 PACKAGE_JAR_FILE=
12249 found_jar=no
12250 saved_ac_java_classpath=$ac_java_classpath
12251 DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null) $(ls -d /usr/share/*/lib/ 2>/dev/null)"
12252 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
12253 for jar in "$jardir/jhdf5.jar" "$jardir/libjhdf5.jar" "$jardir/libjhdf5-java.jar" "$jardir/jhdf5*.jar"; do
12254# jar=`echo $jar|sed -e 's/ /\\ /'`
12255# echo "protected $jar"
12256# jar_resolved=`ls $jar 2>/dev/null`
12257# echo "looking for $jar_resolved"
12258# TODO check the behaviour when spaces
12259 jars_resolved=`ls $jar 2>/dev/null`
12260 for jar_resolved in $jars_resolved; do # If several jars matches
12261 if test -e "$jar_resolved"; then
12262 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12263
12264 cat << \EOF > conftest.java
12265// #line 12265 "configure"
12266import ncsa.hdf.hdf5lib.HDF5Constants;
12267
12268public class conftest {
12269 public static void main(String[] argv) {
12270
12271 }
12272}
12273EOF
12274
12275 CLASSPATH=$ac_java_classpath
12276 export CLASSPATH
12277 cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
12278 if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
12279 if test ""no"" = "no"; then
12280 echo "yes" >&5
12281
12282 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
12283$as_echo "$jar_resolved" >&6; }
12284 found_jar=yes
12285 PACKAGE_JAR_FILE=$jar_resolved
12286 break
12287
12288 else
12289 cmd="$JAVA conftest"
12290 if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
12291 echo "yes" >&5
12292
12293 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
12294$as_echo "$jar_resolved" >&6; }
12295 found_jar=yes
12296 PACKAGE_JAR_FILE=$jar_resolved
12297 break
12298
12299 else
12300 echo "configure: failed program was:" >&5
12301 cat conftest.java >&5
12302 if test -s conftest.java.output; then
12303 STDOUT=`cat conftest.java.output`
12304 fi
12305 echo "configure: CLASSPATH was $CLASSPATH" >&5
12306
12307 ac_java_classpath=$saved_ac_java_classpath
12308
12309
12310 fi
12311 fi
12312 if test -f conftest.java.output; then
12313 rm conftest.java.output
12314 fi
12315 else
12316 echo "configure: failed program was:" >&5
12317 cat conftest.java >&5
12318 echo "configure: CLASSPATH was $CLASSPATH" >&5
12319
12320 ac_java_classpath=$saved_ac_java_classpath
12321
12322
12323 fi
12324
12325 fi
12326 done
12327 # If ls returns several results and the first one is OK, stop the search
12328 if test "$found_jar" = "yes"; then
12329 break
12330 fi
12331 done
12332 # If found, no need to search in other directory
12333 if test "$found_jar" = "yes"; then
12334 break
12335 fi
12336 done
12337 if test "$found_jar" = "no"; then
12338 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12339$as_echo "no" >&6; }
12340 if test "" = "yes"; then
12341 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jhdf5 used by HDF5 Java library (looking for package ncsa.hdf.hdf5lib.HDF5Constants)" >&5
12342$as_echo "$as_me: WARNING: Could not find or use the Java package/jar jhdf5 used by HDF5 Java library (looking for package ncsa.hdf.hdf5lib.HDF5Constants)" >&2;}
12343 else
12344 as_fn_error $? "Could not find or use the Java package/jar jhdf5 used by HDF5 Java library (looking for package ncsa.hdf.hdf5lib.HDF5Constants)" "$LINENO" 5
12345 fi
12346 fi
12347
12348 JHDF5=$PACKAGE_JAR_FILE
12349
12350
12351 if test "$MACOSX" = 1; then
12352 echo "Check of the presence of libjhdf5.jnilib disabled under Mac OS X"
12353 else
12354
12355 LDFLAGS_save=$LDFLAGS
12356 # Provide known paths where distribs/OS can store JNI libs
12357 LDFLAGS="-L/usr/lib/jni -L/usr/lib64/jni/ -L$SCI_SRCDIR/bin/ -L$SCI_SRCDIR/thirdparty/ -lpthread $HDF5_LIBS"
12358 # -lpthread because of packaging bug in jhdf5
12359 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for h5JNIFatalError in -ljhdf5" >&5
12360$as_echo_n "checking for h5JNIFatalError in -ljhdf5... " >&6; }
12361if test "${ac_cv_lib_jhdf5_h5JNIFatalError+set}" = set; then :
12362 $as_echo_n "(cached) " >&6
12363else
12364 ac_check_lib_save_LIBS=$LIBS
12365LIBS="-ljhdf5 $LIBS"
12366cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12367/* end confdefs.h. */
12368
12369/* Override any GCC internal prototype to avoid an error.
12370 Use char because int might match the return type of a GCC
12371 builtin and then its argument prototype would still apply. */
12372#ifdef __cplusplus
12373extern "C"
12374#endif
12375char h5JNIFatalError ();
12376int
12377main ()
12378{
12379return h5JNIFatalError ();
12380 ;
12381 return 0;
12382}
12383_ACEOF
12384if ac_fn_c_try_link "$LINENO"; then :
12385 ac_cv_lib_jhdf5_h5JNIFatalError=yes
12386else
12387 ac_cv_lib_jhdf5_h5JNIFatalError=no
12388fi
12389rm -f core conftest.err conftest.$ac_objext \
12390 conftest$ac_exeext conftest.$ac_ext
12391LIBS=$ac_check_lib_save_LIBS
12392fi
12393{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jhdf5_h5JNIFatalError" >&5
12394$as_echo "$ac_cv_lib_jhdf5_h5JNIFatalError" >&6; }
12395if test "x$ac_cv_lib_jhdf5_h5JNIFatalError" = x""yes; then :
12396 JHDF5_LIBS="-ljhdf5"
12397else
12398 as_fn_error $? "libjhdf5: Library missing (Cannot find symbol h5JNIFatalError). Check if libjhdf5 - C/Java (JNI) interface for HDF5 - is installed and if the version is correct. Note that you might have to update etc/librarypath.xml to provide the actual path the the JNI libraries." "$LINENO" 5
12399fi
12400
12401 LDFLAGS=$LDFLAGS_save
12402
12403 LD_LIBRARY_PATH_save=$LD_LIBRARY_PATH
12404 LD_LIBRARY_PATH="/usr/lib/jni:/usr/lib64/jni/:$SCI_SRCDIR/bin/:$SCI_SRCDIR/thirdparty/:$with_hdf5_library"
12405 export LD_LIBRARY_PATH
12406
12407 { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (1.8.4) of hdf5" >&5
12408$as_echo_n "checking minimal version (1.8.4) of hdf5... " >&6; }
12409 saved_ac_java_classpath=$ac_java_classpath
12410 export ac_java_classpath="$JHDF5:$ac_java_classpath"
12411 if test "x" == "x"; then
12412
12413 cat << \EOF > conftest.java
12414// #line 12414 "configure"
12415import ncsa.hdf.hdf5lib.H5;
12416
12417public class conftest {
12418 public static void main(String[] argv) {
12419 String minVersion="1.8.4";
12420 int[] vers = new int[3];
12421 try { H5.H5get_libversion(vers); }
12422 catch (Throwable ex) {System.exit(-1);}
12423 String ver = vers[0] + "."+ vers[1] +"."+vers[2];
12424
12425 System.out.println(ver);
12426 if (minVersion.compareTo(ver) > 0) {
12427 System.exit(-1);
12428 }
12429
12430 }
12431}
12432EOF
12433
12434 CLASSPATH=$ac_java_classpath
12435 export CLASSPATH
12436 cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
12437 if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
12438 if test ""yes"" = "no"; then
12439 echo "yes" >&5
12440 echo "yes"
12441 else
12442 cmd="$JAVA conftest"
12443 if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
12444 echo "yes" >&5
12445 echo "yes"
12446 else
12447 echo "configure: failed program was:" >&5
12448 cat conftest.java >&5
12449 if test -s conftest.java.output; then
12450 STDOUT=`cat conftest.java.output`
12451 fi
12452 echo "configure: CLASSPATH was $CLASSPATH" >&5
12453 as_fn_error $? "Wrong version of hdf5. Expected at least 1.8.4. Found $STDOUT" "$LINENO" 5
12454 fi
12455 fi
12456 if test -f conftest.java.output; then
12457 rm conftest.java.output
12458 fi
12459 else
12460 echo "configure: failed program was:" >&5
12461 cat conftest.java >&5
12462 echo "configure: CLASSPATH was $CLASSPATH" >&5
12463 as_fn_error $? "Wrong version of hdf5. Expected at least 1.8.4. Found $STDOUT" "$LINENO" 5
12464 fi
12465
12466 else
12467
12468 cat << \EOF > conftest.java
12469// #line 12469 "configure"
12470import ncsa.hdf.hdf5lib.H5;
12471
12472public class conftest {
12473 public static void main(String[] argv) {
12474 String minVersion="1.8.4";
12475 int[] vers = new int[3];
12476 try { H5.H5get_libversion(vers); }
12477 catch (Throwable ex) {System.exit(-1);}
12478 String ver = vers[0] + "."+ vers[1] +"."+vers[2];
12479
12480 System.out.println(ver);
12481 if (minVersion.compareTo(ver) != 0) {
12482 System.exit(-1);
12483 }
12484
12485 }
12486}
12487EOF
12488
12489 CLASSPATH=$ac_java_classpath
12490 export CLASSPATH
12491 cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
12492 if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
12493 if test ""yes"" = "no"; then
12494 echo "yes" >&5
12495 echo "yes"
12496 else
12497 cmd="$JAVA conftest"
12498 if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
12499 echo "yes" >&5
12500 echo "yes"
12501 else
12502 echo "configure: failed program was:" >&5
12503 cat conftest.java >&5
12504 if test -s conftest.java.output; then
12505 STDOUT=`cat conftest.java.output`
12506 fi
12507 echo "configure: CLASSPATH was $CLASSPATH" >&5
12508 as_fn_error $? "Wrong version of hdf5. Expected exact version 1.8.4. Found $STDOUT" "$LINENO" 5
12509 fi
12510 fi
12511 if test -f conftest.java.output; then
12512 rm conftest.java.output
12513 fi
12514 else
12515 echo "configure: failed program was:" >&5
12516 cat conftest.java >&5
12517 echo "configure: CLASSPATH was $CLASSPATH" >&5
12518 as_fn_error $? "Wrong version of hdf5. Expected exact version 1.8.4. Found $STDOUT" "$LINENO" 5
12519 fi
12520
12521 fi
12522 ac_java_classpath=$saved_ac_java_classpath
12523
12524 unset LD_LIBRARY_PATH
12525 LD_LIBRARY_PATH=$LD_LIBRARY_PATH_save
12526
12527 fi
12528 fi #HDF5_ENABLE
12529
12530 fi
12531
11904 # Docking system 12532 # Docking system
11905 12533
11906 { $as_echo "$as_me:${as_lineno-$LINENO}: checking flexdock" >&5 12534 { $as_echo "$as_me:${as_lineno-$LINENO}: checking flexdock" >&5
@@ -11922,7 +12550,7 @@ $as_echo_n "checking flexdock... " >&6; }
11922 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12550 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11923 12551
11924 cat << \EOF > conftest.java 12552 cat << \EOF > conftest.java
11925// #line 11925 "configure" 12553// #line 12553 "configure"
11926import org.flexdock.docking.DockingManager; 12554import org.flexdock.docking.DockingManager;
11927 12555
11928public class conftest { 12556public class conftest {
@@ -12016,7 +12644,7 @@ $as_echo_n "checking minimal version (0.5.2) of flexdock... " >&6; }
12016 if test "x" == "x"; then 12644 if test "x" == "x"; then
12017 12645
12018 cat << \EOF > conftest.java 12646 cat << \EOF > conftest.java
12019// #line 12019 "configure" 12647// #line 12647 "configure"
12020import org.flexdock.util.Utilities; 12648import org.flexdock.util.Utilities;
12021 12649
12022public class conftest { 12650public class conftest {
@@ -12067,7 +12695,7 @@ EOF
12067 else 12695 else
12068 12696
12069 cat << \EOF > conftest.java 12697 cat << \EOF > conftest.java
12070// #line 12070 "configure" 12698// #line 12698 "configure"
12071import org.flexdock.util.Utilities; 12699import org.flexdock.util.Utilities;
12072 12700
12073public class conftest { 12701public class conftest {
@@ -12140,7 +12768,7 @@ $as_echo_n "checking looks... " >&6; }
12140 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12768 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12141 12769
12142 cat << \EOF > conftest.java 12770 cat << \EOF > conftest.java
12143// #line 12143 "configure" 12771// #line 12771 "configure"
12144import com.jgoodies.looks.common.RenderingUtils; 12772import com.jgoodies.looks.common.RenderingUtils;
12145 12773
12146public class conftest { 12774public class conftest {
@@ -12247,7 +12875,7 @@ $as_echo_n "checking jgoodies-looks... " >&6; }
12247 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12875 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12248 12876
12249 cat << \EOF > conftest.java 12877 cat << \EOF > conftest.java
12250// #line 12250 "configure" 12878// #line 12878 "configure"
12251import com.jgoodies.looks.common.RenderingUtils; 12879import com.jgoodies.looks.common.RenderingUtils;
12252 12880
12253public class conftest { 12881public class conftest {
@@ -12355,7 +12983,7 @@ $as_echo_n "checking skinlf... " >&6; }
12355 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12983 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12356 12984
12357 cat << \EOF > conftest.java 12985 cat << \EOF > conftest.java
12358// #line 12358 "configure" 12986// #line 12986 "configure"
12359import com.l2fprod.util.AccessUtils; 12987import com.l2fprod.util.AccessUtils;
12360 12988
12361public class conftest { 12989public class conftest {
@@ -12462,7 +13090,7 @@ $as_echo_n "checking jogl... " >&6; }
12462 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13090 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12463 13091
12464 cat << \EOF > conftest.java 13092 cat << \EOF > conftest.java
12465// #line 12465 "configure" 13093// #line 13093 "configure"
12466import javax.media.opengl.glu.GLUnurbs; 13094import javax.media.opengl.glu.GLUnurbs;
12467 13095
12468public class conftest { 13096public class conftest {
@@ -12674,7 +13302,7 @@ $as_echo_n "checking gluegen-rt... " >&6; }
12674 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13302 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12675 13303
12676 cat << \EOF > conftest.java 13304 cat << \EOF > conftest.java
12677// #line 12677 "configure" 13305// #line 13305 "configure"
12678import com.sun.gluegen.runtime.CPU; 13306import com.sun.gluegen.runtime.CPU;
12679 13307
12680public class conftest { 13308public class conftest {
@@ -12835,7 +13463,7 @@ $as_echo_n "checking jhall... " >&6; }
12835 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13463 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12836 13464
12837 cat << \EOF > conftest.java 13465 cat << \EOF > conftest.java
12838// #line 12838 "configure" 13466// #line 13466 "configure"
12839import javax.help.JHelp; 13467import javax.help.JHelp;
12840 13468
12841public class conftest { 13469public class conftest {
@@ -12942,7 +13570,7 @@ $as_echo_n "checking javahelp2... " >&6; }
12942 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13570 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12943 13571
12944 cat << \EOF > conftest.java 13572 cat << \EOF > conftest.java
12945// #line 12945 "configure" 13573// #line 13573 "configure"
12946import javax.help.JHelp; 13574import javax.help.JHelp;
12947 13575
12948public class conftest { 13576public class conftest {
@@ -13050,7 +13678,7 @@ $as_echo_n "checking jrosetta-API... " >&6; }
13050 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13678 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13051 13679
13052 cat << \EOF > conftest.java 13680 cat << \EOF > conftest.java
13053// #line 13053 "configure" 13681// #line 13681 "configure"
13054import com.artenum.rosetta.interfaces.core.ConsoleConfiguration; 13682import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
13055 13683
13056public class conftest { 13684public class conftest {
@@ -13157,7 +13785,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
13157 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13785 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13158 13786
13159 cat << \EOF > conftest.java 13787 cat << \EOF > conftest.java
13160// #line 13160 "configure" 13788// #line 13788 "configure"
13161import com.artenum.rosetta.core.action.AbstractConsoleAction; 13789import com.artenum.rosetta.core.action.AbstractConsoleAction;
13162 13790
13163public class conftest { 13791public class conftest {
@@ -13266,7 +13894,7 @@ $as_echo_n "checking jeuclid-core... " >&6; }
13266 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13894 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13267 13895
13268 cat << \EOF > conftest.java 13896 cat << \EOF > conftest.java
13269// #line 13269 "configure" 13897// #line 13897 "configure"
13270import net.sourceforge.jeuclid.LayoutContext; 13898import net.sourceforge.jeuclid.LayoutContext;
13271 13899
13272public class conftest { 13900public class conftest {
@@ -13375,7 +14003,7 @@ $as_echo_n "checking fop... " >&6; }
13375 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14003 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13376 14004
13377 cat << \EOF > conftest.java 14005 cat << \EOF > conftest.java
13378// #line 13378 "configure" 14006// #line 14006 "configure"
13379import org.apache.fop.pdf.PDFInfo; 14007import org.apache.fop.pdf.PDFInfo;
13380 14008
13381public class conftest { 14009public class conftest {
@@ -13482,7 +14110,7 @@ $as_echo_n "checking batik-all... " >&6; }
13482 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14110 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13483 14111
13484 cat << \EOF > conftest.java 14112 cat << \EOF > conftest.java
13485// #line 13485 "configure" 14113// #line 14113 "configure"
13486import org.apache.batik.parser.Parser; 14114import org.apache.batik.parser.Parser;
13487 14115
13488public class conftest { 14116public class conftest {
@@ -13589,7 +14217,7 @@ $as_echo_n "checking batik... " >&6; }
13589 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14217 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13590 14218
13591 cat << \EOF > conftest.java 14219 cat << \EOF > conftest.java
13592// #line 13592 "configure" 14220// #line 14220 "configure"
13593import org.apache.batik.parser.Parser; 14221import org.apache.batik.parser.Parser;
13594 14222
13595public class conftest { 14223public class conftest {
@@ -13683,7 +14311,7 @@ $as_echo_n "checking minimal version (1.7) of batik... " >&6; }
13683 if test "x" == "x"; then 14311 if test "x" == "x"; then
13684 14312
13685 cat << \EOF > conftest.java 14313 cat << \EOF > conftest.java
13686// #line 13686 "configure" 14314// #line 14314 "configure"
13687import org.apache.batik.Version; 14315import org.apache.batik.Version;
13688 14316
13689public class conftest { 14317public class conftest {
@@ -13734,7 +14362,7 @@ EOF
13734 else 14362 else
13735 14363
13736 cat << \EOF > conftest.java 14364 cat << \EOF > conftest.java
13737// #line 13737 "configure" 14365// #line 14365 "configure"
13738import org.apache.batik.Version; 14366import org.apache.batik.Version;
13739 14367
13740public class conftest { 14368public class conftest {
@@ -13807,7 +14435,7 @@ $as_echo_n "checking commons-io... " >&6; }
13807 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14435 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13808 14436
13809 cat << \EOF > conftest.java 14437 cat << \EOF > conftest.java
13810// #line 13810 "configure" 14438// #line 14438 "configure"
13811import org.apache.commons.io.output.CountingOutputStream; 14439import org.apache.commons.io.output.CountingOutputStream;
13812 14440
13813public class conftest { 14441public class conftest {
@@ -13914,7 +14542,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
13914 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14542 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13915 14543
13916 cat << \EOF > conftest.java 14544 cat << \EOF > conftest.java
13917// #line 13917 "configure" 14545// #line 14545 "configure"
13918import org.apache.xmlgraphics.util.Service; 14546import org.apache.xmlgraphics.util.Service;
13919 14547
13920public class conftest { 14548public class conftest {
@@ -14021,7 +14649,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
14021 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14649 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14022 14650
14023 cat << \EOF > conftest.java 14651 cat << \EOF > conftest.java
14024// #line 14024 "configure" 14652// #line 14652 "configure"
14025import org.apache.avalon.framework.configuration.ConfigurationException; 14653import org.apache.avalon.framework.configuration.ConfigurationException;
14026 14654
14027public class conftest { 14655public class conftest {
@@ -14128,7 +14756,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
14128 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14756 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14129 14757
14130 cat << \EOF > conftest.java 14758 cat << \EOF > conftest.java
14131// #line 14131 "configure" 14759// #line 14759 "configure"
14132import org.w3c.dom.svg.SVGDocument; 14760import org.w3c.dom.svg.SVGDocument;
14133 14761
14134public class conftest { 14762public class conftest {
@@ -14235,7 +14863,7 @@ $as_echo_n "checking xml-commons-apis-ext... " >&6; }
14235 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14863 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14236 14864
14237 cat << \EOF > conftest.java 14865 cat << \EOF > conftest.java
14238// #line 14238 "configure" 14866// #line 14866 "configure"
14239import org.w3c.dom.svg.SVGDocument; 14867import org.w3c.dom.svg.SVGDocument;
14240 14868
14241public class conftest { 14869public class conftest {
@@ -14346,7 +14974,7 @@ $as_echo_n "checking commons-logging... " >&6; }
14346 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14974 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14347 14975
14348 cat << \EOF > conftest.java 14976 cat << \EOF > conftest.java
14349// #line 14349 "configure" 14977// #line 14977 "configure"
14350import org.apache.commons.logging.LogFactory; 14978import org.apache.commons.logging.LogFactory;
14351 14979
14352public class conftest { 14980public class conftest {
@@ -14453,7 +15081,7 @@ $as_echo_n "checking jlatexmath... " >&6; }
14453 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15081 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14454 15082
14455 cat << \EOF > conftest.java 15083 cat << \EOF > conftest.java
14456// #line 14456 "configure" 15084// #line 15084 "configure"
14457import org.scilab.forge.jlatexmath.TeXFormula; 15085import org.scilab.forge.jlatexmath.TeXFormula;
14458 15086
14459public class conftest { 15087public class conftest {
@@ -14547,7 +15175,7 @@ $as_echo_n "checking minimal version (0.9.4) of jlatexmath... " >&6; }
14547 if test "x" == "x"; then 15175 if test "x" == "x"; then
14548 15176
14549 cat << \EOF > conftest.java 15177 cat << \EOF > conftest.java
14550// #line 14550 "configure" 15178// #line 15178 "configure"
14551import org.scilab.forge.jlatexmath.TeXFormula; 15179import org.scilab.forge.jlatexmath.TeXFormula;
14552 15180
14553public class conftest { 15181public class conftest {
@@ -14598,7 +15226,7 @@ EOF
14598 else 15226 else
14599 15227
14600 cat << \EOF > conftest.java 15228 cat << \EOF > conftest.java
14601// #line 14601 "configure" 15229// #line 15229 "configure"
14602import org.scilab.forge.jlatexmath.TeXFormula; 15230import org.scilab.forge.jlatexmath.TeXFormula;
14603 15231
14604public class conftest { 15232public class conftest {
@@ -14677,7 +15305,7 @@ $as_echo_n "checking checkstyle... " >&6; }
14677 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15305 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14678 15306
14679 cat << \EOF > conftest.java 15307 cat << \EOF > conftest.java
14680// #line 14680 "configure" 15308// #line 15308 "configure"
14681import com.puppycrawl.tools.checkstyle.CheckStyleTask; 15309import com.puppycrawl.tools.checkstyle.CheckStyleTask;
14682 15310
14683public class conftest { 15311public class conftest {
@@ -14784,7 +15412,7 @@ $as_echo_n "checking commons-beanutils... " >&6; }
14784 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15412 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14785 15413
14786 cat << \EOF > conftest.java 15414 cat << \EOF > conftest.java
14787// #line 14787 "configure" 15415// #line 15415 "configure"
14788import org.apache.commons.beanutils.Converter; 15416import org.apache.commons.beanutils.Converter;
14789 15417
14790public class conftest { 15418public class conftest {
@@ -14891,7 +15519,7 @@ $as_echo_n "checking antlr... " >&6; }
14891 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15519 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14892 15520
14893 cat << \EOF > conftest.java 15521 cat << \EOF > conftest.java
14894// #line 14894 "configure" 15522// #line 15522 "configure"
14895import antlr.TokenStreamException; 15523import antlr.TokenStreamException;
14896 15524
14897public class conftest { 15525public class conftest {
@@ -14998,7 +15626,7 @@ $as_echo_n "checking testng... " >&6; }
14998 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15626 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14999 15627
15000 cat << \EOF > conftest.java 15628 cat << \EOF > conftest.java
15001// #line 15001 "configure" 15629// #line 15629 "configure"
15002import org.testng.TestNG; 15630import org.testng.TestNG;
15003 15631
15004public class conftest { 15632public class conftest {
@@ -15105,7 +15733,7 @@ $as_echo_n "checking qdox... " >&6; }
15105 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15733 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
15106 15734
15107 cat << \EOF > conftest.java 15735 cat << \EOF > conftest.java
15108// #line 15108 "configure" 15736// #line 15736 "configure"
15109import com.thoughtworks.qdox.tools.QDoxTester; 15737import com.thoughtworks.qdox.tools.QDoxTester;
15110 15738
15111public class conftest { 15739public class conftest {
@@ -15212,7 +15840,7 @@ $as_echo_n "checking bsh... " >&6; }
15212 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15840 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
15213 15841
15214 cat << \EOF > conftest.java 15842 cat << \EOF > conftest.java
15215// #line 15215 "configure" 15843// #line 15843 "configure"
15216import bsh.Console; 15844import bsh.Console;
15217 15845
15218public class conftest { 15846public class conftest {
@@ -15319,7 +15947,7 @@ $as_echo_n "checking junit... " >&6; }
15319 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15947 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
15320 15948
15321 cat << \EOF > conftest.java 15949 cat << \EOF > conftest.java
15322// #line 15322 "configure" 15950// #line 15950 "configure"
15323import junit.framework.Assert; 15951import junit.framework.Assert;
15324 15952
15325public class conftest { 15953public class conftest {
@@ -15638,6 +16266,7 @@ fi
15638 16266
15639 16267
15640 16268
16269# Xcos is not checked here because gui=no disables it
15641 if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no; then 16270 if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no; then
15642 NEED_JAVA_TRUE= 16271 NEED_JAVA_TRUE=
15643 NEED_JAVA_FALSE='#' 16272 NEED_JAVA_FALSE='#'
@@ -19002,871 +19631,6 @@ fi
19002 19631
19003 19632
19004################# 19633#################
19005## SCICOS
19006#################
19007
19008
19009# Check whether --with-scicos was given.
19010if test "${with_scicos+set}" = set; then :
19011 withval=$with_scicos;
19012fi
19013
19014
19015
19016# Check whether --with-ocaml was given.
19017if test "${with_ocaml+set}" = set; then :
19018 withval=$with_ocaml;
19019fi
19020
19021
19022
19023SCICOS_ENABLE=no
19024
19025if test "$with_scicos" != no -a "$GUI_ENABLE" != no; then
19026
19027$as_echo "#define WITH_SCICOS /**/" >>confdefs.h
19028
19029
19030 save_LIBS="$LIBS"
19031
19032 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
19033$as_echo_n "checking for clock_gettime in -lrt... " >&6; }
19034if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then :
19035 $as_echo_n "(cached) " >&6
19036else
19037 ac_check_lib_save_LIBS=$LIBS
19038LIBS="-lrt $LIBS"
19039cat confdefs.h - <<_ACEOF >conftest.$ac_ext
19040/* end confdefs.h. */
19041
19042/* Override any GCC internal prototype to avoid an error.
19043 Use char because int might match the return type of a GCC
19044 builtin and then its argument prototype would still apply. */
19045#ifdef __cplusplus
19046extern "C"
19047#endif
19048char clock_gettime ();
19049int
19050main ()
19051{
19052return clock_gettime ();
19053 ;
19054 return 0;
19055}
19056_ACEOF
19057if ac_fn_c_try_link "$LINENO"; then :
19058 ac_cv_lib_rt_clock_gettime=yes
19059else
19060 ac_cv_lib_rt_clock_gettime=no
19061fi
19062rm -f core conftest.err conftest.$ac_objext \
19063 conftest$ac_exeext conftest.$ac_ext
19064LIBS=$ac_check_lib_save_LIBS
19065fi
19066{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5
19067$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
19068if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then :
19069 RT_LIB="-lrt";
19070
19071$as_echo "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h
19072
19073else
19074 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: librt: library missing (Cannot find symbol clock_gettime). Check if librt is installed (it is usually provided by the libc) and if the version is correct" >&5
19075$as_echo "$as_me: WARNING: librt: library missing (Cannot find symbol clock_gettime). Check if librt is installed (it is usually provided by the libc) and if the version is correct" >&2;}
19076
19077fi
19078
19079 LIBS="$save_LIBS"
19080
19081
19082
19083#################
19084## ocaml which only called when using Scicos
19085#################
19086
19087 if test "$with_ocaml" != no; then
19088
19089# checking for ocamlc
19090 OCAMLC=
19091 OCAMLOPT=
19092 OCAMLDEP=
19093 # Extract the first word of "ocamlc", so it can be a program name with args.
19094set dummy ocamlc; ac_word=$2
19095{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19096$as_echo_n "checking for $ac_word... " >&6; }
19097if test "${ac_cv_prog_OCAMLC+set}" = set; then :
19098 $as_echo_n "(cached) " >&6
19099else
19100 if test -n "$OCAMLC"; then
19101 ac_cv_prog_OCAMLC="$OCAMLC" # Let the user override the test.
19102else
19103as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19104for as_dir in $PATH
19105do
19106 IFS=$as_save_IFS
19107 test -z "$as_dir" && as_dir=.
19108 for ac_exec_ext in '' $ac_executable_extensions; do
19109 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19110 ac_cv_prog_OCAMLC="ocamlc"
19111 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19112 break 2
19113 fi
19114done
19115 done
19116IFS=$as_save_IFS
19117
19118 test -z "$ac_cv_prog_OCAMLC" && ac_cv_prog_OCAMLC="no"
19119fi
19120fi
19121OCAMLC=$ac_cv_prog_OCAMLC
19122if test -n "$OCAMLC"; then
19123 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLC" >&5
19124$as_echo "$OCAMLC" >&6; }
19125else
19126 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19127$as_echo "no" >&6; }
19128fi
19129
19130
19131 if test "$OCAMLC" = no; then
19132 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ocamlc not found. Mandatory to build the Scicos modelica compiler (Use --without-ocaml to disable the Modelica compiler)." >&5
19133$as_echo "$as_me: WARNING: ocamlc not found. Mandatory to build the Scicos modelica compiler (Use --without-ocaml to disable the Modelica compiler)." >&2;}
19134 fi
19135 # Extract the first word of "ocamlopt", so it can be a program name with args.
19136set dummy ocamlopt; ac_word=$2
19137{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19138$as_echo_n "checking for $ac_word... " >&6; }
19139if test "${ac_cv_prog_OCAMLOPT+set}" = set; then :
19140 $as_echo_n "(cached) " >&6
19141else
19142 if test -n "$OCAMLOPT"; then
19143 ac_cv_prog_OCAMLOPT="$OCAMLOPT" # Let the user override the test.
19144else
19145as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19146for as_dir in $PATH
19147do
19148 IFS=$as_save_IFS
19149 test -z "$as_dir" && as_dir=.
19150 for ac_exec_ext in '' $ac_executable_extensions; do
19151 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19152 ac_cv_prog_OCAMLOPT="ocamlopt"
19153 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19154 break 2
19155 fi
19156done
19157 done
19158IFS=$as_save_IFS
19159
19160 test -z "$ac_cv_prog_OCAMLOPT" && ac_cv_prog_OCAMLOPT="no"
19161fi
19162fi
19163OCAMLOPT=$ac_cv_prog_OCAMLOPT
19164if test -n "$OCAMLOPT"; then
19165 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLOPT" >&5
19166$as_echo "$OCAMLOPT" >&6; }
19167else
19168 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19169$as_echo "no" >&6; }
19170fi
19171
19172
19173 if test "$OCAMLOPT" = no; then
19174 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ocamlopt not found. Mandatory to build the Scicos modelica compiler." >&5
19175$as_echo "$as_me: WARNING: ocamlopt not found. Mandatory to build the Scicos modelica compiler." >&2;}
19176 fi
19177 # Extract the first word of "ocamldep", so it can be a program name with args.
19178set dummy ocamldep; ac_word=$2
19179{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19180$as_echo_n "checking for $ac_word... " >&6; }
19181if test "${ac_cv_prog_OCAMLDEP+set}" = set; then :
19182 $as_echo_n "(cached) " >&6
19183else
19184 if test -n "$OCAMLDEP"; then
19185 ac_cv_prog_OCAMLDEP="$OCAMLDEP" # Let the user override the test.
19186else
19187as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19188for as_dir in $PATH
19189do
19190 IFS=$as_save_IFS
19191 test -z "$as_dir" && as_dir=.
19192 for ac_exec_ext in '' $ac_executable_extensions; do
19193 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19194 ac_cv_prog_OCAMLDEP="ocamldep"
19195 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19196 break 2
19197 fi
19198done
19199 done
19200IFS=$as_save_IFS
19201
19202 test -z "$ac_cv_prog_OCAMLDEP" && ac_cv_prog_OCAMLDEP="no"
19203fi
19204fi
19205OCAMLDEP=$ac_cv_prog_OCAMLDEP
19206if test -n "$OCAMLDEP"; then
19207 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLDEP" >&5
19208$as_echo "$OCAMLDEP" >&6; }
19209else
19210 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19211$as_echo "no" >&6; }
19212fi
19213
19214
19215 if test "$OCAMLDEP" = no; then
19216 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ocamldep not found. Mandatory to build the Scicos modelica compiler." >&5
19217$as_echo "$as_me: WARNING: ocamldep not found. Mandatory to build the Scicos modelica compiler." >&2;}
19218 fi
19219 # Extract the first word of "ocamlyacc", so it can be a program name with args.
19220set dummy ocamlyacc; ac_word=$2
19221{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19222$as_echo_n "checking for $ac_word... " >&6; }
19223if test "${ac_cv_prog_OCAMLYACC+set}" = set; then :
19224 $as_echo_n "(cached) " >&6
19225else
19226 if test -n "$OCAMLYACC"; then
19227 ac_cv_prog_OCAMLYACC="$OCAMLYACC" # Let the user override the test.
19228else
19229as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19230for as_dir in $PATH
19231do
19232 IFS=$as_save_IFS
19233 test -z "$as_dir" && as_dir=.
19234 for ac_exec_ext in '' $ac_executable_extensions; do
19235 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19236 ac_cv_prog_OCAMLYACC="ocamlyacc"
19237 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19238 break 2
19239 fi
19240done
19241 done
19242IFS=$as_save_IFS
19243
19244 test -z "$ac_cv_prog_OCAMLYACC" && ac_cv_prog_OCAMLYACC="no"
19245fi
19246fi
19247OCAMLYACC=$ac_cv_prog_OCAMLYACC
19248if test -n "$OCAMLYACC"; then
19249 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLYACC" >&5
19250$as_echo "$OCAMLYACC" >&6; }
19251else
19252 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19253$as_echo "no" >&6; }
19254fi
19255
19256
19257 if test "$OCAMLYACC" = no; then
19258 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ocamlyacc not found. Mandatory to build the Scicos modelica compiler." >&5
19259$as_echo "$as_me: WARNING: ocamlyacc not found. Mandatory to build the Scicos modelica compiler." >&2;}
19260 fi
19261 # Extract the first word of "ocamllex", so it can be a program name with args.
19262set dummy ocamllex; ac_word=$2
19263{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19264$as_echo_n "checking for $ac_word... " >&6; }
19265if test "${ac_cv_prog_OCAMLLEX+set}" = set; then :
19266 $as_echo_n "(cached) " >&6
19267else
19268 if test -n "$OCAMLLEX"; then
19269 ac_cv_prog_OCAMLLEX="$OCAMLLEX" # Let the user override the test.
19270else
19271as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19272for as_dir in $PATH
19273do
19274 IFS=$as_save_IFS
19275 test -z "$as_dir" && as_dir=.
19276 for ac_exec_ext in '' $ac_executable_extensions; do
19277 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19278 ac_cv_prog_OCAMLLEX="ocamllex"
19279 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19280 break 2
19281 fi
19282done
19283 done
19284IFS=$as_save_IFS
19285
19286 test -z "$ac_cv_prog_OCAMLLEX" && ac_cv_prog_OCAMLLEX="no"
19287fi
19288fi
19289OCAMLLEX=$ac_cv_prog_OCAMLLEX
19290if test -n "$OCAMLLEX"; then
19291 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLLEX" >&5
19292$as_echo "$OCAMLLEX" >&6; }
19293else
19294 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19295$as_echo "no" >&6; }
19296fi
19297
19298
19299 if test "$OCAMLLEX" = no; then
19300 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ocamllex not found. Mandatory to build the Scicos modelica compiler." >&5
19301$as_echo "$as_me: WARNING: ocamllex not found. Mandatory to build the Scicos modelica compiler." >&2;}
19302 fi
19303
19304$as_echo "#define WITH_OCAML /**/" >>confdefs.h
19305
19306
19307
19308
19309
19310
19311
19312
19313
19314
19315 fi
19316 SCICOS_ENABLE=yes
19317
19318# Java HDF5 is only needed for Xcos
19319if test $HDF5_ENABLE = yes -a "$with_scicos" != no -a "$with_gui" != no; then
19320
19321
19322 # HDF5 java lib
19323
19324 { $as_echo "$as_me:${as_lineno-$LINENO}: checking jhdf5" >&5
19325$as_echo_n "checking jhdf5... " >&6; }
19326 PACKAGE_JAR_FILE=
19327 found_jar=no
19328 saved_ac_java_classpath=$ac_java_classpath
19329 DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null) $(ls -d /usr/share/*/lib/ 2>/dev/null)"
19330 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
19331 for jar in "$jardir/jhdf5.jar" "$jardir/libjhdf5.jar" "$jardir/libjhdf5-java.jar" "$jardir/jhdf5*.jar"; do
19332# jar=`echo $jar|sed -e 's/ /\\ /'`
19333# echo "protected $jar"
19334# jar_resolved=`ls $jar 2>/dev/null`
19335# echo "looking for $jar_resolved"
19336# TODO check the behaviour when spaces
19337 jars_resolved=`ls $jar 2>/dev/null`
19338 for jar_resolved in $jars_resolved; do # If several jars matches
19339 if test -e "$jar_resolved"; then
19340 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
19341
19342 cat << \EOF > conftest.java
19343// #line 19343 "configure"
19344import ncsa.hdf.hdf5lib.HDF5Constants;
19345
19346public class conftest {
19347 public static void main(String[] argv) {
19348
19349 }
19350}
19351EOF
19352
19353 CLASSPATH=$ac_java_classpath
19354 export CLASSPATH
19355 cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
19356 if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
19357 if test ""no"" = "no"; then
19358 echo "yes" >&5
19359
19360 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
19361$as_echo "$jar_resolved" >&6; }
19362 found_jar=yes
19363 PACKAGE_JAR_FILE=$jar_resolved
19364 break
19365
19366 else
19367 cmd="$JAVA conftest"
19368 if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
19369 echo "yes" >&5
19370
19371 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
19372$as_echo "$jar_resolved" >&6; }
19373 found_jar=yes
19374 PACKAGE_JAR_FILE=$jar_resolved
19375 break
19376
19377 else
19378 echo "configure: failed program was:" >&5
19379 cat conftest.java >&5
19380 if test -s conftest.java.output; then
19381 STDOUT=`cat conftest.java.output`
19382 fi
19383 echo "configure: CLASSPATH was $CLASSPATH" >&5
19384
19385 ac_java_classpath=$saved_ac_java_classpath
19386
19387
19388 fi
19389 fi
19390 if test -f conftest.java.output; then
19391 rm conftest.java.output
19392 fi
19393 else
19394 echo "configure: failed program was:" >&5
19395 cat conftest.java >&5
19396 echo "configure: CLASSPATH was $CLASSPATH" >&5
19397
19398 ac_java_classpath=$saved_ac_java_classpath
19399
19400
19401 fi
19402
19403 fi
19404 done
19405 # If ls returns several results and the first one is OK, stop the search
19406 if test "$found_jar" = "yes"; then
19407 break
19408 fi
19409 done
19410 # If found, no need to search in other directory
19411 if test "$found_jar" = "yes"; then
19412 break
19413 fi
19414 done
19415 if test "$found_jar" = "no"; then
19416 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19417$as_echo "no" >&6; }
19418 if test "" = "yes"; then
19419 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jhdf5 used by HDF5 Java library (looking for package ncsa.hdf.hdf5lib.HDF5Constants)" >&5
19420$as_echo "$as_me: WARNING: Could not find or use the Java package/jar jhdf5 used by HDF5 Java library (looking for package ncsa.hdf.hdf5lib.HDF5Constants)" >&2;}
19421 else
19422 as_fn_error $? "Could not find or use the Java package/jar jhdf5 used by HDF5 Java library (looking for package ncsa.hdf.hdf5lib.HDF5Constants)" "$LINENO" 5
19423 fi
19424 fi
19425
19426 JHDF5=$PACKAGE_JAR_FILE
19427
19428
19429 if test "$MACOSX" = 1; then
19430 echo "Check of the presence of libjhdf5.jnilib disabled under Mac OS X"
19431 else
19432
19433 LDFLAGS_save=$LDFLAGS
19434 # Provide known paths where distribs/OS can store JNI libs
19435 LDFLAGS="-L/usr/lib/jni -L/usr/lib64/jni/ -L$SCI_SRCDIR/bin/ -L$SCI_SRCDIR/thirdparty/ -lpthread $HDF5_LIBS"
19436 # -lpthread because of packaging bug in jhdf5
19437 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for h5JNIFatalError in -ljhdf5" >&5
19438$as_echo_n "checking for h5JNIFatalError in -ljhdf5... " >&6; }
19439if test "${ac_cv_lib_jhdf5_h5JNIFatalError+set}" = set; then :
19440 $as_echo_n "(cached) " >&6
19441else
19442 ac_check_lib_save_LIBS=$LIBS
19443LIBS="-ljhdf5 $LIBS"
19444cat confdefs.h - <<_ACEOF >conftest.$ac_ext
19445/* end confdefs.h. */
19446
19447/* Override any GCC internal prototype to avoid an error.
19448 Use char because int might match the return type of a GCC
19449 builtin and then its argument prototype would still apply. */
19450#ifdef __cplusplus
19451extern "C"
19452#endif
19453char h5JNIFatalError ();
19454int
19455main ()
19456{
19457return h5JNIFatalError ();
19458 ;
19459 return 0;
19460}
19461_ACEOF
19462if ac_fn_c_try_link "$LINENO"; then :
19463 ac_cv_lib_jhdf5_h5JNIFatalError=yes
19464else
19465 ac_cv_lib_jhdf5_h5JNIFatalError=no
19466fi
19467rm -f core conftest.err conftest.$ac_objext \
19468 conftest$ac_exeext conftest.$ac_ext
19469LIBS=$ac_check_lib_save_LIBS
19470fi
19471{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jhdf5_h5JNIFatalError" >&5
19472$as_echo "$ac_cv_lib_jhdf5_h5JNIFatalError" >&6; }
19473if test "x$ac_cv_lib_jhdf5_h5JNIFatalError" = x""yes; then :
19474 JHDF5_LIBS="-ljhdf5"
19475else
19476 as_fn_error $? "libjhdf5: Library missing (Cannot find symbol h5JNIFatalError). Check if libjhdf5 - C/Java (JNI) interface for HDF5 - is installed and if the version is correct. Note that you might have to update etc/librarypath.xml to provide the actual path the the JNI libraries." "$LINENO" 5
19477fi
19478
19479 LDFLAGS=$LDFLAGS_save
19480
19481 LD_LIBRARY_PATH_save=$LD_LIBRARY_PATH
19482 LD_LIBRARY_PATH="/usr/lib/jni:/usr/lib64/jni/:$SCI_SRCDIR/bin/:$SCI_SRCDIR/thirdparty/:$with_hdf5_library"
19483 export LD_LIBRARY_PATH
19484
19485 { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (1.8.4) of hdf5" >&5
19486$as_echo_n "checking minimal version (1.8.4) of hdf5... " >&6; }
19487 saved_ac_java_classpath=$ac_java_classpath
19488 export ac_java_classpath="$JHDF5:$ac_java_classpath"
19489 if test "x" == "x"; then
19490
19491 cat << \EOF > conftest.java
19492// #line 19492 "configure"
19493import ncsa.hdf.hdf5lib.H5;
19494
19495public class conftest {
19496 public static void main(String[] argv) {
19497 String minVersion="1.8.4";
19498 int[] vers = new int[3];
19499 try { H5.H5get_libversion(vers); }
19500 catch (Throwable ex) {System.exit(-1);}
19501 String ver = vers[0] + "."+ vers[1] +"."+vers[2];
19502
19503 System.out.println(ver);
19504 if (minVersion.compareTo(ver) > 0) {
19505 System.exit(-1);
19506 }
19507
19508 }
19509}
19510EOF
19511
19512 CLASSPATH=$ac_java_classpath
19513 export CLASSPATH
19514 cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
19515 if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
19516 if test ""yes"" = "no"; then
19517 echo "yes" >&5
19518 echo "yes"
19519 else
19520 cmd="$JAVA conftest"
19521 if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
19522 echo "yes" >&5
19523 echo "yes"
19524 else
19525 echo "configure: failed program was:" >&5
19526 cat conftest.java >&5
19527 if test -s conftest.java.output; then
19528 STDOUT=`cat conftest.java.output`
19529 fi
19530 echo "configure: CLASSPATH was $CLASSPATH" >&5
19531 as_fn_error $? "Wrong version of hdf5. Expected at least 1.8.4. Found $STDOUT" "$LINENO" 5
19532 fi
19533 fi
19534 if test -f conftest.java.output; then
19535 rm conftest.java.output
19536 fi
19537 else
19538 echo "configure: failed program was:" >&5
19539 cat conftest.java >&5
19540 echo "configure: CLASSPATH was $CLASSPATH" >&5
19541 as_fn_error $? "Wrong version of hdf5. Expected at least 1.8.4. Found $STDOUT" "$LINENO" 5
19542 fi
19543
19544 else
19545
19546 cat << \EOF > conftest.java
19547// #line 19547 "configure"
19548import ncsa.hdf.hdf5lib.H5;
19549
19550public class conftest {
19551 public static void main(String[] argv) {
19552 String minVersion="1.8.4";
19553 int[] vers = new int[3];
19554 try { H5.H5get_libversion(vers); }
19555 catch (Throwable ex) {System.exit(-1);}
19556 String ver = vers[0] + "."+ vers[1] +"."+vers[2];
19557
19558 System.out.println(ver);
19559 if (minVersion.compareTo(ver) != 0) {
19560 System.exit(-1);
19561 }
19562
19563 }
19564}
19565EOF
19566
19567 CLASSPATH=$ac_java_classpath
19568 export CLASSPATH
19569 cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
19570 if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
19571 if test ""yes"" = "no"; then
19572 echo "yes" >&5
19573 echo "yes"
19574 else
19575 cmd="$JAVA conftest"
19576 if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
19577 echo "yes" >&5
19578 echo "yes"
19579 else
19580 echo "configure: failed program was:" >&5
19581 cat conftest.java >&5
19582 if test -s conftest.java.output; then
19583 STDOUT=`cat conftest.java.output`
19584 fi
19585 echo "configure: CLASSPATH was $CLASSPATH" >&5
19586 as_fn_error $? "Wrong version of hdf5. Expected exact version 1.8.4. Found $STDOUT" "$LINENO" 5
19587 fi
19588 fi
19589 if test -f conftest.java.output; then
19590 rm conftest.java.output
19591 fi
19592 else
19593 echo "configure: failed program was:" >&5
19594 cat conftest.java >&5
19595 echo "configure: CLASSPATH was $CLASSPATH" >&5
19596 as_fn_error $? "Wrong version of hdf5. Expected exact version 1.8.4. Found $STDOUT" "$LINENO" 5
19597 fi
19598
19599 fi
19600 ac_java_classpath=$saved_ac_java_classpath
19601
19602 unset LD_LIBRARY_PATH
19603 LD_LIBRARY_PATH=$LD_LIBRARY_PATH_save
19604
19605 fi
19606fi #HDF5_ENABLE
19607
19608#################
19609## ocaml which only called when using Scicos
19610#################
19611
19612 if test "$with_ocaml" != no; then
19613
19614# checking for ocamlc
19615 OCAMLC=
19616 OCAMLOPT=
19617 OCAMLDEP=
19618 # Extract the first word of "ocamlc", so it can be a program name with args.
19619set dummy ocamlc; ac_word=$2
19620{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19621$as_echo_n "checking for $ac_word... " >&6; }
19622if test "${ac_cv_prog_OCAMLC+set}" = set; then :
19623 $as_echo_n "(cached) " >&6
19624else
19625 if test -n "$OCAMLC"; then
19626 ac_cv_prog_OCAMLC="$OCAMLC" # Let the user override the test.
19627else
19628as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19629for as_dir in $PATH
19630do
19631 IFS=$as_save_IFS
19632 test -z "$as_dir" && as_dir=.
19633 for ac_exec_ext in '' $ac_executable_extensions; do
19634 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19635 ac_cv_prog_OCAMLC="ocamlc"
19636 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19637 break 2
19638 fi
19639done
19640 done
19641IFS=$as_save_IFS
19642
19643 test -z "$ac_cv_prog_OCAMLC" && ac_cv_prog_OCAMLC="no"
19644fi
19645fi
19646OCAMLC=$ac_cv_prog_OCAMLC
19647if test -n "$OCAMLC"; then
19648 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLC" >&5
19649$as_echo "$OCAMLC" >&6; }
19650else
19651 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19652$as_echo "no" >&6; }
19653fi
19654
19655
19656 if test "$OCAMLC" = no; then
19657 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ocamlc not found. Mandatory to build the Scicos modelica compiler (Use --without-ocaml to disable the Modelica compiler)." >&5
19658$as_echo "$as_me: WARNING: ocamlc not found. Mandatory to build the Scicos modelica compiler (Use --without-ocaml to disable the Modelica compiler)." >&2;}
19659 fi
19660 # Extract the first word of "ocamlopt", so it can be a program name with args.
19661set dummy ocamlopt; ac_word=$2
19662{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19663$as_echo_n "checking for $ac_word... " >&6; }
19664if test "${ac_cv_prog_OCAMLOPT+set}" = set; then :
19665 $as_echo_n "(cached) " >&6
19666else
19667 if test -n "$OCAMLOPT"; then
19668 ac_cv_prog_OCAMLOPT="$OCAMLOPT" # Let the user override the test.
19669else
19670as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19671for as_dir in $PATH
19672do
19673 IFS=$as_save_IFS
19674 test -z "$as_dir" && as_dir=.
19675 for ac_exec_ext in '' $ac_executable_extensions; do
19676 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19677 ac_cv_prog_OCAMLOPT="ocamlopt"
19678 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19679 break 2
19680 fi
19681done
19682 done
19683IFS=$as_save_IFS
19684
19685 test -z "$ac_cv_prog_OCAMLOPT" && ac_cv_prog_OCAMLOPT="no"
19686fi
19687fi
19688OCAMLOPT=$ac_cv_prog_OCAMLOPT
19689if test -n "$OCAMLOPT"; then
19690 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLOPT" >&5
19691$as_echo "$OCAMLOPT" >&6; }
19692else
19693 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19694$as_echo "no" >&6; }
19695fi
19696
19697
19698 if test "$OCAMLOPT" = no; then
19699 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ocamlopt not found. Mandatory to build the Scicos modelica compiler." >&5
19700$as_echo "$as_me: WARNING: ocamlopt not found. Mandatory to build the Scicos modelica compiler." >&2;}
19701 fi
19702 # Extract the first word of "ocamldep", so it can be a program name with args.
19703set dummy ocamldep; ac_word=$2
19704{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19705$as_echo_n "checking for $ac_word... " >&6; }
19706if test "${ac_cv_prog_OCAMLDEP+set}" = set; then :
19707 $as_echo_n "(cached) " >&6
19708else
19709 if test -n "$OCAMLDEP"; then
19710 ac_cv_prog_OCAMLDEP="$OCAMLDEP" # Let the user override the test.
19711else
19712as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19713for as_dir in $PATH
19714do
19715 IFS=$as_save_IFS
19716 test -z "$as_dir" && as_dir=.
19717 for ac_exec_ext in '' $ac_executable_extensions; do
19718 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19719 ac_cv_prog_OCAMLDEP="ocamldep"
19720 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19721 break 2
19722 fi
19723done
19724 done
19725IFS=$as_save_IFS
19726
19727 test -z "$ac_cv_prog_OCAMLDEP" && ac_cv_prog_OCAMLDEP="no"
19728fi
19729fi
19730OCAMLDEP=$ac_cv_prog_OCAMLDEP
19731if test -n "$OCAMLDEP"; then
19732 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLDEP" >&5
19733$as_echo "$OCAMLDEP" >&6; }
19734else
19735 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19736$as_echo "no" >&6; }
19737fi
19738
19739
19740 if test "$OCAMLDEP" = no; then
19741 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ocamldep not found. Mandatory to build the Scicos modelica compiler." >&5
19742$as_echo "$as_me: WARNING: ocamldep not found. Mandatory to build the Scicos modelica compiler." >&2;}
19743 fi
19744 # Extract the first word of "ocamlyacc", so it can be a program name with args.
19745set dummy ocamlyacc; ac_word=$2
19746{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19747$as_echo_n "checking for $ac_word... " >&6; }
19748if test "${ac_cv_prog_OCAMLYACC+set}" = set; then :
19749 $as_echo_n "(cached) " >&6
19750else
19751 if test -n "$OCAMLYACC"; then
19752 ac_cv_prog_OCAMLYACC="$OCAMLYACC" # Let the user override the test.
19753else
19754as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19755for as_dir in $PATH
19756do
19757 IFS=$as_save_IFS
19758 test -z "$as_dir" && as_dir=.
19759 for ac_exec_ext in '' $ac_executable_extensions; do
19760 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19761 ac_cv_prog_OCAMLYACC="ocamlyacc"
19762 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19763 break 2
19764 fi
19765done
19766 done
19767IFS=$as_save_IFS
19768
19769 test -z "$ac_cv_prog_OCAMLYACC" && ac_cv_prog_OCAMLYACC="no"
19770fi
19771fi
19772OCAMLYACC=$ac_cv_prog_OCAMLYACC
19773if test -n "$OCAMLYACC"; then
19774 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLYACC" >&5
19775$as_echo "$OCAMLYACC" >&6; }
19776else
19777 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19778$as_echo "no" >&6; }
19779fi
19780
19781
19782 if test "$OCAMLYACC" = no; then
19783 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ocamlyacc not found. Mandatory to build the Scicos modelica compiler." >&5
19784$as_echo "$as_me: WARNING: ocamlyacc not found. Mandatory to build the Scicos modelica compiler." >&2;}
19785 fi
19786 # Extract the first word of "ocamllex", so it can be a program name with args.
19787set dummy ocamllex; ac_word=$2
19788{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19789$as_echo_n "checking for $ac_word... " >&6; }
19790if test "${ac_cv_prog_OCAMLLEX+set}" = set; then :
19791 $as_echo_n "(cached) " >&6
19792else
19793 if test -n "$OCAMLLEX"; then
19794 ac_cv_prog_OCAMLLEX="$OCAMLLEX" # Let the user override the test.
19795else
19796as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19797for as_dir in $PATH
19798do
19799 IFS=$as_save_IFS
19800 test -z "$as_dir" && as_dir=.
19801 for ac_exec_ext in '' $ac_executable_extensions; do
19802 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19803 ac_cv_prog_OCAMLLEX="ocamllex"
19804 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19805 break 2
19806 fi
19807done
19808 done
19809IFS=$as_save_IFS
19810
19811 test -z "$ac_cv_prog_OCAMLLEX" && ac_cv_prog_OCAMLLEX="no"
19812fi
19813fi
19814OCAMLLEX=$ac_cv_prog_OCAMLLEX
19815if test -n "$OCAMLLEX"; then
19816 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLLEX" >&5
19817$as_echo "$OCAMLLEX" >&6; }
19818else
19819 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19820$as_echo "no" >&6; }
19821fi
19822
19823
19824 if test "$OCAMLLEX" = no; then
19825 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ocamllex not found. Mandatory to build the Scicos modelica compiler." >&5
19826$as_echo "$as_me: WARNING: ocamllex not found. Mandatory to build the Scicos modelica compiler." >&2;}
19827 fi
19828
19829$as_echo "#define WITH_OCAML /**/" >>confdefs.h
19830
19831
19832
19833
19834
19835
19836
19837
19838
19839
19840 fi
19841 SCICOS_ENABLE=yes
19842fi
19843
19844
19845
19846
19847
19848
19849
19850
19851 if test "$with_ocaml" != no -a "$OCAMLC" != no -a "$OCAMLOPT" != no; then
19852 OCAML_TRUE=
19853 OCAML_FALSE='#'
19854else
19855 OCAML_TRUE='#'
19856 OCAML_FALSE=
19857fi
19858
19859 if test "$SCICOS_ENABLE" != no; then
19860 SCICOS_TRUE=
19861 SCICOS_FALSE='#'
19862else
19863 SCICOS_TRUE='#'
19864 SCICOS_FALSE=
19865fi
19866
19867
19868
19869#################
19870## FFTW 19634## FFTW
19871################# 19635#################
19872 19636
@@ -24205,7 +23969,7 @@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_PATH"
24205{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5 23969{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
24206$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; } 23970$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
24207cat > conftest.$ac_ext <<EOF 23971cat > conftest.$ac_ext <<EOF
24208#line 24208 "configure" 23972#line 23972 "configure"
24209#include "confdefs.h" 23973#include "confdefs.h"
24210 23974
24211#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME" 23975#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@ -24515,7 +24279,7 @@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CHK_TK_INCLUDE_PATH $X_CFLAGS"
24515$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; } 24279$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
24516 24280
24517cat > conftest.$ac_ext <<EOF 24281cat > conftest.$ac_ext <<EOF
24518#line 24518 "configure" 24282#line 24282 "configure"
24519#include "confdefs.h" 24283#include "confdefs.h"
24520 24284
24521#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME" 24285#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@ -25096,7 +24860,7 @@ $as_echo_n "checking saxon... " >&6; }
25096 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 24860 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
25097 24861
25098 cat << \EOF > conftest.java 24862 cat << \EOF > conftest.java
25099// #line 25099 "configure" 24863// #line 24863 "configure"
25100import com.icl.saxon.Loader; 24864import com.icl.saxon.Loader;
25101 24865
25102public class conftest { 24866public class conftest {
@@ -25203,7 +24967,7 @@ $as_echo_n "checking jlatexmath-fop... " >&6; }
25203 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 24967 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
25204 24968
25205 cat << \EOF > conftest.java 24969 cat << \EOF > conftest.java
25206// #line 25206 "configure" 24970// #line 24970 "configure"
25207import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj; 24971import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
25208 24972
25209public class conftest { 24973public class conftest {
@@ -31510,7 +31274,7 @@ else
31510 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 31274 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
31511 lt_status=$lt_dlunknown 31275 lt_status=$lt_dlunknown
31512 cat > conftest.$ac_ext <<_LT_EOF 31276 cat > conftest.$ac_ext <<_LT_EOF
31513#line 31513 "configure" 31277#line 31277 "configure"
31514#include "confdefs.h" 31278#include "confdefs.h"
31515 31279
31516#if HAVE_DLFCN_H 31280#if HAVE_DLFCN_H
@@ -31616,7 +31380,7 @@ else
31616 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 31380 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
31617 lt_status=$lt_dlunknown 31381 lt_status=$lt_dlunknown
31618 cat > conftest.$ac_ext <<_LT_EOF 31382 cat > conftest.$ac_ext <<_LT_EOF
31619#line 31619 "configure" 31383#line 31383 "configure"
31620#include "confdefs.h" 31384#include "confdefs.h"
31621 31385
31622#if HAVE_DLFCN_H 31386#if HAVE_DLFCN_H
@@ -37655,7 +37419,7 @@ if test "$enable_yasp" = yes; then
37655 37419
37656fi 37420fi
37657 37421
37658# This script is used by Scicos in order to regenerate the function/block list 37422# This script is used by Xcos in order to regenerate the function/block list
37659 37423
37660 37424
37661 37425
@@ -37842,6 +37606,14 @@ if test -z "${HDF5_TRUE}" && test -z "${HDF5_FALSE}"; then
37842 as_fn_error $? "conditional \"HDF5\" was never defined. 37606 as_fn_error $? "conditional \"HDF5\" was never defined.
37843Usually this means the macro was only invoked conditionally." "$LINENO" 5 37607Usually this means the macro was only invoked conditionally." "$LINENO" 5
37844fi 37608fi
37609if test -z "${OCAML_TRUE}" && test -z "${OCAML_FALSE}"; then
37610 as_fn_error $? "conditional \"OCAML\" was never defined.
37611Usually this means the macro was only invoked conditionally." "$LINENO" 5
37612fi
37613if test -z "${XCOS_TRUE}" && test -z "${XCOS_FALSE}"; then
37614 as_fn_error $? "conditional \"XCOS\" was never defined.
37615Usually this means the macro was only invoked conditionally." "$LINENO" 5
37616fi
37845if test -z "${NEED_JAVA_TRUE}" && test -z "${NEED_JAVA_FALSE}"; then 37617if test -z "${NEED_JAVA_TRUE}" && test -z "${NEED_JAVA_FALSE}"; then
37846 as_fn_error $? "conditional \"NEED_JAVA\" was never defined. 37618 as_fn_error $? "conditional \"NEED_JAVA\" was never defined.
37847Usually this means the macro was only invoked conditionally." "$LINENO" 5 37619Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -37862,14 +37634,6 @@ if test -z "${GIWS_TRUE}" && test -z "${GIWS_FALSE}"; then
37862 as_fn_error $? "conditional \"GIWS\" was never defined. 37634 as_fn_error $? "conditional \"GIWS\" was never defined.
37863Usually this means the macro was only invoked conditionally." "$LINENO" 5 37635Usually this means the macro was only invoked conditionally." "$LINENO" 5
37864fi 37636fi
37865if test -z "${OCAML_TRUE}" && test -z "${OCAML_FALSE}"; then
37866 as_fn_error $? "conditional \"OCAML\" was never defined.
37867Usually this means the macro was only invoked conditionally." "$LINENO" 5
37868fi
37869if test -z "${SCICOS_TRUE}" && test -z "${SCICOS_FALSE}"; then
37870 as_fn_error $? "conditional \"SCICOS\" was never defined.
37871Usually this means the macro was only invoked conditionally." "$LINENO" 5
37872fi
37873if test -z "${FFTW_TRUE}" && test -z "${FFTW_FALSE}"; then 37637if test -z "${FFTW_TRUE}" && test -z "${FFTW_FALSE}"; then
37874 as_fn_error $? "conditional \"FFTW\" was never defined. 37638 as_fn_error $? "conditional \"FFTW\" was never defined.
37875Usually this means the macro was only invoked conditionally." "$LINENO" 5 37639Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -40936,7 +40700,6 @@ echo "Options:"
40936echo " Use PVM (--without-pvm) .......................... = $with_pvm" 40700echo " Use PVM (--without-pvm) .......................... = $with_pvm"
40937echo " PVM include (--with-pvm-include) ................. = $PVMINCLUDE" 40701echo " PVM include (--with-pvm-include) ................. = $PVMINCLUDE"
40938echo " PVM library (--with-pvm-library) ................. = $PVMLIBDIR" 40702echo " PVM library (--with-pvm-library) ................. = $PVMLIBDIR"
40939echo " Compile with Ocaml (--without-ocaml) ............. = $with_ocaml"
40940echo " Do not use TCL/TK (--without-tk) ................. = $with_tk" 40703echo " Do not use TCL/TK (--without-tk) ................. = $with_tk"
40941echo " TCL include (--with-tcl-include) ................. = $USER_TCL_INC_PATH" 40704echo " TCL include (--with-tcl-include) ................. = $USER_TCL_INC_PATH"
40942echo " TCL library (--with-tcl-library) ................. = $USER_TCL_LIB_PATH" 40705echo " TCL library (--with-tcl-library) ................. = $USER_TCL_LIB_PATH"
@@ -40950,21 +40713,22 @@ echo " Use MATIO (--without-matio) ...................... = $with_matio"
40950 40713
40951echo "" 40714echo ""
40952if test "$with_gui" = no; then 40715if test "$with_gui" = no; then
40953 echo "Not using Scicos because of the option --without-gui" 40716 echo "Not using Xcos because of the option --without-gui"
40954else 40717else
40955if test $SCICOS_ENABLE = yes; then 40718if test $XCOS_ENABLE = yes; then
40956 echo "Scicos enable" 40719 echo "Xcos enable"
40720 echo "Build modelica compiler (--without-modelica) ....... = $with_modelica"
40957 echo "" 40721 echo ""
40958if test "$with_ocaml" != no -a "$OCAMLC" != no -a "$OCAMLOPT" != no; then 40722 if test "$with_ocaml" != no -a "$OCAMLC" != no -a "$OCAMLOPT" != no; then
40959 echo "Ocaml Configuration (for Modelica compiler):" 40723 echo "Ocaml Configuration (for Modelica compiler):"
40960 echo " OCAMLC ............. = $OCAMLC" 40724 echo " OCAMLC ............. = $OCAMLC"
40961 echo " OCAMLOPT ........... = $OCAMLOPT" 40725 echo " OCAMLOPT ........... = $OCAMLOPT"
40962 echo " OCAMLDEP ........... = $OCAMLDEP" 40726 echo " OCAMLDEP ........... = $OCAMLDEP"
40963else 40727 else
40964 echo "Will not build Modelica compiler" 40728 echo "Will not build Modelica compiler"
40965fi 40729 fi
40966else 40730else
40967 echo "Not using Scicos" 40731 echo "Not using Xcos"
40968fi 40732fi
40969fi 40733fi
40970 40734
diff --git a/scilab/configure.ac b/scilab/configure.ac
index c4ad8d7..5c4a04d 100644
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -716,6 +716,48 @@ fi
716AC_SUBST(HDF5_ENABLE) 716AC_SUBST(HDF5_ENABLE)
717AM_CONDITIONAL(HDF5, test "$with_hdf5" != no) 717AM_CONDITIONAL(HDF5, test "$with_hdf5" != no)
718 718
719#################
720## XCOS
721#################
722
723AC_ARG_WITH(xcos,
724 AC_HELP_STRING([--without-xcos],[Disable Xcos]))
725
726AC_ARG_WITH(modelica,
727 AC_HELP_STRING([--without-modelica],[Disable the OCaml module (modelica)]))
728
729
730XCOS_ENABLE=no
731
732if test "$with_xcos" != no -a "$GUI_ENABLE" != no; then
733 AC_DEFINE([WITH_XCOS], [], [With XCOS])
734
735 save_LIBS="$LIBS"
736
737 AC_CHECK_LIB([rt], [clock_gettime],
738 [RT_LIB="-lrt";
739 AC_DEFINE([HAVE_CLOCK_GETTIME], [1],[Whether clock_gettime is available]) ],
740 [AC_MSG_WARN([librt: library missing (Cannot find symbol clock_gettime). Check if librt is installed (it is usually provided by the libc) and if the version is correct])]
741 )
742 LIBS="$save_LIBS"
743 AC_SUBST(RT_LIB)
744
745
746#################
747## ocaml which only called when using Xcos
748#################
749
750 if test "$with_modelica" != no; then
751 AC_CHECK_PROG_OCAML()
752 fi
753 XCOS_ENABLE=yes
754
755fi
756
757AC_SUBST(XCOS_ENABLE)
758
759AM_CONDITIONAL(OCAML, test "$with_modelica" != no -a "$OCAMLC" != no -a "$OCAMLOPT" != no)
760AM_CONDITIONAL(XCOS, test "$XCOS_ENABLE" != no)
719 761
720########################### 762###########################
721## test for JAVA compiler 763## test for JAVA compiler
@@ -749,19 +791,33 @@ if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no
749 AC_JAVA_ANT 791 AC_JAVA_ANT
750 792
751 case "$host_os" in 793 case "$host_os" in
752 *Darwin* | *darwin*) 794 *Darwin* | *darwin*)
753 JAVA_HOME="";; 795 JAVA_HOME=""
796 ;;
754 esac 797 esac
755 798
756 799
757 if test "$with_gui" != no; then 800 if test "$with_gui" != no; then
758 801
759 # jgraphx 802 if test $XCOS_ENABLE = yes; then
760 AC_JAVA_CHECK_PACKAGE([jgraphx],[com.mxgraph.model.mxCell],[Diagram design]) 803 # jgraphx
761 JGRAPHX=$PACKAGE_JAR_FILE 804 AC_JAVA_CHECK_PACKAGE([jgraphx],[com.mxgraph.model.mxCell],[Diagram design])
762 AC_SUBST(JGRAPHX) 805 JGRAPHX=$PACKAGE_JAR_FILE
806 AC_SUBST(JGRAPHX)
763 807
764 AC_JAVA_CHECK_VERSION_PACKAGE([jgraphx],[import com.mxgraph.view.mxGraph;],$JGRAPHX,[1.4.1.0],[mxGraph.VERSION],[],[=]) 808 AC_JAVA_CHECK_VERSION_PACKAGE([jgraphx],[import com.mxgraph.view.mxGraph;],$JGRAPHX,[1.4.1.0],[mxGraph.VERSION],[],[=])
809
810 # Java HDF5 is only needed for Xcos
811 if test $HDF5_ENABLE = yes -a "$with_xcos" != no -a "$with_gui" != no; then
812 AC_JAVA_HDF5()
813 if test "$MACOSX" = 1; then
814 echo "Check of the presence of libjhdf5.jnilib disabled under Mac OS X"
815 else
816 AC_JNI_HDF5()
817 fi
818 fi #HDF5_ENABLE
819
820 fi
765 821
766 # Docking system 822 # Docking system
767 AC_JAVA_CHECK_PACKAGE([flexdock],[org.flexdock.docking.DockingManager],[Scilab Gui]) 823 AC_JAVA_CHECK_PACKAGE([flexdock],[org.flexdock.docking.DockingManager],[Scilab Gui])
@@ -1001,6 +1057,7 @@ fi
1001 1057
1002AC_SUBST(JAVA_ENABLE) 1058AC_SUBST(JAVA_ENABLE)
1003 1059
1060# Xcos is not checked here because gui=no disables it
1004AM_CONDITIONAL(NEED_JAVA, test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no) 1061AM_CONDITIONAL(NEED_JAVA, test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no)
1005AM_CONDITIONAL(GUI, test "$with_gui" != no) 1062AM_CONDITIONAL(GUI, test "$with_gui" != no)
1006AM_CONDITIONAL(JAVASCI, test "$with_javasci" != no) 1063AM_CONDITIONAL(JAVASCI, test "$with_javasci" != no)
@@ -1202,73 +1259,6 @@ AC_CHECK_LIB(dl, dlopen)
1202AC_SEARCH_LIBS([pthread_join],[pthread]) 1259AC_SEARCH_LIBS([pthread_join],[pthread])
1203 1260
1204################# 1261#################
1205## SCICOS
1206#################
1207
1208AC_ARG_WITH(scicos,
1209 AC_HELP_STRING([--without-scicos],[Disable Scicos]))
1210
1211AC_ARG_WITH(ocaml,
1212 AC_HELP_STRING([--without-ocaml],[Disable the OCaml modules (modelica)]))
1213
1214
1215SCICOS_ENABLE=no
1216
1217if test "$with_scicos" != no -a "$GUI_ENABLE" != no; then
1218 AC_DEFINE([WITH_SCICOS], [], [With SCICOS])
1219
1220 save_LIBS="$LIBS"
1221
1222 AC_CHECK_LIB([rt], [clock_gettime],
1223 [RT_LIB="-lrt";
1224 AC_DEFINE([HAVE_CLOCK_GETTIME], [1],[Whether clock_gettime is available]) ],
1225 [AC_MSG_WARN([librt: library missing (Cannot find symbol clock_gettime). Check if librt is installed (it is usually provided by the libc) and if the version is correct])]
1226 )
1227 LIBS="$save_LIBS"
1228 AC_SUBST(RT_LIB)
1229
1230
1231#################
1232## ocaml which only called when using Scicos
1233#################
1234
1235 if test "$with_ocaml" != no; then
1236 AC_CHECK_PROG_OCAML()
1237 fi
1238 SCICOS_ENABLE=yes
1239
1240# Java HDF5 is only needed for Xcos
1241if test $HDF5_ENABLE = yes -a "$with_scicos" != no -a "$with_gui" != no; then
1242AC_JAVA_HDF5()
1243 if test "$MACOSX" = 1; then
1244 echo "Check of the presence of libjhdf5.jnilib disabled under Mac OS X"
1245 else
1246 AC_JNI_HDF5()
1247 fi
1248fi #HDF5_ENABLE
1249
1250#################
1251## ocaml which only called when using Scicos
1252#################
1253
1254 if test "$with_ocaml" != no; then
1255 AC_CHECK_PROG_OCAML()
1256 fi
1257 SCICOS_ENABLE=yes
1258fi
1259
1260
1261
1262
1263
1264
1265AC_SUBST(SCICOS_ENABLE)
1266
1267AM_CONDITIONAL(OCAML, test "$with_ocaml" != no -a "$OCAMLC" != no -a "$OCAMLOPT" != no)
1268AM_CONDITIONAL(SCICOS, test "$SCICOS_ENABLE" != no)
1269
1270
1271#################
1272## FFTW 1262## FFTW
1273################# 1263#################
1274 1264
@@ -1799,7 +1789,7 @@ if test "$enable_yasp" = yes; then
1799 ]) 1789 ])
1800fi 1790fi
1801 1791
1802# This script is used by Scicos in order to regenerate the function/block list 1792# This script is used by Xcos in order to regenerate the function/block list
1803AC_CONFIG_COMMANDS_POST([chmod +x $SCI_SRCDIR_FULL/modules/scicos_blocks/src/scripts/GenBlocks.sh $SCI_SRCDIR_FULL/modules/dynamic_link/src/scripts/scicompile.sh $SCI_SRCDIR_FULL/modules/dynamic_link/src/scripts/compilerDetection.sh $SCI_SRCDIR_FULL/modules/dynamic_link/src/scripts/configure]) 1793AC_CONFIG_COMMANDS_POST([chmod +x $SCI_SRCDIR_FULL/modules/scicos_blocks/src/scripts/GenBlocks.sh $SCI_SRCDIR_FULL/modules/dynamic_link/src/scripts/scicompile.sh $SCI_SRCDIR_FULL/modules/dynamic_link/src/scripts/compilerDetection.sh $SCI_SRCDIR_FULL/modules/dynamic_link/src/scripts/configure])
1804 1794
1805 1795
@@ -1883,7 +1873,6 @@ echo "Options:"
1883echo " Use PVM (--without-pvm) .......................... = $with_pvm" 1873echo " Use PVM (--without-pvm) .......................... = $with_pvm"
1884echo " PVM include (--with-pvm-include) ................. = $PVMINCLUDE" 1874echo " PVM include (--with-pvm-include) ................. = $PVMINCLUDE"
1885echo " PVM library (--with-pvm-library) ................. = $PVMLIBDIR" 1875echo " PVM library (--with-pvm-library) ................. = $PVMLIBDIR"
1886echo " Compile with Ocaml (--without-ocaml) ............. = $with_ocaml"
1887echo " Do not use TCL/TK (--without-tk) ................. = $with_tk" 1876echo " Do not use TCL/TK (--without-tk) ................. = $with_tk"
1888echo " TCL include (--with-tcl-include) ................. = $USER_TCL_INC_PATH" 1877echo " TCL include (--with-tcl-include) ................. = $USER_TCL_INC_PATH"
1889echo " TCL library (--with-tcl-library) ................. = $USER_TCL_LIB_PATH" 1878echo " TCL library (--with-tcl-library) ................. = $USER_TCL_LIB_PATH"
@@ -1897,21 +1886,22 @@ echo " Use MATIO (--without-matio) ...................... = $with_matio"
1897 1886
1898echo "" 1887echo ""
1899if test "$with_gui" = no; then 1888if test "$with_gui" = no; then
1900 echo "Not using Scicos because of the option --without-gui" 1889 echo "Not using Xcos because of the option --without-gui"
1901else 1890else
1902if test $SCICOS_ENABLE = yes; then 1891if test $XCOS_ENABLE = yes; then
1903 echo "Scicos enable" 1892 echo "Xcos enable"
1893 echo "Build modelica compiler (--without-modelica) ....... = $with_modelica"
1904 echo "" 1894 echo ""
1905if test "$with_ocaml" != no -a "$OCAMLC" != no -a "$OCAMLOPT" != no; then 1895 if test "$with_ocaml" != no -a "$OCAMLC" != no -a "$OCAMLOPT" != no; then
1906 echo "Ocaml Configuration (for Modelica compiler):" 1896 echo "Ocaml Configuration (for Modelica compiler):"
1907 echo " OCAMLC ............. = $OCAMLC" 1897 echo " OCAMLC ............. = $OCAMLC"
1908 echo " OCAMLOPT ........... = $OCAMLOPT" 1898 echo " OCAMLOPT ........... = $OCAMLOPT"
1909 echo " OCAMLDEP ........... = $OCAMLDEP" 1899 echo " OCAMLDEP ........... = $OCAMLDEP"
1910else 1900 else
1911 echo "Will not build Modelica compiler" 1901 echo "Will not build Modelica compiler"
1912fi 1902 fi
1913else 1903else
1914 echo "Not using Scicos" 1904 echo "Not using Xcos"
1915fi 1905fi
1916fi 1906fi
1917 1907
diff --git a/scilab/contrib/Makefile.in b/scilab/contrib/Makefile.in
index 98e49b9..e67cfb0 100644
--- a/scilab/contrib/Makefile.in
+++ b/scilab/contrib/Makefile.in
@@ -224,7 +224,6 @@ RANLIB = @RANLIB@
224RELOCATABLE = @RELOCATABLE@ 224RELOCATABLE = @RELOCATABLE@
225RT_LIB = @RT_LIB@ 225RT_LIB = @RT_LIB@
226SAXON = @SAXON@ 226SAXON = @SAXON@
227SCICOS_ENABLE = @SCICOS_ENABLE@
228SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 227SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
229SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 228SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
230SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 229SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -250,6 +249,7 @@ USE_NLS = @USE_NLS@
250VERSION = @VERSION@ 249VERSION = @VERSION@
251WITH_OCAML = @WITH_OCAML@ 250WITH_OCAML = @WITH_OCAML@
252WITH_TKSCI = @WITH_TKSCI@ 251WITH_TKSCI = @WITH_TKSCI@
252XCOS_ENABLE = @XCOS_ENABLE@
253XGETTEXT = @XGETTEXT@ 253XGETTEXT = @XGETTEXT@
254XGETTEXT_015 = @XGETTEXT_015@ 254XGETTEXT_015 = @XGETTEXT_015@
255XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 255XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/etc/modules.xml.in b/scilab/etc/modules.xml.in
index ab4a5a4..f5e788d 100644
--- a/scilab/etc/modules.xml.in
+++ b/scilab/etc/modules.xml.in
@@ -65,8 +65,8 @@
65<module name="spreadsheet" activate="yes"/> 65<module name="spreadsheet" activate="yes"/>
66<module name="call_scilab" activate="yes"/> 66<module name="call_scilab" activate="yes"/>
67<!-- comments --> 67<!-- comments -->
68<module name="scicos" activate="@SCICOS_ENABLE@"/> 68<module name="scicos" activate="@XCOS_ENABLE@"/>
69<module name="scicos_blocks" activate="@SCICOS_ENABLE@"/> 69<module name="scicos_blocks" activate="@XCOS_ENABLE@"/>
70<!-- comments --> 70<!-- comments -->
71<module name="pvm" activate="@PVM_ENABLE@"/> 71<module name="pvm" activate="@PVM_ENABLE@"/>
72<module name="fftw" activate="@FFTW_ENABLE@"/> 72<module name="fftw" activate="@FFTW_ENABLE@"/>
diff --git a/scilab/libs/MALLOC/Makefile.in b/scilab/libs/MALLOC/Makefile.in
index 401c641..fd89566 100644
--- a/scilab/libs/MALLOC/Makefile.in
+++ b/scilab/libs/MALLOC/Makefile.in
@@ -290,7 +290,6 @@ RANLIB = @RANLIB@
290RELOCATABLE = @RELOCATABLE@ 290RELOCATABLE = @RELOCATABLE@
291RT_LIB = @RT_LIB@ 291RT_LIB = @RT_LIB@
292SAXON = @SAXON@ 292SAXON = @SAXON@
293SCICOS_ENABLE = @SCICOS_ENABLE@
294SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 293SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
295SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 294SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
296SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 295SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -316,6 +315,7 @@ USE_NLS = @USE_NLS@
316VERSION = @VERSION@ 315VERSION = @VERSION@
317WITH_OCAML = @WITH_OCAML@ 316WITH_OCAML = @WITH_OCAML@
318WITH_TKSCI = @WITH_TKSCI@ 317WITH_TKSCI = @WITH_TKSCI@
318XCOS_ENABLE = @XCOS_ENABLE@
319XGETTEXT = @XGETTEXT@ 319XGETTEXT = @XGETTEXT@
320XGETTEXT_015 = @XGETTEXT_015@ 320XGETTEXT_015 = @XGETTEXT_015@
321XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 321XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/libs/Makefile.in b/scilab/libs/Makefile.in
index 22586e4..2a2baef 100644
--- a/scilab/libs/Makefile.in
+++ b/scilab/libs/Makefile.in
@@ -262,7 +262,6 @@ RANLIB = @RANLIB@
262RELOCATABLE = @RELOCATABLE@ 262RELOCATABLE = @RELOCATABLE@
263RT_LIB = @RT_LIB@ 263RT_LIB = @RT_LIB@
264SAXON = @SAXON@ 264SAXON = @SAXON@
265SCICOS_ENABLE = @SCICOS_ENABLE@
266SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 265SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
267SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 266SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
268SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 267SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -288,6 +287,7 @@ USE_NLS = @USE_NLS@
288VERSION = @VERSION@ 287VERSION = @VERSION@
289WITH_OCAML = @WITH_OCAML@ 288WITH_OCAML = @WITH_OCAML@
290WITH_TKSCI = @WITH_TKSCI@ 289WITH_TKSCI = @WITH_TKSCI@
290XCOS_ENABLE = @XCOS_ENABLE@
291XGETTEXT = @XGETTEXT@ 291XGETTEXT = @XGETTEXT@
292XGETTEXT_015 = @XGETTEXT_015@ 292XGETTEXT_015 = @XGETTEXT_015@
293XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 293XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/libs/doublylinkedlist/Makefile.in b/scilab/libs/doublylinkedlist/Makefile.in
index c704619..9cfd4b5 100644
--- a/scilab/libs/doublylinkedlist/Makefile.in
+++ b/scilab/libs/doublylinkedlist/Makefile.in
@@ -292,7 +292,6 @@ RANLIB = @RANLIB@
292RELOCATABLE = @RELOCATABLE@ 292RELOCATABLE = @RELOCATABLE@
293RT_LIB = @RT_LIB@ 293RT_LIB = @RT_LIB@
294SAXON = @SAXON@ 294SAXON = @SAXON@
295SCICOS_ENABLE = @SCICOS_ENABLE@
296SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 295SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
297SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 296SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
298SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 297SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -318,6 +317,7 @@ USE_NLS = @USE_NLS@
318VERSION = @VERSION@ 317VERSION = @VERSION@
319WITH_OCAML = @WITH_OCAML@ 318WITH_OCAML = @WITH_OCAML@
320WITH_TKSCI = @WITH_TKSCI@ 319WITH_TKSCI = @WITH_TKSCI@
320XCOS_ENABLE = @XCOS_ENABLE@
321XGETTEXT = @XGETTEXT@ 321XGETTEXT = @XGETTEXT@
322XGETTEXT_015 = @XGETTEXT_015@ 322XGETTEXT_015 = @XGETTEXT_015@
323XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 323XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/libs/dynamiclibrary/Makefile.in b/scilab/libs/dynamiclibrary/Makefile.in
index 8295523..99c7ec5d 100644
--- a/scilab/libs/dynamiclibrary/Makefile.in
+++ b/scilab/libs/dynamiclibrary/Makefile.in
@@ -292,7 +292,6 @@ RANLIB = @RANLIB@
292RELOCATABLE = @RELOCATABLE@ 292RELOCATABLE = @RELOCATABLE@
293RT_LIB = @RT_LIB@ 293RT_LIB = @RT_LIB@
294SAXON = @SAXON@ 294SAXON = @SAXON@
295SCICOS_ENABLE = @SCICOS_ENABLE@
296SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 295SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
297SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 296SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
298SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 297SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -318,6 +317,7 @@ USE_NLS = @USE_NLS@
318VERSION = @VERSION@ 317VERSION = @VERSION@
319WITH_OCAML = @WITH_OCAML@ 318WITH_OCAML = @WITH_OCAML@
320WITH_TKSCI = @WITH_TKSCI@ 319WITH_TKSCI = @WITH_TKSCI@
320XCOS_ENABLE = @XCOS_ENABLE@
321XGETTEXT = @XGETTEXT@ 321XGETTEXT = @XGETTEXT@
322XGETTEXT_015 = @XGETTEXT_015@ 322XGETTEXT_015 = @XGETTEXT_015@
323XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 323XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/libs/hashtable/Makefile.in b/scilab/libs/hashtable/Makefile.in
index 05bceee..e224e4e 100644
--- a/scilab/libs/hashtable/Makefile.in
+++ b/scilab/libs/hashtable/Makefile.in
@@ -290,7 +290,6 @@ RANLIB = @RANLIB@
290RELOCATABLE = @RELOCATABLE@ 290RELOCATABLE = @RELOCATABLE@
291RT_LIB = @RT_LIB@ 291RT_LIB = @RT_LIB@
292SAXON = @SAXON@ 292SAXON = @SAXON@
293SCICOS_ENABLE = @SCICOS_ENABLE@
294SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 293SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
295SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 294SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
296SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 295SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -316,6 +315,7 @@ USE_NLS = @USE_NLS@
316VERSION = @VERSION@ 315VERSION = @VERSION@
317WITH_OCAML = @WITH_OCAML@ 316WITH_OCAML = @WITH_OCAML@
318WITH_TKSCI = @WITH_TKSCI@ 317WITH_TKSCI = @WITH_TKSCI@
318XCOS_ENABLE = @XCOS_ENABLE@
319XGETTEXT = @XGETTEXT@ 319XGETTEXT = @XGETTEXT@
320XGETTEXT_015 = @XGETTEXT_015@ 320XGETTEXT_015 = @XGETTEXT_015@
321XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 321XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/libs/libst/Makefile.in b/scilab/libs/libst/Makefile.in
index 0b220b1..ce6ae7d 100644
--- a/scilab/libs/libst/Makefile.in
+++ b/scilab/libs/libst/Makefile.in
@@ -286,7 +286,6 @@ RANLIB = @RANLIB@
286RELOCATABLE = @RELOCATABLE@ 286RELOCATABLE = @RELOCATABLE@
287RT_LIB = @RT_LIB@ 287RT_LIB = @RT_LIB@
288SAXON = @SAXON@ 288SAXON = @SAXON@
289SCICOS_ENABLE = @SCICOS_ENABLE@
290SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 289SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
291SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 290SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
292SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 291SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -312,6 +311,7 @@ USE_NLS = @USE_NLS@
312VERSION = @VERSION@ 311VERSION = @VERSION@
313WITH_OCAML = @WITH_OCAML@ 312WITH_OCAML = @WITH_OCAML@
314WITH_TKSCI = @WITH_TKSCI@ 313WITH_TKSCI = @WITH_TKSCI@
314XCOS_ENABLE = @XCOS_ENABLE@
315XGETTEXT = @XGETTEXT@ 315XGETTEXT = @XGETTEXT@
316XGETTEXT_015 = @XGETTEXT_015@ 316XGETTEXT_015 = @XGETTEXT_015@
317XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 317XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index fe76e7c..43e6a47 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -96,7 +96,7 @@ history_browser
96#SUBDIRS += mpi 96#SUBDIRS += mpi
97#endif 97#endif
98 98
99if SCICOS 99if XCOS
100SUBDIRS += scicos_blocks 100SUBDIRS += scicos_blocks
101endif 101endif
102 102
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index ca76e39..596a3ae 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -57,7 +57,7 @@ host_triplet = @host@
57#if MPI 57#if MPI
58#SUBDIRS += mpi 58#SUBDIRS += mpi
59#endif 59#endif
60@SCICOS_TRUE@am__append_1 = scicos_blocks 60@XCOS_TRUE@am__append_1 = scicos_blocks
61 61
62# javasci should be compile at the end because it needs libscilab.la 62# javasci should be compile at the end because it needs libscilab.la
63# Don't forget that the order in subdirs does matter !!! 63# Don't forget that the order in subdirs does matter !!!
@@ -352,7 +352,6 @@ RANLIB = @RANLIB@
352RELOCATABLE = @RELOCATABLE@ 352RELOCATABLE = @RELOCATABLE@
353RT_LIB = @RT_LIB@ 353RT_LIB = @RT_LIB@
354SAXON = @SAXON@ 354SAXON = @SAXON@
355SCICOS_ENABLE = @SCICOS_ENABLE@
356SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 355SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
357SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 356SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
358SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 357SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -378,6 +377,7 @@ USE_NLS = @USE_NLS@
378VERSION = @VERSION@ 377VERSION = @VERSION@
379WITH_OCAML = @WITH_OCAML@ 378WITH_OCAML = @WITH_OCAML@
380WITH_TKSCI = @WITH_TKSCI@ 379WITH_TKSCI = @WITH_TKSCI@
380XCOS_ENABLE = @XCOS_ENABLE@
381XGETTEXT = @XGETTEXT@ 381XGETTEXT = @XGETTEXT@
382XGETTEXT_015 = @XGETTEXT_015@ 382XGETTEXT_015 = @XGETTEXT_015@
383XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 383XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/modules/action_binding/Makefile.in b/scilab/modules/action_binding/Makefile.in
index 4a55dc6..0acbb40 100644
--- a/scilab/modules/action_binding/Makefile.in
+++ b/scilab/modules/action_binding/Makefile.in
@@ -338,7 +338,6 @@ RANLIB = @RANLIB@
338RELOCATABLE = @RELOCATABLE@ 338RELOCATABLE = @RELOCATABLE@
339RT_LIB = @RT_LIB@ 339RT_LIB = @RT_LIB@
340SAXON = @SAXON@ 340SAXON = @SAXON@
341SCICOS_ENABLE = @SCICOS_ENABLE@
342SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 341SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
343SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 342SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
344SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 343SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -364,6 +363,7 @@ USE_NLS = @USE_NLS@
364VERSION = @VERSION@ 363VERSION = @VERSION@
365WITH_OCAML = @WITH_OCAML@ 364WITH_OCAML = @WITH_OCAML@
366WITH_TKSCI = @WITH_TKSCI@ 365WITH_TKSCI = @WITH_TKSCI@
366XCOS_ENABLE = @XCOS_ENABLE@
367XGETTEXT = @XGETTEXT@ 367XGETTEXT = @XGETTEXT@
368XGETTEXT_015 = @XGETTEXT_015@ 368XGETTEXT_015 = @XGETTEXT_015@
369XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 369XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/modules/api_scilab/Makefile.in b/scilab/modules/api_scilab/Makefile.in
index da5c38d..b4a6ff1 100644
--- a/scilab/modules/api_scilab/Makefile.in
+++ b/scilab/modules/api_scilab/Makefile.in
@@ -306,7 +306,6 @@ RANLIB = @RANLIB@
306RELOCATABLE = @RELOCATABLE@ 306RELOCATABLE = @RELOCATABLE@
307RT_LIB = @RT_LIB@ 307RT_LIB = @RT_LIB@
308SAXON = @SAXON@ 308SAXON = @SAXON@
309SCICOS_ENABLE = @SCICOS_ENABLE@
310SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 309SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
311SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 310SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
312SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 311SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -332,6 +331,7 @@ USE_NLS = @USE_NLS@
332VERSION = @VERSION@ 331VERSION = @VERSION@
333WITH_OCAML = @WITH_OCAML@ 332WITH_OCAML = @WITH_OCAML@
334WITH_TKSCI = @WITH_TKSCI@ 333WITH_TKSCI = @WITH_TKSCI@
334XCOS_ENABLE = @XCOS_ENABLE@
335XGETTEXT = @XGETTEXT@ 335XGETTEXT = @XGETTEXT@
336XGETTEXT_015 = @XGETTEXT_015@ 336XGETTEXT_015 = @XGETTEXT_015@
337XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 337XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/modules/arnoldi/Makefile.in b/scilab/modules/arnoldi/Makefile.in
index 4b45329..94b2b72 100644
--- a/scilab/modules/arnoldi/Makefile.in
+++ b/scilab/modules/arnoldi/Makefile.in
@@ -328,7 +328,6 @@ RANLIB = @RANLIB@
328RELOCATABLE = @RELOCATABLE@ 328RELOCATABLE = @RELOCATABLE@
329RT_LIB = @RT_LIB@ 329RT_LIB = @RT_LIB@
330SAXON = @SAXON@ 330SAXON = @SAXON@
331SCICOS_ENABLE = @SCICOS_ENABLE@
332SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 331SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
333SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 332SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
334SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 333SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -354,6 +353,7 @@ USE_NLS = @USE_NLS@
354VERSION = @VERSION@ 353VERSION = @VERSION@
355WITH_OCAML = @WITH_OCAML@ 354WITH_OCAML = @WITH_OCAML@
356WITH_TKSCI = @WITH_TKSCI@ 355WITH_TKSCI = @WITH_TKSCI@
356XCOS_ENABLE = @XCOS_ENABLE@
357XGETTEXT = @XGETTEXT@ 357XGETTEXT = @XGETTEXT@
358XGETTEXT_015 = @XGETTEXT_015@ 358XGETTEXT_015 = @XGETTEXT_015@
359XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 359XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/modules/atoms/Makefile.in b/scilab/modules/atoms/Makefile.in
index 194a256..800da92 100644
--- a/scilab/modules/atoms/Makefile.in
+++ b/scilab/modules/atoms/Makefile.in
@@ -271,7 +271,6 @@ RANLIB = @RANLIB@
271RELOCATABLE = @RELOCATABLE@ 271RELOCATABLE = @RELOCATABLE@
272RT_LIB = @RT_LIB@ 272RT_LIB = @RT_LIB@
273SAXON = @SAXON@ 273SAXON = @SAXON@
274SCICOS_ENABLE = @SCICOS_ENABLE@
275SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 274SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
276SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 275SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
277SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 276SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -297,6 +296,7 @@ USE_NLS = @USE_NLS@
297VERSION = @VERSION@ 296VERSION = @VERSION@
298WITH_OCAML = @WITH_OCAML@ 297WITH_OCAML = @WITH_OCAML@
299WITH_TKSCI = @WITH_TKSCI@ 298WITH_TKSCI = @WITH_TKSCI@
299XCOS_ENABLE = @XCOS_ENABLE@
300XGETTEXT = @XGETTEXT@ 300XGETTEXT = @XGETTEXT@
301XGETTEXT_015 = @XGETTEXT_015@ 301XGETTEXT_015 = @XGETTEXT_015@
302XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 302XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/modules/boolean/Makefile.in b/scilab/modules/boolean/Makefile.in
index b99e5d8..4b2cb99 100644
--- a/scilab/modules/boolean/Makefile.in
+++ b/scilab/modules/boolean/Makefile.in
@@ -308,7 +308,6 @@ RANLIB = @RANLIB@
308RELOCATABLE = @RELOCATABLE@ 308RELOCATABLE = @RELOCATABLE@
309RT_LIB = @RT_LIB@ 309RT_LIB = @RT_LIB@
310SAXON = @SAXON@ 310SAXON = @SAXON@
311SCICOS_ENABLE = @SCICOS_ENABLE@
312SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 311SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
313SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 312SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
314SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 313SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -334,6 +333,7 @@ USE_NLS = @USE_NLS@
334VERSION = @VERSION@ 333VERSION = @VERSION@
335WITH_OCAML = @WITH_OCAML@ 334WITH_OCAML = @WITH_OCAML@
336WITH_TKSCI = @WITH_TKSCI@ 335WITH_TKSCI = @WITH_TKSCI@
336XCOS_ENABLE = @XCOS_ENABLE@
337XGETTEXT = @XGETTEXT@ 337XGETTEXT = @XGETTEXT@
338XGETTEXT_015 = @XGETTEXT_015@ 338XGETTEXT_015 = @XGETTEXT_015@
339XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 339XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/modules/cacsd/Makefile.in b/scilab/modules/cacsd/Makefile.in
index aa8a0a1..ea71dd6 100644
--- a/scilab/modules/cacsd/Makefile.in
+++ b/scilab/modules/cacsd/Makefile.in
@@ -402,7 +402,6 @@ RANLIB = @RANLIB@
402RELOCATABLE = @RELOCATABLE@ 402RELOCATABLE = @RELOCATABLE@
403RT_LIB = @RT_LIB@ 403RT_LIB = @RT_LIB@
404SAXON = @SAXON@ 404SAXON = @SAXON@
405SCICOS_ENABLE = @SCICOS_ENABLE@
406SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 405SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
407SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 406SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
408SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 407SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -428,6 +427,7 @@ USE_NLS = @USE_NLS@
428VERSION = @VERSION@ 427VERSION = @VERSION@
429WITH_OCAML = @WITH_OCAML@ 428WITH_OCAML = @WITH_OCAML@
430WITH_TKSCI = @WITH_TKSCI@ 429WITH_TKSCI = @WITH_TKSCI@
430XCOS_ENABLE = @XCOS_ENABLE@
431XGETTEXT = @XGETTEXT@ 431XGETTEXT = @XGETTEXT@
432XGETTEXT_015 = @XGETTEXT_015@ 432XGETTEXT_015 = @XGETTEXT_015@
433XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 433XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/modules/call_scilab/Makefile.in b/scilab/modules/call_scilab/Makefile.in
index 4dd6e45..48e67f2 100644
--- a/scilab/modules/call_scilab/Makefile.in
+++ b/scilab/modules/call_scilab/Makefile.in
@@ -303,7 +303,6 @@ RANLIB = @RANLIB@
303RELOCATABLE = @RELOCATABLE@ 303RELOCATABLE = @RELOCATABLE@
304RT_LIB = @RT_LIB@ 304RT_LIB = @RT_LIB@
305SAXON = @SAXON@ 305SAXON = @SAXON@
306SCICOS_ENABLE = @SCICOS_ENABLE@
307SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 306SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
308SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 307SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
309SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 308SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -329,6 +328,7 @@ USE_NLS = @USE_NLS@
329VERSION = @VERSION@ 328VERSION = @VERSION@
330WITH_OCAML = @WITH_OCAML@ 329WITH_OCAML = @WITH_OCAML@
331WITH_TKSCI = @WITH_TKSCI@ 330WITH_TKSCI = @WITH_TKSCI@
331XCOS_ENABLE = @XCOS_ENABLE@
332XGETTEXT = @XGETTEXT@ 332XGETTEXT = @XGETTEXT@
333XGETTEXT_015 = @XGETTEXT_015@ 333XGETTEXT_015 = @XGETTEXT_015@
334XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 334XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/modules/commons/Makefile.in b/scilab/modules/commons/Makefile.in
index a761d6c..ccf49d4 100644
--- a/scilab/modules/commons/Makefile.in
+++ b/scilab/modules/commons/Makefile.in
@@ -323,7 +323,6 @@ RANLIB = @RANLIB@
323RELOCATABLE = @RELOCATABLE@ 323RELOCATABLE = @RELOCATABLE@
324RT_LIB = @RT_LIB@ 324RT_LIB = @RT_LIB@
325SAXON = @SAXON@ 325SAXON = @SAXON@
326SCICOS_ENABLE = @SCICOS_ENABLE@
327SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 326SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
328SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 327SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
329SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 328SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -349,6 +348,7 @@ USE_NLS = @USE_NLS@
349VERSION = @VERSION@ 348VERSION = @VERSION@
350WITH_OCAML = @WITH_OCAML@ 349WITH_OCAML = @WITH_OCAML@
351WITH_TKSCI = @WITH_TKSCI@ 350WITH_TKSCI = @WITH_TKSCI@
351XCOS_ENABLE = @XCOS_ENABLE@
352XGETTEXT = @XGETTEXT@ 352XGETTEXT = @XGETTEXT@
353XGETTEXT_015 = @XGETTEXT_015@ 353XGETTEXT_015 = @XGETTEXT_015@
354XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 354XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/modules/compatibility_functions/Makefile.in b/scilab/modules/compatibility_functions/Makefile.in
index e24f0e8..f9459d5 100644
--- a/scilab/modules/compatibility_functions/Makefile.in
+++ b/scilab/modules/compatibility_functions/Makefile.in
@@ -268,7 +268,6 @@ RANLIB = @RANLIB@
268RELOCATABLE = @RELOCATABLE@ 268RELOCATABLE = @RELOCATABLE@
269RT_LIB = @RT_LIB@ 269RT_LIB = @RT_LIB@
270SAXON = @SAXON@ 270SAXON = @SAXON@
271SCICOS_ENABLE = @SCICOS_ENABLE@
272SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 271SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
273SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 272SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
274SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 273SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -294,6 +293,7 @@ USE_NLS = @USE_NLS@
294VERSION = @VERSION@ 293VERSION = @VERSION@
295WITH_OCAML = @WITH_OCAML@ 294WITH_OCAML = @WITH_OCAML@
296WITH_TKSCI = @WITH_TKSCI@ 295WITH_TKSCI = @WITH_TKSCI@
296XCOS_ENABLE = @XCOS_ENABLE@
297XGETTEXT = @XGETTEXT@ 297XGETTEXT = @XGETTEXT@
298XGETTEXT_015 = @XGETTEXT_015@ 298XGETTEXT_015 = @XGETTEXT_015@
299XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 299XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/modules/completion/Makefile.in b/scilab/modules/completion/Makefile.in
index 87e4092..8bb840f 100644
--- a/scilab/modules/completion/Makefile.in
+++ b/scilab/modules/completion/Makefile.in
@@ -330,7 +330,6 @@ RANLIB = @RANLIB@
330RELOCATABLE = @RELOCATABLE@ 330RELOCATABLE = @RELOCATABLE@
331RT_LIB = @RT_LIB@ 331RT_LIB = @RT_LIB@
332SAXON = @SAXON@ 332SAXON = @SAXON@
333SCICOS_ENABLE = @SCICOS_ENABLE@
334SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 333SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
335SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 334SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
336SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 335SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -356,6 +355,7 @@ USE_NLS = @USE_NLS@
356VERSION = @VERSION@ 355VERSION = @VERSION@
357WITH_OCAML = @WITH_OCAML@ 356WITH_OCAML = @WITH_OCAML@
358WITH_TKSCI = @WITH_TKSCI@ 357WITH_TKSCI = @WITH_TKSCI@
358XCOS_ENABLE = @XCOS_ENABLE@
359XGETTEXT = @XGETTEXT@ 359XGETTEXT = @XGETTEXT@
360XGETTEXT_015 = @XGETTEXT_015@ 360XGETTEXT_015 = @XGETTEXT_015@
361XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 361XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/modules/console/Makefile.in b/scilab/modules/console/Makefile.in
index aab1506..8582a91 100644
--- a/scilab/modules/console/Makefile.in
+++ b/scilab/modules/console/Makefile.in
@@ -342,7 +342,6 @@ RANLIB = @RANLIB@
342RELOCATABLE = @RELOCATABLE@ 342RELOCATABLE = @RELOCATABLE@
343RT_LIB = @RT_LIB@ 343RT_LIB = @RT_LIB@
344SAXON = @SAXON@ 344SAXON = @SAXON@
345SCICOS_ENABLE = @SCICOS_ENABLE@
346SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 345SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
347SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 346SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
348SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 347SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -368,6 +367,7 @@ USE_NLS = @USE_NLS@
368VERSION = @VERSION@ 367VERSION = @VERSION@
369WITH_OCAML = @WITH_OCAML@ 368WITH_OCAML = @WITH_OCAML@
370WITH_TKSCI = @WITH_TKSCI@ 369WITH_TKSCI = @WITH_TKSCI@
370XCOS_ENABLE = @XCOS_ENABLE@
371XGETTEXT = @XGETTEXT@ 371XGETTEXT = @XGETTEXT@
372XGETTEXT_015 = @XGETTEXT_015@ 372XGETTEXT_015 = @XGETTEXT_015@
373XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 373XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/modules/core/Makefile.in b/scilab/modules/core/Makefile.in
index 77705e5..180170e 100644
--- a/scilab/modules/core/Makefile.in
+++ b/scilab/modules/core/Makefile.in
@@ -543,7 +543,6 @@ RANLIB = @RANLIB@
543RELOCATABLE = @RELOCATABLE@ 543RELOCATABLE = @RELOCATABLE@
544RT_LIB = @RT_LIB@ 544RT_LIB = @RT_LIB@
545SAXON = @SAXON@ 545SAXON = @SAXON@
546SCICOS_ENABLE = @SCICOS_ENABLE@
547SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 546SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
548SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 547SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
549SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 548SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -569,6 +568,7 @@ USE_NLS = @USE_NLS@
569VERSION = @VERSION@ 568VERSION = @VERSION@
570WITH_OCAML = @WITH_OCAML@ 569WITH_OCAML = @WITH_OCAML@
571WITH_TKSCI = @WITH_TKSCI@ 570WITH_TKSCI = @WITH_TKSCI@
571XCOS_ENABLE = @XCOS_ENABLE@
572XGETTEXT = @XGETTEXT@ 572XGETTEXT = @XGETTEXT@
573XGETTEXT_015 = @XGETTEXT_015@ 573XGETTEXT_015 = @XGETTEXT_015@
574XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 574XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/modules/core/includes/machine.h.in b/scilab/modules/core/includes/machine.h.in
index bf1cc50..f91d710 100644
--- a/scilab/modules/core/includes/machine.h.in
+++ b/scilab/modules/core/includes/machine.h.in
@@ -491,15 +491,15 @@
491/* With PVM */ 491/* With PVM */
492#undef WITH_PVM 492#undef WITH_PVM
493 493
494/* With SCICOS */
495#undef WITH_SCICOS
496
497/* With TK */ 494/* With TK */
498#undef WITH_TK 495#undef WITH_TK
499 496
500/* With the UMFPACK library */ 497/* With the UMFPACK library */
501#undef WITH_UMFPACK 498#undef WITH_UMFPACK
502 499
500/* With XCOS */
501#undef WITH_XCOS
502
503/* If leading underscores */ 503/* If leading underscores */
504#undef WLU 504#undef WLU
505 505
diff --git a/scilab/modules/data_structures/Makefile.in b/scilab/modules/data_structures/Makefile.in
index 15dfec7..d2ff9d5 100644
--- a/scilab/modules/data_structures/Makefile.in
+++ b/scilab/modules/data_structures/Makefile.in
@@ -338,7 +338,6 @@ RANLIB = @RANLIB@
338RELOCATABLE = @RELOCATABLE@ 338RELOCATABLE = @RELOCATABLE@
339RT_LIB = @RT_LIB@ 339RT_LIB = @RT_LIB@
340SAXON = @SAXON@ 340SAXON = @SAXON@
341SCICOS_ENABLE = @SCICOS_ENABLE@
342SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 341SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
343SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 342SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
344SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 343SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -364,6 +363,7 @@ USE_NLS = @USE_NLS@
364VERSION = @VERSION@ 363VERSION = @VERSION@
365WITH_OCAML = @WITH_OCAML@ 364WITH_OCAML = @WITH_OCAML@
366WITH_TKSCI = @WITH_TKSCI@ 365WITH_TKSCI = @WITH_TKSCI@
366XCOS_ENABLE = @XCOS_ENABLE@
367XGETTEXT = @XGETTEXT@ 367XGETTEXT = @XGETTEXT@
368XGETTEXT_015 = @XGETTEXT_015@ 368XGETTEXT_015 = @XGETTEXT_015@
369XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 369XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/modules/demo_tools/Makefile.in b/scilab/modules/demo_tools/Makefile.in
index ca45690..f4f2623 100644
--- a/scilab/modules/demo_tools/Makefile.in
+++ b/scilab/modules/demo_tools/Makefile.in
@@ -267,7 +267,6 @@ RANLIB = @RANLIB@
267RELOCATABLE = @RELOCATABLE@ 267RELOCATABLE = @RELOCATABLE@
268RT_LIB = @RT_LIB@ 268RT_LIB = @RT_LIB@
269SAXON = @SAXON@ 269SAXON = @SAXON@
270SCICOS_ENABLE = @SCICOS_ENABLE@
271SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 270SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
272SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 271SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
273SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 272SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -293,6 +292,7 @@ USE_NLS = @USE_NLS@
293VERSION = @VERSION@ 292VERSION = @VERSION@
294WITH_OCAML = @WITH_OCAML@ 293WITH_OCAML = @WITH_OCAML@
295WITH_TKSCI = @WITH_TKSCI@ 294WITH_TKSCI = @WITH_TKSCI@
295XCOS_ENABLE = @XCOS_ENABLE@
296XGETTEXT = @XGETTEXT@ 296XGETTEXT = @XGETTEXT@
297XGETTEXT_015 = @XGETTEXT_015@ 297XGETTEXT_015 = @XGETTEXT_015@
298XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 298XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/modules/demo_tools/macros/demo_gui.sci b/scilab/modules/demo_tools/macros/demo_gui.sci
deleted file mode 100644
index 5118a74..0000000
--- a/scilab/modules/demo_tools/macros/demo_gui.sci
+++ /dev/null
@@ -1,327 +0,0 @@
1//
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) 2008 - INRIA - Pierre MARECHAL
4//
5// This file must be used under the terms of the CeCILL.
6// This source file is licensed as described in the file COPYING, which
7// you should have received as part of this distribution. The terms
8// are also available at
9// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
10//
11
12function demo_gui()
13
14 global demolist // Demos list is defined in scilab.start
15
16 global margin_x;
17 global margin_y;
18
19 global frame_w;
20 global frame_h;
21
22 global button_w;
23 global button_h;
24
25 // Parameters
26 // =========================================================================
27
28 frame_w = 200; // Frame width
29 frame_h = 450; // Frame height
30
31 margin_x = 15; // Horizontal margin between each elements
32 margin_y = 15; // Vertical margin between each elements
33
34 button_w = 0; // Button width
35 button_h = 0; // Button height
36
37 defaultfont = "arial"; // Default Font
38
39 frame_number = 1; // Frame number
40
41 // Figure creation
42 // =========================================================================
43
44 axes_w = (frame_number+1)*margin_x + frame_number*frame_w; // axes width
45 axes_h = 3*margin_y + frame_h + button_h; // axes height
46
47 demo_fig = figure(100000);
48
49 // Remove Scilab graphics menus & toolbar
50
51 delmenu(demo_fig.figure_id, gettext("&File"));
52 delmenu(demo_fig.figure_id, gettext("&Tools"));
53 delmenu(demo_fig.figure_id, gettext("&Edit"));
54 delmenu(demo_fig.figure_id, gettext("&?"));
55 toolbar(demo_fig.figure_id, "off");
56 demo_fig.visible = "off"; // to be sure that no plot can appear in the plot
57
58 // Add the new one
59
60 h = uimenu( "parent", demo_fig, ..
61 "label" , gettext("File"));
62
63 uimenu( "parent" , h, ..
64 "label" , gettext("Close"), ..
65 "callback" , "demo_fig=get_figure_handle(100000);delete(demo_fig);", ..
66 "tag" , "close_menu");
67
68 // Background, Resize, title ...
69
70 demo_fig.background = -2;
71 demo_fig.axes_size = [axes_w axes_h];
72 demo_fig.figure_name = gettext("Demos");
73
74 // Frame creation
75
76 create_frame(demo_fig,1,"Demos",demolist);
77
78 demo_fig.axes_size = [axes_w axes_h];
79
80 // pushbutton creation
81
82// my_button = uicontrol( ...
83// "parent" , demo_fig,...
84// "relief" , "groove",...
85// "style" , "pushbutton",...
86// "string" , gettext("View Code"),...
87// "units" , "pixels",...
88// "position" , [ floor(axes_w/2 - button_w/2) margin_y button_w button_h ], ...
89// "fontunits" , "points",...
90// "fontsize" , 12,...
91// "fontweight" , "bold", ...
92// "horizontalalignment" , "center", ...
93// "visible" , "on", ...
94// "tag" , "button_view_code" );
95
96endfunction
97
98function create_frame(my_fig_handle,fr_position,fr_title,fr_items)
99
100 // my_fig_handle : Handle de la figure englobante
101 // fr_position : position de la frame à créer
102 // fr_position : titre de la frame à créer
103 // fr_items : liste des items de la listbox
104
105 // Parameters
106 // =========================================================================
107
108 frame_w = 200; // Frame width
109 frame_h = 450; // Frame height
110
111 margin_x = 15; // Horizontal margin between each elements
112 margin_y = 15; // Vertical margin between each elements
113
114 button_w = 0; // Button width
115 button_h = 0; // Button height
116
117 defaultfont = "arial"; // Default Font
118
119 // =========================================================================
120
121
122 // if no item, no display
123 if fr_items == [] then
124 my_visible = "off";
125 else
126 my_visible = "on";
127 end
128
129 axes_h = my_fig_handle.axes_size(2);
130
131
132 if fr_position <> 1 then
133 this_frame_w = frame_w;
134 this_frame_h = frame_h;
135 this_frame_pos_x = (margin_x+(fr_position-1)*(margin_x+frame_w));
136 this_frame_pos_y = axes_h-(margin_y+frame_h);
137 else
138 this_frame_w = frame_w;
139 this_frame_h = frame_h - 150 ;
140 this_frame_pos_x = (margin_x+(fr_position-1)*(margin_x+frame_w));
141 this_frame_pos_y = axes_h-(margin_y+frame_h)+150;
142 end
143
144 // frame
145 uicontrol( ...
146 "parent" , my_fig_handle,...
147 "relief" , "groove",...
148 "style" , "frame",...
149 "units" , "pixels",...
150 "position" , [ this_frame_pos_x this_frame_pos_y this_frame_w this_frame_h ],...
151 "horizontalalignment" , "center", ...
152 "background" , [1 1 1], ...
153 "visible" , my_visible, ...
154 "tag" , "frame_"+string(fr_position));
155
156 // Frame title
157 uicontrol( ...
158 "parent" , my_fig_handle,...
159 "style" , "text",...
160 "string" , " "+gettext(fr_title),...
161 "units" , "pixels",...
162 "position" , [ this_frame_pos_x+10 axes_h-(margin_y)-9 this_frame_w-20 18 ],...
163 "fontunits" , "points",...
164 "fontsize" , 12,...
165 "fontWeight" , "bold",...
166 "horizontalalignment" , "center", ...
167 "background" , [1 1 1], ...
168 "visible" , my_visible, ...
169 "tag" , "title_frame_"+string(fr_position));
170
171 // List Box
172 uicontrol( ...
173 "parent" , my_fig_handle,...
174 "style" , "listbox",...
175 "string" , " "+strcat(fr_items(:,1),"| "),...
176 "units" , "pixels",...
177 "position" , [ this_frame_pos_x+5 this_frame_pos_y+5 this_frame_w-12 this_frame_h-14-10 ],...
178 "fontunits" , "points",...
179 "fontsize" , 12,...
180 "horizontalalignment" , "left", ...
181 "BackgroundColor" , [255/255 , 255/255 , 255/255 ], ...
182 "callback" , "script_path = demo_gui_update();exec(script_path,-1);clear script_path;",...
183 "visible" , my_visible, ...
184 "user_data" , fr_items, ...
185 "tag" , "listbox_"+string(fr_position));
186
187 // Logo Scilab
188 // =========================================================================
189
190 if fr_position == 1 then
191
192 str = "";
193 str = str + "<html>";
194 str = str + "<img src=""file:///"+SCI+"/modules/demo_tools/images/logo_scilab.png"" />";
195 str = str + "</html>";
196
197 my_text = uicontrol( ...
198 "parent" , my_fig_handle,...
199 "style" , "text",...
200 "string" , str,...
201 "units" , "pixels",...
202 "position" , [ (margin_x+(fr_position-1)*(margin_x+frame_w)) axes_h-(margin_y+frame_h) frame_w 150],...
203 "background" , [1 1 1], ...
204 "tag" , "my_text", ...
205 "horizontalalignment" , "center", ...
206 "verticalalignment" , "middle" ...
207 );
208
209 end
210
211
212endfunction
213
214function script_path = demo_gui_update()
215
216 my_counter = 0;
217
218 global subdemolist;
219 global frame_number;
220
221 my_selframe = get(gcbo,"tag");
222
223 // Suppression d'une figure précédemment dessiné, si figure il y a ...
224 all_figs = winsid();
225 all_figs = all_figs(all_figs >= 100001); // All Scilab graphic windows opened for demos
226 for fig_index = 1:size(all_figs, "*")
227 fig_to_del = get_figure_handle(all_figs(fig_index));
228 if ~isempty(fig_to_del) then
229 delete(fig_to_del);
230 end
231 end
232
233 // Handle de la figure
234 demo_fig = gcbo.parent;
235
236 // Frame sur laquelle on a cliqué
237 my_selframe_num = msscanf(my_selframe,"listbox_%d");
238
239 // Récupération de la liste des démos
240 my_index = get(findobj("tag",my_selframe), "value" );
241 my_data = get(findobj("tag",my_selframe), "user_data");
242
243 script_path = my_data(my_index(1,1),2);
244
245 if grep(script_path,"dem.gateway.sce") == 1 then
246
247 // On est dans le cas ou une nouvelle frame va être affichée
248
249 // Mise à jour du nombre de frame
250 frame_number = my_selframe_num+1;
251 resize_gui(demo_fig,frame_number);
252 previous_demolist = subdemolist;
253
254 mode(-1);
255 exec(script_path,-1);
256 create_frame(demo_fig,my_selframe_num+1,my_data(my_index(1,1),1),subdemolist);
257 subdemolist = previous_demolist;
258
259 else
260 // Mise à jour du nombre de frame
261 frame_number = my_selframe_num;
262 resize_gui(demo_fig,frame_number);
263 end
264
265endfunction
266
267function resize_gui(my_fig_handle,frame_number)
268
269 // Parameters
270 // =========================================================================
271
272 frame_w = 200; // Frame width
273 frame_h = 450; // Frame height
274
275 margin_x = 15; // Horizontal margin between each elements
276 margin_y = 15; // Vertical margin between each elements
277
278 button_w = 0; // Button width
279 button_h = 0; // Button height
280
281 defaultfont = "arial"; // Default Font
282
283 // =========================================================================
284
285 axes_w = (frame_number+1)*margin_x + frame_number*frame_w; // axes width
286 my_fig_handle.axes_size(1) = axes_w;
287
288 for i=(frame_number+1):10
289
290 my_frame = findobj("tag", "frame_" +string(i));
291 my_frame_title = findobj("tag", "title_frame_"+string(i));
292 my_listbox = findobj("tag", "listbox_" +string(i));
293
294 if my_frame <> [] then
295 delete_frame(my_fig_handle,i);
296 end
297
298 end
299
300 // update_button_position(my_fig_handle,axes_w);
301
302endfunction
303
304function update_button_position(my_fig_handle,axes_w)
305
306 // Update button position
307
308 global margin_y;
309 global button_w;
310 global button_h;
311
312 my_button = findobj("tag", "button_view_code");
313 my_button.position = [ floor((axes_w/2) - (button_w/2)) margin_y button_w button_h ];
314
315endfunction
316
317function delete_frame(my_fig_handle,fr_position)
318
319 my_frame = findobj("tag", "frame_" +string(fr_position));
320 my_frame_title = findobj("tag", "title_frame_"+string(fr_position));
321 my_listbox = findobj("tag", "listbox_" +string(fr_position));
322
323 delete(my_frame);
324 delete(my_frame_title);
325 delete(my_listbox);
326
327endfunction
diff --git a/scilab/modules/development_tools/Makefile.in b/scilab/modules/development_tools/Makefile.in
index 59a557b..a2e921c 100644
--- a/scilab/modules/development_tools/Makefile.in
+++ b/scilab/modules/development_tools/Makefile.in
@@ -266,7 +266,6 @@ RANLIB = @RANLIB@
266RELOCATABLE = @RELOCATABLE@ 266RELOCATABLE = @RELOCATABLE@
267RT_LIB = @RT_LIB@ 267RT_LIB = @RT_LIB@
268SAXON = @SAXON@ 268SAXON = @SAXON@
269SCICOS_ENABLE = @SCICOS_ENABLE@
270SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 269SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
271SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 270SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
272SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 271SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -292,6 +291,7 @@ USE_NLS = @USE_NLS@
292VERSION = @VERSION@ 291VERSION = @VERSION@
293WITH_OCAML = @WITH_OCAML@ 292WITH_OCAML = @WITH_OCAML@
294WITH_TKSCI = @WITH_TKSCI@ 293WITH_TKSCI = @WITH_TKSCI@
294XCOS_ENABLE = @XCOS_ENABLE@
295XGETTEXT = @XGETTEXT@ 295XGETTEXT = @XGETTEXT@
296XGETTEXT_015 = @XGETTEXT_015@ 296XGETTEXT_015 = @XGETTEXT_015@
297XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 297XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/modules/development_tools/src/fake/Makefile.in b/scilab/modules/development_tools/src/fake/Makefile.in
index 45cd4af..5d8fb6b 100644
--- a/scilab/modules/development_tools/src/fake/Makefile.in
+++ b/scilab/modules/development_tools/src/fake/Makefile.in
@@ -217,7 +217,6 @@ RANLIB = @RANLIB@
217RELOCATABLE = @RELOCATABLE@ 217RELOCATABLE = @RELOCATABLE@
218RT_LIB = @RT_LIB@ 218RT_LIB = @RT_LIB@
219SAXON = @SAXON@ 219SAXON = @SAXON@
220SCICOS_ENABLE = @SCICOS_ENABLE@
221SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 220SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
222SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 221SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
223SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 222SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -243,6 +242,7 @@ USE_NLS = @USE_NLS@
243VERSION = @VERSION@ 242VERSION = @VERSION@
244WITH_OCAML = @WITH_OCAML@ 243WITH_OCAML = @WITH_OCAML@
245WITH_TKSCI = @WITH_TKSCI@ 244WITH_TKSCI = @WITH_TKSCI@
245XCOS_ENABLE = @XCOS_ENABLE@
246XGETTEXT = @XGETTEXT@ 246XGETTEXT = @XGETTEXT@
247XGETTEXT_015 = @XGETTEXT_015@ 247XGETTEXT_015 = @XGETTEXT_015@
248XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 248XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/modules/differential_equations/Makefile.in b/scilab/modules/differential_equations/Makefile.in
index 6ef27c9..629185f 100644
--- a/scilab/modules/differential_equations/Makefile.in
+++ b/scilab/modules/differential_equations/Makefile.in
@@ -348,7 +348,6 @@ RANLIB = @RANLIB@
348RELOCATABLE = @RELOCATABLE@ 348RELOCATABLE = @RELOCATABLE@
349RT_LIB = @RT_LIB@ 349RT_LIB = @RT_LIB@
350SAXON = @SAXON@ 350SAXON = @SAXON@
351SCICOS_ENABLE = @SCICOS_ENABLE@
352SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 351SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
353SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 352SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
354SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 353SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -374,6 +373,7 @@ USE_NLS = @USE_NLS@
374VERSION = @VERSION@ 373VERSION = @VERSION@
375WITH_OCAML = @WITH_OCAML@ 374WITH_OCAML = @WITH_OCAML@
376WITH_TKSCI = @WITH_TKSCI@ 375WITH_TKSCI = @WITH_TKSCI@
376XCOS_ENABLE = @XCOS_ENABLE@
377XGETTEXT = @XGETTEXT@ 377XGETTEXT = @XGETTEXT@
378XGETTEXT_015 = @XGETTEXT_015@ 378XGETTEXT_015 = @XGETTEXT_015@
379XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 379XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/modules/double/Makefile.in b/scilab/modules/double/Makefile.in
index d52fa46..fd7c6df 100644
--- a/scilab/modules/double/Makefile.in
+++ b/scilab/modules/double/Makefile.in
@@ -307,7 +307,6 @@ RANLIB = @RANLIB@
307RELOCATABLE = @RELOCATABLE@ 307RELOCATABLE = @RELOCATABLE@
308RT_LIB = @RT_LIB@ 308RT_LIB = @RT_LIB@
309SAXON = @SAXON@ 309SAXON = @SAXON@
310SCICOS_ENABLE = @SCICOS_ENABLE@
311SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 310SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
312SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 311SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
313SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 312SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -333,6 +332,7 @@ USE_NLS = @USE_NLS@
333VERSION = @VERSION@ 332VERSION = @VERSION@
334WITH_OCAML = @WITH_OCAML@ 333WITH_OCAML = @WITH_OCAML@
335WITH_TKSCI = @WITH_TKSCI@ 334WITH_TKSCI = @WITH_TKSCI@
335XCOS_ENABLE = @XCOS_ENABLE@
336XGETTEXT = @XGETTEXT@ 336XGETTEXT = @XGETTEXT@
337XGETTEXT_015 = @XGETTEXT_015@ 337XGETTEXT_015 = @XGETTEXT_015@
338XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 338XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/modules/dynamic_link/Makefile.in b/scilab/modules/dynamic_link/Makefile.in
index 33af92b..3f9b563 100644
--- a/scilab/modules/dynamic_link/Makefile.in
+++ b/scilab/modules/dynamic_link/Makefile.in
@@ -325,7 +325,6 @@ RANLIB = @RANLIB@
325RELOCATABLE = @RELOCATABLE@ 325RELOCATABLE = @RELOCATABLE@
326RT_LIB = @RT_LIB@ 326RT_LIB = @RT_LIB@
327SAXON = @SAXON@ 327SAXON = @SAXON@
328SCICOS_ENABLE = @SCICOS_ENABLE@
329SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 328SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
330SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 329SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
331SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 330SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -351,6 +350,7 @@ USE_NLS = @USE_NLS@
351VERSION = @VERSION@ 350VERSION = @VERSION@
352WITH_OCAML = @WITH_OCAML@ 351WITH_OCAML = @WITH_OCAML@
353WITH_TKSCI = @WITH_TKSCI@ 352WITH_TKSCI = @WITH_TKSCI@
353XCOS_ENABLE = @XCOS_ENABLE@
354XGETTEXT = @XGETTEXT@ 354XGETTEXT = @XGETTEXT@
355XGETTEXT_015 = @XGETTEXT_015@ 355XGETTEXT_015 = @XGETTEXT_015@
356XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 356XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/modules/elementary_functions/Makefile.in b/scilab/modules/elementary_functions/Makefile.in
index dea0b23..931fd81 100644
--- a/scilab/modules/elementary_functions/Makefile.in
+++ b/scilab/modules/elementary_functions/Makefile.in
@@ -677,7 +677,6 @@ RANLIB = @RANLIB@
677RELOCATABLE = @RELOCATABLE@ 677RELOCATABLE = @RELOCATABLE@
678RT_LIB = @RT_LIB@ 678RT_LIB = @RT_LIB@
679SAXON = @SAXON@ 679SAXON = @SAXON@
680SCICOS_ENABLE = @SCICOS_ENABLE@
681SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 680SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
682SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 681SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
683SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 682SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -703,6 +702,7 @@ USE_NLS = @USE_NLS@
703VERSION = @VERSION@ 702VERSION = @VERSION@
704WITH_OCAML = @WITH_OCAML@ 703WITH_OCAML = @WITH_OCAML@
705WITH_TKSCI = @WITH_TKSCI@ 704WITH_TKSCI = @WITH_TKSCI@
705XCOS_ENABLE = @XCOS_ENABLE@
706XGETTEXT = @XGETTEXT@ 706XGETTEXT = @XGETTEXT@
707XGETTEXT_015 = @XGETTEXT_015@ 707XGETTEXT_015 = @XGETTEXT_015@
708XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 708XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/modules/fftw/Makefile.in b/scilab/modules/fftw/Makefile.in
index 8aaaf1d..0322789 100644
--- a/scilab/modules/fftw/Makefile.in
+++ b/scilab/modules/fftw/Makefile.in
@@ -326,7 +326,6 @@ RANLIB = @RANLIB@
326RELOCATABLE = @RELOCATABLE@ 326RELOCATABLE = @RELOCATABLE@
327RT_LIB = @RT_LIB@ 327RT_LIB = @RT_LIB@
328SAXON = @SAXON@ 328SAXON = @SAXON@
329SCICOS_ENABLE = @SCICOS_ENABLE@
330SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 329SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
331SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 330SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
332SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 331SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -352,6 +351,7 @@ USE_NLS = @USE_NLS@
352VERSION = @VERSION@ 351VERSION = @VERSION@
353WITH_OCAML = @WITH_OCAML@ 352WITH_OCAML = @WITH_OCAML@
354WITH_TKSCI = @WITH_TKSCI@ 353WITH_TKSCI = @WITH_TKSCI@
354XCOS_ENABLE = @XCOS_ENABLE@
355XGETTEXT = @XGETTEXT@ 355XGETTEXT = @XGETTEXT@
356XGETTEXT_015 = @XGETTEXT_015@ 356XGETTEXT_015 = @XGETTEXT_015@
357XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 357XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/modules/fileio/Makefile.in b/scilab/modules/fileio/Makefile.in
index 79a6ae3..e443c62 100644
--- a/scilab/modules/fileio/Makefile.in
+++ b/scilab/modules/fileio/Makefile.in
@@ -361,7 +361,6 @@ RANLIB = @RANLIB@
361RELOCATABLE = @RELOCATABLE@ 361RELOCATABLE = @RELOCATABLE@
362RT_LIB = @RT_LIB@ 362RT_LIB = @RT_LIB@
363SAXON = @SAXON@ 363SAXON = @SAXON@
364SCICOS_ENABLE = @SCICOS_ENABLE@
365SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 364SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
366SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 365SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
367SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 366SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -387,6 +386,7 @@ USE_NLS = @USE_NLS@
387VERSION = @VERSION@ 386VERSION = @VERSION@
388WITH_OCAML = @WITH_OCAML@ 387WITH_OCAML = @WITH_OCAML@
389WITH_TKSCI = @WITH_TKSCI@ 388WITH_TKSCI = @WITH_TKSCI@
389XCOS_ENABLE = @XCOS_ENABLE@
390XGETTEXT = @XGETTEXT@ 390XGETTEXT = @XGETTEXT@
391XGETTEXT_015 = @XGETTEXT_015@ 391XGETTEXT_015 = @XGETTEXT_015@
392XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 392XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/modules/functions/Makefile.in b/scilab/modules/functions/Makefile.in
index ff08f03..bd70bf7 100644
--- a/scilab/modules/functions/Makefile.in
+++ b/scilab/modules/functions/Makefile.in
@@ -316,7 +316,6 @@ RANLIB = @RANLIB@
316RELOCATABLE = @RELOCATABLE@ 316RELOCATABLE = @RELOCATABLE@
317RT_LIB = @RT_LIB@ 317RT_LIB = @RT_LIB@
318SAXON = @SAXON@ 318SAXON = @SAXON@
319SCICOS_ENABLE = @SCICOS_ENABLE@
320SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 319SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
321SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 320SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
322SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 321SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -342,6 +341,7 @@ USE_NLS = @USE_NLS@
342VERSION = @VERSION@ 341VERSION = @VERSION@
343WITH_OCAML = @WITH_OCAML@ 342WITH_OCAML = @WITH_OCAML@
344WITH_TKSCI = @WITH_TKSCI@ 343WITH_TKSCI = @WITH_TKSCI@
344XCOS_ENABLE = @XCOS_ENABLE@
345XGETTEXT = @XGETTEXT@ 345XGETTEXT = @XGETTEXT@
346XGETTEXT_015 = @XGETTEXT_015@ 346XGETTEXT_015 = @XGETTEXT_015@
347XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 347XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/modules/genetic_algorithms/Makefile.in b/scilab/modules/genetic_algorithms/Makefile.in
index 6cd0ec5..cb63128 100644
--- a/scilab/modules/genetic_algorithms/Makefile.in
+++ b/scilab/modules/genetic_algorithms/Makefile.in
@@ -270,7 +270,6 @@ RANLIB = @RANLIB@
270RELOCATABLE = @RELOCATABLE@ 270RELOCATABLE = @RELOCATABLE@
271RT_LIB = @RT_LIB@ 271RT_LIB = @RT_LIB@
272SAXON = @SAXON@ 272SAXON = @SAXON@
273SCICOS_ENABLE = @SCICOS_ENABLE@
274SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 273SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
275SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 274SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
276SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 275SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -296,6 +295,7 @@ USE_NLS = @USE_NLS@
296VERSION = @VERSION@ 295VERSION = @VERSION@
297WITH_OCAML = @WITH_OCAML@ 296WITH_OCAML = @WITH_OCAML@
298WITH_TKSCI = @WITH_TKSCI@ 297WITH_TKSCI = @WITH_TKSCI@
298XCOS_ENABLE = @XCOS_ENABLE@
299XGETTEXT = @XGETTEXT@ 299XGETTEXT = @XGETTEXT@
300XGETTEXT_015 = @XGETTEXT_015@ 300XGETTEXT_015 = @XGETTEXT_015@
301XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 301XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/modules/graph/Makefile.in b/scilab/modules/graph/Makefile.in
index 72ef0f1..17c3459 100644
--- a/scilab/modules/graph/Makefile.in
+++ b/scilab/modules/graph/Makefile.in
@@ -306,7 +306,6 @@ RANLIB = @RANLIB@
306RELOCATABLE = @RELOCATABLE@ 306RELOCATABLE = @RELOCATABLE@
307RT_LIB = @RT_LIB@ 307RT_LIB = @RT_LIB@
308SAXON = @SAXON@ 308SAXON = @SAXON@
309SCICOS_ENABLE = @SCICOS_ENABLE@
310SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 309SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
311SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 310SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
312SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 311SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -332,6 +331,7 @@ USE_NLS = @USE_NLS@
332VERSION = @VERSION@ 331VERSION = @VERSION@
333WITH_OCAML = @WITH_OCAML@ 332WITH_OCAML = @WITH_OCAML@
334WITH_TKSCI = @WITH_TKSCI@ 333WITH_TKSCI = @WITH_TKSCI@
334XCOS_ENABLE = @XCOS_ENABLE@
335XGETTEXT = @XGETTEXT@ 335XGETTEXT = @XGETTEXT@
336XGETTEXT_015 = @XGETTEXT_015@ 336XGETTEXT_015 = @XGETTEXT_015@
337XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 337XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/modules/graphic_export/Makefile.in b/scilab/modules/graphic_export/Makefile.in
index ca52a6a..5ef0c29 100644
--- a/scilab/modules/graphic_export/Makefile.in
+++ b/scilab/modules/graphic_export/Makefile.in
@@ -343,7 +343,6 @@ RANLIB = @RANLIB@
343RELOCATABLE = @RELOCATABLE@ 343RELOCATABLE = @RELOCATABLE@
344RT_LIB = @RT_LIB@ 344RT_LIB = @RT_LIB@
345SAXON = @SAXON@ 345SAXON = @SAXON@
346SCICOS_ENABLE = @SCICOS_ENABLE@
347SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 346SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
348SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 347SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
349SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 348SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -369,6 +368,7 @@ USE_NLS = @USE_NLS@
369VERSION = @VERSION@ 368VERSION = @VERSION@
370WITH_OCAML = @WITH_OCAML@ 369WITH_OCAML = @WITH_OCAML@
371WITH_TKSCI = @WITH_TKSCI@ 370WITH_TKSCI = @WITH_TKSCI@
371XCOS_ENABLE = @XCOS_ENABLE@
372XGETTEXT = @XGETTEXT@ 372XGETTEXT = @XGETTEXT@
373XGETTEXT_015 = @XGETTEXT_015@ 373XGETTEXT_015 = @XGETTEXT_015@
374XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 374XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/modules/graphics/Makefile.in b/scilab/modules/graphics/Makefile.in
index bb8b198..c6bd237 100644
--- a/scilab/modules/graphics/Makefile.in
+++ b/scilab/modules/graphics/Makefile.in
@@ -678,7 +678,6 @@ RANLIB = @RANLIB@
678RELOCATABLE = @RELOCATABLE@ 678RELOCATABLE = @RELOCATABLE@
679RT_LIB = @RT_LIB@ 679RT_LIB = @RT_LIB@
680SAXON = @SAXON@ 680SAXON = @SAXON@
681SCICOS_ENABLE = @SCICOS_ENABLE@
682SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 681SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
683SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 682SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
684SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 683SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -704,6 +703,7 @@ USE_NLS = @USE_NLS@
704VERSION = @VERSION@ 703VERSION = @VERSION@
705WITH_OCAML = @WITH_OCAML@ 704WITH_OCAML = @WITH_OCAML@
706WITH_TKSCI = @WITH_TKSCI@ 705WITH_TKSCI = @WITH_TKSCI@
706XCOS_ENABLE = @XCOS_ENABLE@
707XGETTEXT = @XGETTEXT@ 707XGETTEXT = @XGETTEXT@
708XGETTEXT_015 = @XGETTEXT_015@ 708XGETTEXT_015 = @XGETTEXT_015@
709XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 709XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/modules/gui/Makefile.in b/scilab/modules/gui/Makefile.in
index ef895bb..76b48b6 100644
--- a/scilab/modules/gui/Makefile.in
+++ b/scilab/modules/gui/Makefile.in
@@ -433,7 +433,6 @@ RANLIB = @RANLIB@
433RELOCATABLE = @RELOCATABLE@ 433RELOCATABLE = @RELOCATABLE@
434RT_LIB = @RT_LIB@ 434RT_LIB = @RT_LIB@
435SAXON = @SAXON@ 435SAXON = @SAXON@
436SCICOS_ENABLE = @SCICOS_ENABLE@
437SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 436SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
438SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 437SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
439SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 438SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -459,6 +458,7 @@ USE_NLS = @USE_NLS@
459VERSION = @VERSION@ 458VERSION = @VERSION@
460WITH_OCAML = @WITH_OCAML@ 459WITH_OCAML = @WITH_OCAML@
461WITH_TKSCI = @WITH_TKSCI@ 460WITH_TKSCI = @WITH_TKSCI@
461XCOS_ENABLE = @XCOS_ENABLE@
462XGETTEXT = @XGETTEXT@ 462XGETTEXT = @XGETTEXT@
463XGETTEXT_015 = @XGETTEXT_015@ 463XGETTEXT_015 = @XGETTEXT_015@
464XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 464XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/modules/hdf5/Makefile.in b/scilab/modules/hdf5/Makefile.in
index bfe1e8e..773051c 100644
--- a/scilab/modules/hdf5/Makefile.in
+++ b/scilab/modules/hdf5/Makefile.in
@@ -358,7 +358,6 @@ RANLIB = @RANLIB@
358RELOCATABLE = @RELOCATABLE@ 358RELOCATABLE = @RELOCATABLE@
359RT_LIB = @RT_LIB@ 359RT_LIB = @RT_LIB@
360SAXON = @SAXON@ 360SAXON = @SAXON@
361SCICOS_ENABLE = @SCICOS_ENABLE@
362SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 361SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
363SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 362SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
364SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 363SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -384,6 +383,7 @@ USE_NLS = @USE_NLS@
384VERSION = @VERSION@ 383VERSION = @VERSION@
385WITH_OCAML = @WITH_OCAML@ 384WITH_OCAML = @WITH_OCAML@
386WITH_TKSCI = @WITH_TKSCI@ 385WITH_TKSCI = @WITH_TKSCI@
386XCOS_ENABLE = @XCOS_ENABLE@
387XGETTEXT = @XGETTEXT@ 387XGETTEXT = @XGETTEXT@
388XGETTEXT_015 = @XGETTEXT_015@ 388XGETTEXT_015 = @XGETTEXT_015@
389XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 389XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/modules/helptools/Makefile.in b/scilab/modules/helptools/Makefile.in
index 99a6dcb..46edfd3 100644
--- a/scilab/modules/helptools/Makefile.in
+++ b/scilab/modules/helptools/Makefile.in
@@ -333,7 +333,6 @@ RANLIB = @RANLIB@
333RELOCATABLE = @RELOCATABLE@ 333RELOCATABLE = @RELOCATABLE@
334RT_LIB = @RT_LIB@ 334RT_LIB = @RT_LIB@
335SAXON = @SAXON@ 335SAXON = @SAXON@
336SCICOS_ENABLE = @SCICOS_ENABLE@
337SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 336SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
338SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 337SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
339SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 338SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -359,6 +358,7 @@ USE_NLS = @USE_NLS@
359VERSION = @VERSION@ 358VERSION = @VERSION@
360WITH_OCAML = @WITH_OCAML@ 359WITH_OCAML = @WITH_OCAML@
361WITH_TKSCI = @WITH_TKSCI@ 360WITH_TKSCI = @WITH_TKSCI@
361XCOS_ENABLE = @XCOS_ENABLE@
362XGETTEXT = @XGETTEXT@ 362XGETTEXT = @XGETTEXT@
363XGETTEXT_015 = @XGETTEXT_015@ 363XGETTEXT_015 = @XGETTEXT_015@
364XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 364XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
diff --git a/scilab/modules/history_browser/Makefile.in b/scilab/modules/history_browser/Makefile.in
index 8f2df34..634c99f 100644
--- a/scilab/modules/history_browser/Makefile.in
+++ b/scilab/modules/history_browser/Makefile.in
@@ -337,7 +337,6 @@ RANLIB = @RANLIB@
337RELOCATABLE = @RELOCATABLE@ 337RELOCATABLE = @RELOCATABLE@
338RT_LIB = @RT_LIB@ 338RT_LIB = @RT_LIB@
339SAXON = @SAXON@ 339SAXON = @SAXON@
340SCICOS_ENABLE = @SCICOS_ENABLE@
341SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@ 340SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
342SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 341SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
343SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@ 342SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
@@ -363,6 +362,7 @@ USE_NLS = @USE_NLS@
363VERSION = @VERSION@ 362VERSION = @VERSION@
364WITH_OCAML = @WITH_OCAML@ 363WITH_OCAML = @WITH_OCAML@
365WITH_TKSCI = @WITH_TKSCI@ 364WITH_TKSCI = @WITH_TKSCI@
365XCOS_ENABLE = @XCOS_ENABLE@
366XGETTEXT = @XGETTEXT@ 366XGETTEXT = @XGETTEXT@
367XGETTEXT_015 = @XGETTEXT_015@ 367XGETTEXT_015 = @XGETTEXT_015@
368XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ 368XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@