summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--scilab/CHANGES_5.2.X12
-rw-r--r--scilab/Makefile.in1
-rwxr-xr-xscilab/configure765
-rw-r--r--scilab/configure.ac22
-rw-r--r--scilab/contrib/Makefile.in1
-rw-r--r--scilab/libs/MALLOC/Makefile.in1
-rw-r--r--scilab/libs/Makefile.in1
-rw-r--r--scilab/libs/doublylinkedlist/Makefile.in1
-rw-r--r--scilab/libs/dynamiclibrary/Makefile.in1
-rw-r--r--scilab/libs/hashtable/Makefile.in1
-rw-r--r--scilab/libs/libst/Makefile.in1
-rw-r--r--scilab/m4/docbook.m45
-rw-r--r--scilab/modules/Makefile.in1
-rw-r--r--scilab/modules/action_binding/Makefile.in1
-rw-r--r--scilab/modules/api_scilab/Makefile.in1
-rw-r--r--scilab/modules/arnoldi/Makefile.in1
-rw-r--r--scilab/modules/atoms/Makefile.in1
-rw-r--r--scilab/modules/boolean/Makefile.in1
-rw-r--r--scilab/modules/cacsd/Makefile.in1
-rw-r--r--scilab/modules/call_scilab/Makefile.in1
-rw-r--r--scilab/modules/compatibility_functions/Makefile.in1
-rw-r--r--scilab/modules/completion/Makefile.in1
-rw-r--r--scilab/modules/console/Makefile.in1
-rw-r--r--scilab/modules/core/Makefile.in1
-rw-r--r--scilab/modules/data_structures/Makefile.in1
-rw-r--r--scilab/modules/demo_tools/Makefile.in1
-rw-r--r--scilab/modules/development_tools/Makefile.in1
-rw-r--r--scilab/modules/development_tools/src/fake/Makefile.in1
-rw-r--r--scilab/modules/differential_equations/Makefile.in1
-rw-r--r--scilab/modules/double/Makefile.in1
-rw-r--r--scilab/modules/dynamic_link/Makefile.in1
-rw-r--r--scilab/modules/elementary_functions/Makefile.in1
-rw-r--r--scilab/modules/elementary_functions/macros/tand.sci26
-rw-r--r--scilab/modules/elementary_functions/tests/unit_tests/tand.dia.ref824
-rw-r--r--scilab/modules/elementary_functions/tests/unit_tests/tand.tst825
-rw-r--r--scilab/modules/fftw/Makefile.in1
-rw-r--r--scilab/modules/fileio/Makefile.in1
-rw-r--r--scilab/modules/functions/Makefile.in1
-rw-r--r--scilab/modules/genetic_algorithms/Makefile.in1
-rw-r--r--scilab/modules/graphic_export/Makefile.in1
-rw-r--r--scilab/modules/graphics/Makefile.in1
-rw-r--r--scilab/modules/gui/Makefile.in1
-rw-r--r--scilab/modules/hdf5/Makefile.in1
-rw-r--r--scilab/modules/helptools/Makefile.in1
-rw-r--r--scilab/modules/history_manager/Makefile.in1
-rw-r--r--scilab/modules/integer/Makefile.in1
-rw-r--r--scilab/modules/interpolation/Makefile.in1
-rw-r--r--scilab/modules/intersci/Makefile.in1
-rw-r--r--scilab/modules/io/Makefile.in1
-rw-r--r--scilab/modules/javasci/Makefile.in1
-rw-r--r--scilab/modules/jvm/Makefile.in1
-rw-r--r--scilab/modules/linear_algebra/Makefile.in1
-rw-r--r--scilab/modules/localization/Makefile.in1
-rw-r--r--scilab/modules/m2sci/Makefile.in1
-rw-r--r--scilab/modules/maple2scilab/Makefile.in1
-rw-r--r--scilab/modules/matio/Makefile.in1
-rw-r--r--scilab/modules/mexlib/Makefile.in1
-rw-r--r--scilab/modules/optimization/Makefile.in1
-rw-r--r--scilab/modules/output_stream/Makefile.in1
-rw-r--r--scilab/modules/overloading/Makefile.in1
-rw-r--r--scilab/modules/parameters/Makefile.in1
-rw-r--r--scilab/modules/polynomials/Makefile.in1
-rw-r--r--scilab/modules/pvm/Makefile.in1
-rw-r--r--scilab/modules/randlib/Makefile.in1
-rw-r--r--scilab/modules/renderer/Makefile.in1
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/polylineDrawing/PolylineLineDrawerGL.java12
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/geom3D/GeomAlgos.java37
-rw-r--r--scilab/modules/renderer/tests/nonreg_tests/bug_6558.tst26
-rw-r--r--scilab/modules/scicos/Makefile.in1
-rw-r--r--scilab/modules/scicos_blocks/Makefile.in1
-rw-r--r--scilab/modules/shell/Makefile.in1
-rw-r--r--scilab/modules/signal_processing/Makefile.in1
-rw-r--r--scilab/modules/simulated_annealing/Makefile.in1
-rw-r--r--scilab/modules/sound/Makefile.in1
-rw-r--r--scilab/modules/sparse/Makefile.in3
-rw-r--r--scilab/modules/special_functions/Makefile.in1
-rw-r--r--scilab/modules/spreadsheet/Makefile.in1
-rw-r--r--scilab/modules/statistics/Makefile.in1
-rw-r--r--scilab/modules/string/Makefile.in1
-rw-r--r--scilab/modules/symbolic/Makefile.in1
-rw-r--r--scilab/modules/tclsci/Makefile.in1
-rw-r--r--scilab/modules/texmacs/Makefile.in1
-rw-r--r--scilab/modules/time/Makefile.in1
-rw-r--r--scilab/modules/umfpack/Makefile.in1
-rw-r--r--scilab/modules/windows_tools/Makefile.in1
-rw-r--r--scilab/modules/xcos/Makefile.in1
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/ScilabGraph.java5
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/CopyAction.java3
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/CutAction.java3
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/DeleteAction.java3
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/GroupAction.java4
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/InvertSelectionAction.java1
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/PasteAction.java3
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/RedoAction.java1
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/SelectAllAction.java1
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/UnGroupAction.java1
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/UndoAction.java1
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/ZoomInAction.java1
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/ZoomOutAction.java1
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/base/DefaultAction.java (renamed from scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/DefaultAction.java)39
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/base/GraphActionManager.java (renamed from scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/GraphActionFactory.java)8
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/base/MultiSelectionDependantAction.java76
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/actions/base/SelectionDependantAction.java77
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/AboutXcosAction.java11
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/CloseAction.java10
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/CloseViewportAction.java10
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/CodeGenerationAction.java23
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/CompileAction.java9
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/DebugLevelAction.java2
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/DiagramBackgroundAction.java10
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/DumpAction.java2
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/ExportAction.java10
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/FitDiagramToViewAction.java11
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/LinkStyleAction.java12
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/NewDiagramAction.java10
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/NormalViewAction.java11
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/OpenAction.java10
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/PrintAction.java10
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/QuitAction.java10
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/RecentFileAction.java10
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/SaveAction.java10
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/SaveAsAction.java10
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/SetContextAction.java2
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/SetupAction.java2
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/ShowHideShadowAction.java10
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/StartAction.java2
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/StopAction.java2
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/ViewDiagramBrowserAction.java14
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/ViewGridAction.java11
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/ViewViewportAction.java11
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/XcosDemonstrationsAction.java2
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/XcosDocumentationAction.java2
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java2
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/TextBlock.java2
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/BlockDocumentationAction.java2
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/BlockParametersAction.java10
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/BorderColorAction.java14
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/FilledColorAction.java14
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/FlipAction.java10
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/MirrorAction.java14
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/RegionToSuperblockAction.java11
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/RotateAction.java10
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/ShowParentAction.java10
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskCreateAction.java2
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskCustomizeAction.java2
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskRemoveAction.java2
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/ViewDetailsAction.java18
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/alignement/AlignBlockAction.java16
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/actions/ClosePalettesAction.java11
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/actions/LoadAsPalAction.java14
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/actions/NewPaletteAction.java15
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/actions/ViewPaletteBrowserAction.java17
-rw-r--r--scilab/modules/xpad/Makefile.in1
153 files changed, 1797 insertions, 1509 deletions
diff --git a/scilab/CHANGES_5.2.X b/scilab/CHANGES_5.2.X
index c46bb27..538382d 100644
--- a/scilab/CHANGES_5.2.X
+++ b/scilab/CHANGES_5.2.X
@@ -46,6 +46,7 @@ Xcos:
46 - Java package (eg namespace) has been added to reduce the number of classes 46 - Java package (eg namespace) has been added to reduce the number of classes
47 per package and improve readability. 47 per package and improve readability.
48 - org.scilab.modules.graph is independent from Xcos and can be safely used. 48 - org.scilab.modules.graph is independent from Xcos and can be safely used.
49 - the actions are now only instanciated per graph.
49 50
50* bug 4206 fixed - The CreateMask action didn't generate a valid submatrix. 51* bug 4206 fixed - The CreateMask action didn't generate a valid submatrix.
51 52
@@ -134,9 +135,15 @@ Compilation:
134 135
135* Better detection of JOGL 136* Better detection of JOGL
136 137
138* Better check of the lib math (libm)
139
137* When two versions of the same jar libraries, in some cases, the system 140* When two versions of the same jar libraries, in some cases, the system
138 could not detect any of them 141 could not detect any of them
139 142
143* bug 5496 fixed - When the option --disable-build-help was enabled, the
144 check/use of jeuclid was disabled. It was causing build
145 issue since jeuclid is now necessary for graphics.
146
140* bug 5503 fixed - add /usr/lib/*/ and /usr/lib64/*/ in the search path when 147* bug 5503 fixed - add /usr/lib/*/ and /usr/lib64/*/ in the search path when
141 looking for Java libraries (Fedora 12 for example) 148 looking for Java libraries (Fedora 12 for example)
142 149
@@ -258,6 +265,8 @@ Bug fixes:
258 265
259* bug 6547 fixed - 'uigetdir' crashed Scilab when returning some "root" path. 266* bug 6547 fixed - 'uigetdir' crashed Scilab when returning some "root" path.
260 267
268* bug 6558 fixed - Infinite value was not plotted even if it was possible.
269
261 270
262 Changes between version 5.2.0-beta1 and 5.2.0 of Scilab 271 Changes between version 5.2.0-beta1 and 5.2.0 of Scilab
263 ========================================================== 272 ==========================================================
@@ -2027,3 +2036,6 @@ Bug fixes:
2027* bug 6468 fixed - wrong check in dnaupd. 2036* bug 6468 fixed - wrong check in dnaupd.
2028 2037
2029* bug 6495 fixed - in lqr, variable Q not defined. 2038* bug 6495 fixed - in lqr, variable Q not defined.
2039
2040* bug 4785 fixed - tand(0) generated an error
2041
diff --git a/scilab/Makefile.in b/scilab/Makefile.in
index f9caeaf..5556290 100644
--- a/scilab/Makefile.in
+++ b/scilab/Makefile.in
@@ -415,6 +415,7 @@ LD = @LD@
415LDFLAGS = @LDFLAGS@ 415LDFLAGS = @LDFLAGS@
416LIBICONV = @LIBICONV@ 416LIBICONV = @LIBICONV@
417LIBINTL = @LIBINTL@ 417LIBINTL = @LIBINTL@
418LIBM = @LIBM@
418LIBOBJS = @LIBOBJS@ 419LIBOBJS = @LIBOBJS@
419LIBS = @LIBS@ 420LIBS = @LIBS@
420LIBTOOL = @LIBTOOL@ 421LIBTOOL = @LIBTOOL@
diff --git a/scilab/configure b/scilab/configure
index 88eb0f7..c7a88c1 100755
--- a/scilab/configure
+++ b/scilab/configure
@@ -639,7 +639,6 @@ AVALON_FRAMEWORK
639XML_APIS_EXT 639XML_APIS_EXT
640XMLGRAPHICS_COMMONS 640XMLGRAPHICS_COMMONS
641COMMONS_IO 641COMMONS_IO
642JEUCLID_CORE
643FOP 642FOP
644SAXON 643SAXON
645BATIK 644BATIK
@@ -719,6 +718,7 @@ MSGFMT
719GETTEXT_MACRO_VERSION 718GETTEXT_MACRO_VERSION
720USE_NLS 719USE_NLS
721POW_LIB 720POW_LIB
721LIBM
722GUI_ENABLE 722GUI_ENABLE
723GIWS_FALSE 723GIWS_FALSE
724GIWS_TRUE 724GIWS_TRUE
@@ -740,16 +740,13 @@ JAVA_DEBUG_OPTIONS
740JAVA_HOME 740JAVA_HOME
741JAVA_JNI_LIBS 741JAVA_JNI_LIBS
742JAVA_JNI_INCLUDE 742JAVA_JNI_INCLUDE
743JUNIT
744BSH
745QDOX
746TESTNG
747ANTLR 743ANTLR
748COMMONS_BEANUTILS 744COMMONS_BEANUTILS
749CHECKSTYLE 745CHECKSTYLE
750JLATEXMATH 746JLATEXMATH
751COMMONS_LOGGING 747COMMONS_LOGGING
752JHDF5 748JHDF5
749JEUCLID_CORE
753JROSETTA_ENGINE 750JROSETTA_ENGINE
754JROSETTA_API 751JROSETTA_API
755JHALL 752JHALL
@@ -9843,7 +9840,7 @@ $as_echo "$ac_java_classpath" >&6; }
9843$as_echo_n "checking to see if the java compiler works... " >&6; } 9840$as_echo_n "checking to see if the java compiler works... " >&6; }
9844 9841
9845 cat << \EOF > conftest.java 9842 cat << \EOF > conftest.java
9846// #line 9846 "configure" 9843// #line 9843 "configure"
9847 9844
9848 9845
9849public class conftest { 9846public class conftest {
@@ -9903,7 +9900,7 @@ $as_echo_n "checking type of jvm... " >&6; }
9903 if test "x$ac_java_jvm_name" = "x" ; then 9900 if test "x$ac_java_jvm_name" = "x" ; then
9904 9901
9905 cat << \EOF > conftest.java 9902 cat << \EOF > conftest.java
9906// #line 9906 "configure" 9903// #line 9903 "configure"
9907import gnu.java.io.EncodingManager; 9904import gnu.java.io.EncodingManager;
9908 9905
9909public class conftest { 9906public class conftest {
@@ -9961,7 +9958,7 @@ $as_echo_n "checking java API version... " >&6; }
9961 9958
9962 9959
9963 cat << \EOF > conftest.java 9960 cat << \EOF > conftest.java
9964// #line 9964 "configure" 9961// #line 9961 "configure"
9965import java.nio.charset.Charset; 9962import java.nio.charset.Charset;
9966 9963
9967public class conftest { 9964public class conftest {
@@ -10000,7 +9997,7 @@ EOF
10000 9997
10001 9998
10002 cat << \EOF > conftest.java 9999 cat << \EOF > conftest.java
10003// #line 10003 "configure" 10000// #line 10000 "configure"
10004import java.lang.StringBuilder; 10001import java.lang.StringBuilder;
10005 10002
10006public class conftest { 10003public class conftest {
@@ -11250,7 +11247,7 @@ $as_echo_n "checking jgraphx... " >&6; }
11250 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11247 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11251 11248
11252 cat << \EOF > conftest.java 11249 cat << \EOF > conftest.java
11253// #line 11253 "configure" 11250// #line 11250 "configure"
11254import com.mxgraph.model.mxCell; 11251import com.mxgraph.model.mxCell;
11255 11252
11256public class conftest { 11253public class conftest {
@@ -11337,7 +11334,7 @@ $as_echo_n "checking minimal version (1.2.0.7) of jgraphx... " >&6; }
11337 export ac_java_classpath="$JGRAPHX:$ac_java_classpath" 11334 export ac_java_classpath="$JGRAPHX:$ac_java_classpath"
11338 11335
11339 cat << \EOF > conftest.java 11336 cat << \EOF > conftest.java
11340// #line 11340 "configure" 11337// #line 11337 "configure"
11341import com.mxgraph.view.mxGraph; 11338import com.mxgraph.view.mxGraph;
11342 11339
11343public class conftest { 11340public class conftest {
@@ -11401,7 +11398,7 @@ $as_echo_n "checking flexdock... " >&6; }
11401 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11398 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11402 11399
11403 cat << \EOF > conftest.java 11400 cat << \EOF > conftest.java
11404// #line 11404 "configure" 11401// #line 11401 "configure"
11405import org.flexdock.docking.DockingManager; 11402import org.flexdock.docking.DockingManager;
11406 11403
11407public class conftest { 11404public class conftest {
@@ -11502,7 +11499,7 @@ $as_echo_n "checking looks... " >&6; }
11502 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11499 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11503 11500
11504 cat << \EOF > conftest.java 11501 cat << \EOF > conftest.java
11505// #line 11505 "configure" 11502// #line 11502 "configure"
11506import com.jgoodies.looks.common.RenderingUtils; 11503import com.jgoodies.looks.common.RenderingUtils;
11507 11504
11508public class conftest { 11505public class conftest {
@@ -11603,7 +11600,7 @@ $as_echo_n "checking jgoodies-looks... " >&6; }
11603 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11600 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11604 11601
11605 cat << \EOF > conftest.java 11602 cat << \EOF > conftest.java
11606// #line 11606 "configure" 11603// #line 11603 "configure"
11607import com.jgoodies.looks.common.RenderingUtils; 11604import com.jgoodies.looks.common.RenderingUtils;
11608 11605
11609public class conftest { 11606public class conftest {
@@ -11705,7 +11702,7 @@ $as_echo_n "checking skinlf... " >&6; }
11705 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11702 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11706 11703
11707 cat << \EOF > conftest.java 11704 cat << \EOF > conftest.java
11708// #line 11708 "configure" 11705// #line 11705 "configure"
11709import com.l2fprod.util.AccessUtils; 11706import com.l2fprod.util.AccessUtils;
11710 11707
11711public class conftest { 11708public class conftest {
@@ -11806,7 +11803,7 @@ $as_echo_n "checking jogl... " >&6; }
11806 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11803 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11807 11804
11808 cat << \EOF > conftest.java 11805 cat << \EOF > conftest.java
11809// #line 11809 "configure" 11806// #line 11806 "configure"
11810import javax.media.opengl.glu.GLUnurbs; 11807import javax.media.opengl.glu.GLUnurbs;
11811 11808
11812public class conftest { 11809public class conftest {
@@ -12007,7 +12004,7 @@ $as_echo_n "checking gluegen-rt... " >&6; }
12007 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12004 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12008 12005
12009 cat << \EOF > conftest.java 12006 cat << \EOF > conftest.java
12010// #line 12010 "configure" 12007// #line 12007 "configure"
12011import com.sun.gluegen.runtime.CPU; 12008import com.sun.gluegen.runtime.CPU;
12012 12009
12013public class conftest { 12010public class conftest {
@@ -12163,7 +12160,7 @@ $as_echo_n "checking jhall... " >&6; }
12163 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12160 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12164 12161
12165 cat << \EOF > conftest.java 12162 cat << \EOF > conftest.java
12166// #line 12166 "configure" 12163// #line 12163 "configure"
12167import javax.help.JHelp; 12164import javax.help.JHelp;
12168 12165
12169public class conftest { 12166public class conftest {
@@ -12264,7 +12261,7 @@ $as_echo_n "checking javahelp2... " >&6; }
12264 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12261 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12265 12262
12266 cat << \EOF > conftest.java 12263 cat << \EOF > conftest.java
12267// #line 12267 "configure" 12264// #line 12264 "configure"
12268import javax.help.JHelp; 12265import javax.help.JHelp;
12269 12266
12270public class conftest { 12267public class conftest {
@@ -12366,7 +12363,7 @@ $as_echo_n "checking jrosetta-API... " >&6; }
12366 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12363 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12367 12364
12368 cat << \EOF > conftest.java 12365 cat << \EOF > conftest.java
12369// #line 12369 "configure" 12366// #line 12366 "configure"
12370import com.artenum.rosetta.interfaces.core.ConsoleConfiguration; 12367import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
12371 12368
12372public class conftest { 12369public class conftest {
@@ -12467,7 +12464,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
12467 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12464 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12468 12465
12469 cat << \EOF > conftest.java 12466 cat << \EOF > conftest.java
12470// #line 12470 "configure" 12467// #line 12467 "configure"
12471import com.artenum.rosetta.core.action.AbstractConsoleAction; 12468import com.artenum.rosetta.core.action.AbstractConsoleAction;
12472 12469
12473public class conftest { 12470public class conftest {
@@ -12547,17 +12544,18 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar jrosetta-e
12547 JROSETTA_ENGINE=$PACKAGE_JAR_FILE 12544 JROSETTA_ENGINE=$PACKAGE_JAR_FILE
12548 12545
12549 12546
12550 if test $HDF5_ENABLE = yes; then
12551 # HDF5 java lib
12552 12547
12553 { $as_echo "$as_me:${as_lineno-$LINENO}: checking jhdf5" >&5 12548 # MathML rendering solution
12554$as_echo_n "checking jhdf5... " >&6; } 12549 # Used in both graphic & help
12550
12551 { $as_echo "$as_me:${as_lineno-$LINENO}: checking jeuclid-core" >&5
12552$as_echo_n "checking jeuclid-core... " >&6; }
12555 PACKAGE_JAR_FILE= 12553 PACKAGE_JAR_FILE=
12556 found_jar=no 12554 found_jar=no
12557 saved_ac_java_classpath=$ac_java_classpath 12555 saved_ac_java_classpath=$ac_java_classpath
12558 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)" 12556 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)"
12559 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do 12557 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
12560 for jar in "$jardir/jhdf5.jar" "$jardir/libjhdf5.jar" "$jardir/libjhdf5-java.jar" "$jardir/jhdf5*.jar"; do 12558 for jar in "$jardir/jeuclid-core.jar" "$jardir/libjeuclid-core.jar" "$jardir/libjeuclid-core-java.jar" "$jardir/jeuclid-core*.jar"; do
12561# jar=`echo $jar|sed -e 's/ /\\ /'` 12559# jar=`echo $jar|sed -e 's/ /\\ /'`
12562# echo "protected $jar" 12560# echo "protected $jar"
12563# jar_resolved=`ls $jar 2>/dev/null` 12561# jar_resolved=`ls $jar 2>/dev/null`
@@ -12569,8 +12567,8 @@ $as_echo_n "checking jhdf5... " >&6; }
12569 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12567 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12570 12568
12571 cat << \EOF > conftest.java 12569 cat << \EOF > conftest.java
12572// #line 12572 "configure" 12570// #line 12570 "configure"
12573import ncsa.hdf.hdf5lib.HDF5Constants; 12571import net.sourceforge.jeuclid.LayoutContext;
12574 12572
12575public class conftest { 12573public class conftest {
12576 public static void main(String[] argv) { 12574 public static void main(String[] argv) {
@@ -12639,27 +12637,28 @@ $as_echo "$jar_resolved" >&6; }
12639 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 12637 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12640$as_echo "no" >&6; } 12638$as_echo "no" >&6; }
12641 if test "" = "yes"; then 12639 if test "" = "yes"; then
12642 { $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 12640 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jeuclid-core used by MathML rendering solution (at least version 3.1.X) (looking for package net.sourceforge.jeuclid.LayoutContext)" >&5
12643$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;} 12641$as_echo "$as_me: WARNING: Could not find or use the Java package/jar jeuclid-core used by MathML rendering solution (at least version 3.1.X) (looking for package net.sourceforge.jeuclid.LayoutContext)" >&2;}
12644 else 12642 else
12645 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 12643 as_fn_error "Could not find or use the Java package/jar jeuclid-core used by MathML rendering solution (at least version 3.1.X) (looking for package net.sourceforge.jeuclid.LayoutContext)" "$LINENO" 5
12646 fi 12644 fi
12647 fi 12645 fi
12648 12646
12649 JHDF5=$PACKAGE_JAR_FILE 12647 JEUCLID_CORE=$PACKAGE_JAR_FILE
12650 12648
12651 fi
12652 12649
12653 # Logging (flexdock dep)
12654 12650
12655 { $as_echo "$as_me:${as_lineno-$LINENO}: checking commons-logging" >&5 12651 if test $HDF5_ENABLE = yes; then
12656$as_echo_n "checking commons-logging... " >&6; } 12652 # HDF5 java lib
12653
12654 { $as_echo "$as_me:${as_lineno-$LINENO}: checking jhdf5" >&5
12655$as_echo_n "checking jhdf5... " >&6; }
12657 PACKAGE_JAR_FILE= 12656 PACKAGE_JAR_FILE=
12658 found_jar=no 12657 found_jar=no
12659 saved_ac_java_classpath=$ac_java_classpath 12658 saved_ac_java_classpath=$ac_java_classpath
12660 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)" 12659 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)"
12661 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do 12660 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
12662 for jar in "$jardir/commons-logging.jar" "$jardir/libcommons-logging.jar" "$jardir/libcommons-logging-java.jar" "$jardir/commons-logging*.jar"; do 12661 for jar in "$jardir/jhdf5.jar" "$jardir/libjhdf5.jar" "$jardir/libjhdf5-java.jar" "$jardir/jhdf5*.jar"; do
12663# jar=`echo $jar|sed -e 's/ /\\ /'` 12662# jar=`echo $jar|sed -e 's/ /\\ /'`
12664# echo "protected $jar" 12663# echo "protected $jar"
12665# jar_resolved=`ls $jar 2>/dev/null` 12664# jar_resolved=`ls $jar 2>/dev/null`
@@ -12671,8 +12670,8 @@ $as_echo_n "checking commons-logging... " >&6; }
12671 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12670 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12672 12671
12673 cat << \EOF > conftest.java 12672 cat << \EOF > conftest.java
12674// #line 12674 "configure" 12673// #line 12673 "configure"
12675import org.apache.commons.logging.LogFactory; 12674import ncsa.hdf.hdf5lib.HDF5Constants;
12676 12675
12677public class conftest { 12676public class conftest {
12678 public static void main(String[] argv) { 12677 public static void main(String[] argv) {
@@ -12741,26 +12740,27 @@ $as_echo "$jar_resolved" >&6; }
12741 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 12740 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12742$as_echo "no" >&6; } 12741$as_echo "no" >&6; }
12743 if test "" = "yes"; then 12742 if test "" = "yes"; then
12744 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar commons-logging used by Apache logging (looking for package org.apache.commons.logging.LogFactory)" >&5 12743 { $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
12745$as_echo "$as_me: WARNING: Could not find or use the Java package/jar commons-logging used by Apache logging (looking for package org.apache.commons.logging.LogFactory)" >&2;} 12744$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;}
12746 else 12745 else
12747 as_fn_error "Could not find or use the Java package/jar commons-logging used by Apache logging (looking for package org.apache.commons.logging.LogFactory)" "$LINENO" 5 12746 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
12748 fi 12747 fi
12749 fi 12748 fi
12750 12749
12751 COMMONS_LOGGING=$PACKAGE_JAR_FILE 12750 JHDF5=$PACKAGE_JAR_FILE
12752 12751
12752 fi
12753 12753
12754 # JLaTeXMath 12754 # Logging (flexdock dep)
12755 12755
12756 { $as_echo "$as_me:${as_lineno-$LINENO}: checking jlatexmath" >&5 12756 { $as_echo "$as_me:${as_lineno-$LINENO}: checking commons-logging" >&5
12757$as_echo_n "checking jlatexmath... " >&6; } 12757$as_echo_n "checking commons-logging... " >&6; }
12758 PACKAGE_JAR_FILE= 12758 PACKAGE_JAR_FILE=
12759 found_jar=no 12759 found_jar=no
12760 saved_ac_java_classpath=$ac_java_classpath 12760 saved_ac_java_classpath=$ac_java_classpath
12761 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)" 12761 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)"
12762 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do 12762 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
12763 for jar in "$jardir/jlatexmath.jar" "$jardir/libjlatexmath.jar" "$jardir/libjlatexmath-java.jar" "$jardir/jlatexmath*.jar"; do 12763 for jar in "$jardir/commons-logging.jar" "$jardir/libcommons-logging.jar" "$jardir/libcommons-logging-java.jar" "$jardir/commons-logging*.jar"; do
12764# jar=`echo $jar|sed -e 's/ /\\ /'` 12764# jar=`echo $jar|sed -e 's/ /\\ /'`
12765# echo "protected $jar" 12765# echo "protected $jar"
12766# jar_resolved=`ls $jar 2>/dev/null` 12766# jar_resolved=`ls $jar 2>/dev/null`
@@ -12773,7 +12773,7 @@ $as_echo_n "checking jlatexmath... " >&6; }
12773 12773
12774 cat << \EOF > conftest.java 12774 cat << \EOF > conftest.java
12775// #line 12775 "configure" 12775// #line 12775 "configure"
12776import org.scilab.forge.jlatexmath.TeXFormula; 12776import org.apache.commons.logging.LogFactory;
12777 12777
12778public class conftest { 12778public class conftest {
12779 public static void main(String[] argv) { 12779 public static void main(String[] argv) {
@@ -12842,234 +12842,26 @@ $as_echo "$jar_resolved" >&6; }
12842 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 12842 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12843$as_echo "no" >&6; } 12843$as_echo "no" >&6; }
12844 if test "" = "yes"; then 12844 if test "" = "yes"; then
12845 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jlatexmath used by LaTex Rendering (looking for package org.scilab.forge.jlatexmath.TeXFormula)" >&5 12845 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar commons-logging used by Apache logging (looking for package org.apache.commons.logging.LogFactory)" >&5
12846$as_echo "$as_me: WARNING: Could not find or use the Java package/jar jlatexmath used by LaTex Rendering (looking for package org.scilab.forge.jlatexmath.TeXFormula)" >&2;} 12846$as_echo "$as_me: WARNING: Could not find or use the Java package/jar commons-logging used by Apache logging (looking for package org.apache.commons.logging.LogFactory)" >&2;}
12847 else
12848 as_fn_error "Could not find or use the Java package/jar jlatexmath used by LaTex Rendering (looking for package org.scilab.forge.jlatexmath.TeXFormula)" "$LINENO" 5
12849 fi
12850 fi
12851
12852 JLATEXMATH=$PACKAGE_JAR_FILE
12853
12854
12855
12856$as_echo "#define WITH_GUI /**/" >>confdefs.h
12857
12858
12859 fi
12860
12861 # Checkstyle (code checking)
12862
12863 { $as_echo "$as_me:${as_lineno-$LINENO}: checking checkstyle" >&5
12864$as_echo_n "checking checkstyle... " >&6; }
12865 PACKAGE_JAR_FILE=
12866 found_jar=no
12867 saved_ac_java_classpath=$ac_java_classpath
12868 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)"
12869 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
12870 for jar in "$jardir/checkstyle.jar" "$jardir/libcheckstyle.jar" "$jardir/libcheckstyle-java.jar" "$jardir/checkstyle*.jar"; do
12871# jar=`echo $jar|sed -e 's/ /\\ /'`
12872# echo "protected $jar"
12873# jar_resolved=`ls $jar 2>/dev/null`
12874# echo "looking for $jar_resolved"
12875# TODO check the behaviour when spaces
12876 jars_resolved=`ls $jar 2>/dev/null`
12877 for jar_resolved in $jars_resolved; do # If several jars matches
12878 if test -e "$jar_resolved"; then
12879 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12880
12881 cat << \EOF > conftest.java
12882// #line 12882 "configure"
12883import com.puppycrawl.tools.checkstyle.CheckStyleTask;
12884
12885public class conftest {
12886 public static void main(String[] argv) {
12887
12888 }
12889}
12890EOF
12891
12892 CLASSPATH=$ac_java_classpath
12893 export CLASSPATH
12894 cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
12895 if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
12896 if test ""no"" = "no"; then
12897 echo "yes" >&5
12898
12899 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
12900$as_echo "$jar_resolved" >&6; }
12901 found_jar=yes
12902 PACKAGE_JAR_FILE=$jar_resolved
12903 break
12904
12905 else
12906 cmd="$JAVA conftest"
12907 if (echo $cmd >&5 ; eval $cmd >&5 2>&5); then
12908 echo "yes" >&5
12909
12910 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
12911$as_echo "$jar_resolved" >&6; }
12912 found_jar=yes
12913 PACKAGE_JAR_FILE=$jar_resolved
12914 break
12915
12916 else
12917 echo "configure: failed program was:" >&5
12918 cat conftest.java >&5
12919 echo "configure: CLASSPATH was $CLASSPATH" >&5
12920
12921 ac_java_classpath=$saved_ac_java_classpath
12922
12923
12924 fi
12925 fi
12926 else
12927 echo "configure: failed program was:" >&5
12928 cat conftest.java >&5
12929 echo "configure: CLASSPATH was $CLASSPATH" >&5
12930
12931 ac_java_classpath=$saved_ac_java_classpath
12932
12933
12934 fi
12935
12936 fi
12937 done
12938 # If ls returns several results and the first one is OK, stop the search
12939 if test "$found_jar" = "yes"; then
12940 break
12941 fi
12942 done
12943 # If found, no need to search in other directory
12944 if test "$found_jar" = "yes"; then
12945 break
12946 fi
12947 done
12948 if test "$found_jar" = "no"; then
12949 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12950$as_echo "no" >&6; }
12951 if test ""yes"" = "yes"; then
12952 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar checkstyle used by Checkstyle - code checking (looking for package com.puppycrawl.tools.checkstyle.CheckStyleTask)" >&5
12953$as_echo "$as_me: WARNING: Could not find or use the Java package/jar checkstyle used by Checkstyle - code checking (looking for package com.puppycrawl.tools.checkstyle.CheckStyleTask)" >&2;}
12954 else
12955 as_fn_error "Could not find or use the Java package/jar checkstyle used by Checkstyle - code checking (looking for package com.puppycrawl.tools.checkstyle.CheckStyleTask)" "$LINENO" 5
12956 fi
12957 fi
12958
12959 CHECKSTYLE=$PACKAGE_JAR_FILE
12960
12961
12962 # Commons beanutils (dependency of checkstyle)
12963
12964 { $as_echo "$as_me:${as_lineno-$LINENO}: checking commons-beanutils" >&5
12965$as_echo_n "checking commons-beanutils... " >&6; }
12966 PACKAGE_JAR_FILE=
12967 found_jar=no
12968 saved_ac_java_classpath=$ac_java_classpath
12969 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)"
12970 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
12971 for jar in "$jardir/commons-beanutils.jar" "$jardir/libcommons-beanutils.jar" "$jardir/libcommons-beanutils-java.jar" "$jardir/commons-beanutils*.jar"; do
12972# jar=`echo $jar|sed -e 's/ /\\ /'`
12973# echo "protected $jar"
12974# jar_resolved=`ls $jar 2>/dev/null`
12975# echo "looking for $jar_resolved"
12976# TODO check the behaviour when spaces
12977 jars_resolved=`ls $jar 2>/dev/null`
12978 for jar_resolved in $jars_resolved; do # If several jars matches
12979 if test -e "$jar_resolved"; then
12980 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12981
12982 cat << \EOF > conftest.java
12983// #line 12983 "configure"
12984import org.apache.commons.beanutils.Converter;
12985
12986public class conftest {
12987 public static void main(String[] argv) {
12988
12989 }
12990}
12991EOF
12992
12993 CLASSPATH=$ac_java_classpath
12994 export CLASSPATH
12995 cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
12996 if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
12997 if test ""no"" = "no"; then
12998 echo "yes" >&5
12999
13000 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
13001$as_echo "$jar_resolved" >&6; }
13002 found_jar=yes
13003 PACKAGE_JAR_FILE=$jar_resolved
13004 break
13005
13006 else
13007 cmd="$JAVA conftest"
13008 if (echo $cmd >&5 ; eval $cmd >&5 2>&5); then
13009 echo "yes" >&5
13010
13011 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
13012$as_echo "$jar_resolved" >&6; }
13013 found_jar=yes
13014 PACKAGE_JAR_FILE=$jar_resolved
13015 break
13016
13017 else
13018 echo "configure: failed program was:" >&5
13019 cat conftest.java >&5
13020 echo "configure: CLASSPATH was $CLASSPATH" >&5
13021
13022 ac_java_classpath=$saved_ac_java_classpath
13023
13024
13025 fi
13026 fi
13027 else
13028 echo "configure: failed program was:" >&5
13029 cat conftest.java >&5
13030 echo "configure: CLASSPATH was $CLASSPATH" >&5
13031
13032 ac_java_classpath=$saved_ac_java_classpath
13033
13034
13035 fi
13036
13037 fi
13038 done
13039 # If ls returns several results and the first one is OK, stop the search
13040 if test "$found_jar" = "yes"; then
13041 break
13042 fi
13043 done
13044 # If found, no need to search in other directory
13045 if test "$found_jar" = "yes"; then
13046 break
13047 fi
13048 done
13049 if test "$found_jar" = "no"; then
13050 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13051$as_echo "no" >&6; }
13052 if test ""yes"" = "yes"; then
13053 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar commons-beanutils used by Bean utility (looking for package org.apache.commons.beanutils.Converter)" >&5
13054$as_echo "$as_me: WARNING: Could not find or use the Java package/jar commons-beanutils used by Bean utility (looking for package org.apache.commons.beanutils.Converter)" >&2;}
13055 else 12847 else
13056 as_fn_error "Could not find or use the Java package/jar commons-beanutils used by Bean utility (looking for package org.apache.commons.beanutils.Converter)" "$LINENO" 5 12848 as_fn_error "Could not find or use the Java package/jar commons-logging used by Apache logging (looking for package org.apache.commons.logging.LogFactory)" "$LINENO" 5
13057 fi 12849 fi
13058 fi 12850 fi
13059 12851
13060 COMMONS_BEANUTILS=$PACKAGE_JAR_FILE 12852 COMMONS_LOGGING=$PACKAGE_JAR_FILE
13061 12853
13062 12854
13063 # antlr (dependency of checkstyle) 12855 # JLaTeXMath
13064 12856
13065 { $as_echo "$as_me:${as_lineno-$LINENO}: checking antlr" >&5 12857 { $as_echo "$as_me:${as_lineno-$LINENO}: checking jlatexmath" >&5
13066$as_echo_n "checking antlr... " >&6; } 12858$as_echo_n "checking jlatexmath... " >&6; }
13067 PACKAGE_JAR_FILE= 12859 PACKAGE_JAR_FILE=
13068 found_jar=no 12860 found_jar=no
13069 saved_ac_java_classpath=$ac_java_classpath 12861 saved_ac_java_classpath=$ac_java_classpath
13070 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)" 12862 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)"
13071 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do 12863 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
13072 for jar in "$jardir/antlr.jar" "$jardir/libantlr.jar" "$jardir/libantlr-java.jar" "$jardir/antlr*.jar"; do 12864 for jar in "$jardir/jlatexmath.jar" "$jardir/libjlatexmath.jar" "$jardir/libjlatexmath-java.jar" "$jardir/jlatexmath*.jar"; do
13073# jar=`echo $jar|sed -e 's/ /\\ /'` 12865# jar=`echo $jar|sed -e 's/ /\\ /'`
13074# echo "protected $jar" 12866# echo "protected $jar"
13075# jar_resolved=`ls $jar 2>/dev/null` 12867# jar_resolved=`ls $jar 2>/dev/null`
@@ -13081,8 +12873,8 @@ $as_echo_n "checking antlr... " >&6; }
13081 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12873 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13082 12874
13083 cat << \EOF > conftest.java 12875 cat << \EOF > conftest.java
13084// #line 13084 "configure" 12876// #line 12876 "configure"
13085import antlr.TokenStreamException; 12877import org.scilab.forge.jlatexmath.TeXFormula;
13086 12878
13087public class conftest { 12879public class conftest {
13088 public static void main(String[] argv) { 12880 public static void main(String[] argv) {
@@ -13150,128 +12942,33 @@ $as_echo "$jar_resolved" >&6; }
13150 if test "$found_jar" = "no"; then 12942 if test "$found_jar" = "no"; then
13151 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 12943 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13152$as_echo "no" >&6; } 12944$as_echo "no" >&6; }
13153 if test ""yes"" = "yes"; then 12945 if test "" = "yes"; then
13154 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar antlr used by language tool for constructing recognizers (looking for package antlr.TokenStreamException)" >&5 12946 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jlatexmath used by LaTex Rendering (looking for package org.scilab.forge.jlatexmath.TeXFormula)" >&5
13155$as_echo "$as_me: WARNING: Could not find or use the Java package/jar antlr used by language tool for constructing recognizers (looking for package antlr.TokenStreamException)" >&2;} 12947$as_echo "$as_me: WARNING: Could not find or use the Java package/jar jlatexmath used by LaTex Rendering (looking for package org.scilab.forge.jlatexmath.TeXFormula)" >&2;}
13156 else 12948 else
13157 as_fn_error "Could not find or use the Java package/jar antlr used by language tool for constructing recognizers (looking for package antlr.TokenStreamException)" "$LINENO" 5 12949 as_fn_error "Could not find or use the Java package/jar jlatexmath used by LaTex Rendering (looking for package org.scilab.forge.jlatexmath.TeXFormula)" "$LINENO" 5
13158 fi 12950 fi
13159 fi 12951 fi
13160 12952
13161 ANTLR=$PACKAGE_JAR_FILE 12953 JLATEXMATH=$PACKAGE_JAR_FILE
13162
13163
13164 # Test NG (java unitary test)
13165
13166 { $as_echo "$as_me:${as_lineno-$LINENO}: checking testng" >&5
13167$as_echo_n "checking testng... " >&6; }
13168 PACKAGE_JAR_FILE=
13169 found_jar=no
13170 saved_ac_java_classpath=$ac_java_classpath
13171 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)"
13172 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
13173 for jar in "$jardir/testng.jar" "$jardir/libtestng.jar" "$jardir/libtestng-java.jar" "$jardir/testng*.jar"; do
13174# jar=`echo $jar|sed -e 's/ /\\ /'`
13175# echo "protected $jar"
13176# jar_resolved=`ls $jar 2>/dev/null`
13177# echo "looking for $jar_resolved"
13178# TODO check the behaviour when spaces
13179 jars_resolved=`ls $jar 2>/dev/null`
13180 for jar_resolved in $jars_resolved; do # If several jars matches
13181 if test -e "$jar_resolved"; then
13182 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13183
13184 cat << \EOF > conftest.java
13185// #line 13185 "configure"
13186import org.testng.TestNG;
13187
13188public class conftest {
13189 public static void main(String[] argv) {
13190
13191 }
13192}
13193EOF
13194
13195 CLASSPATH=$ac_java_classpath
13196 export CLASSPATH
13197 cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
13198 if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
13199 if test ""no"" = "no"; then
13200 echo "yes" >&5
13201
13202 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
13203$as_echo "$jar_resolved" >&6; }
13204 found_jar=yes
13205 PACKAGE_JAR_FILE=$jar_resolved
13206 break
13207
13208 else
13209 cmd="$JAVA conftest"
13210 if (echo $cmd >&5 ; eval $cmd >&5 2>&5); then
13211 echo "yes" >&5
13212 12954
13213 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
13214$as_echo "$jar_resolved" >&6; }
13215 found_jar=yes
13216 PACKAGE_JAR_FILE=$jar_resolved
13217 break
13218 12955
13219 else
13220 echo "configure: failed program was:" >&5
13221 cat conftest.java >&5
13222 echo "configure: CLASSPATH was $CLASSPATH" >&5
13223 12956
13224 ac_java_classpath=$saved_ac_java_classpath 12957$as_echo "#define WITH_GUI /**/" >>confdefs.h
13225 12958
13226 12959
13227 fi
13228 fi 12960 fi
13229 else
13230 echo "configure: failed program was:" >&5
13231 cat conftest.java >&5
13232 echo "configure: CLASSPATH was $CLASSPATH" >&5
13233
13234 ac_java_classpath=$saved_ac_java_classpath
13235
13236
13237 fi
13238
13239 fi
13240 done
13241 # If ls returns several results and the first one is OK, stop the search
13242 if test "$found_jar" = "yes"; then
13243 break
13244 fi
13245 done
13246 # If found, no need to search in other directory
13247 if test "$found_jar" = "yes"; then
13248 break
13249 fi
13250 done
13251 if test "$found_jar" = "no"; then
13252 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13253$as_echo "no" >&6; }
13254 if test ""yes"" = "yes"; then
13255 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar testng used by TestNG - Unit tests (looking for package org.testng.TestNG)" >&5
13256$as_echo "$as_me: WARNING: Could not find or use the Java package/jar testng used by TestNG - Unit tests (looking for package org.testng.TestNG)" >&2;}
13257 else
13258 as_fn_error "Could not find or use the Java package/jar testng used by TestNG - Unit tests (looking for package org.testng.TestNG)" "$LINENO" 5
13259 fi
13260 fi
13261
13262 TESTNG=$PACKAGE_JAR_FILE
13263 12961
12962 # Checkstyle (code checking)
13264 12963
13265 # Qdox (parses declarations and Javadoc) - dependency of TestNG 12964 { $as_echo "$as_me:${as_lineno-$LINENO}: checking checkstyle" >&5
13266 12965$as_echo_n "checking checkstyle... " >&6; }
13267 { $as_echo "$as_me:${as_lineno-$LINENO}: checking qdox" >&5
13268$as_echo_n "checking qdox... " >&6; }
13269 PACKAGE_JAR_FILE= 12966 PACKAGE_JAR_FILE=
13270 found_jar=no 12967 found_jar=no
13271 saved_ac_java_classpath=$ac_java_classpath 12968 saved_ac_java_classpath=$ac_java_classpath
13272 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)" 12969 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)"
13273 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do 12970 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
13274 for jar in "$jardir/qdox.jar" "$jardir/libqdox.jar" "$jardir/libqdox-java.jar" "$jardir/qdox*.jar"; do 12971 for jar in "$jardir/checkstyle.jar" "$jardir/libcheckstyle.jar" "$jardir/libcheckstyle-java.jar" "$jardir/checkstyle*.jar"; do
13275# jar=`echo $jar|sed -e 's/ /\\ /'` 12972# jar=`echo $jar|sed -e 's/ /\\ /'`
13276# echo "protected $jar" 12973# echo "protected $jar"
13277# jar_resolved=`ls $jar 2>/dev/null` 12974# jar_resolved=`ls $jar 2>/dev/null`
@@ -13283,8 +12980,8 @@ $as_echo_n "checking qdox... " >&6; }
13283 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12980 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13284 12981
13285 cat << \EOF > conftest.java 12982 cat << \EOF > conftest.java
13286// #line 13286 "configure" 12983// #line 12983 "configure"
13287import com.thoughtworks.qdox.tools.QDoxTester; 12984import com.puppycrawl.tools.checkstyle.CheckStyleTask;
13288 12985
13289public class conftest { 12986public class conftest {
13290 public static void main(String[] argv) { 12987 public static void main(String[] argv) {
@@ -13353,26 +13050,26 @@ $as_echo "$jar_resolved" >&6; }
13353 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 13050 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13354$as_echo "no" >&6; } 13051$as_echo "no" >&6; }
13355 if test ""yes"" = "yes"; then 13052 if test ""yes"" = "yes"; then
13356 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar qdox used by Parses declarations and Javadoc (looking for package com.thoughtworks.qdox.tools.QDoxTester)" >&5 13053 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar checkstyle used by Checkstyle - code checking (looking for package com.puppycrawl.tools.checkstyle.CheckStyleTask)" >&5
13357$as_echo "$as_me: WARNING: Could not find or use the Java package/jar qdox used by Parses declarations and Javadoc (looking for package com.thoughtworks.qdox.tools.QDoxTester)" >&2;} 13054$as_echo "$as_me: WARNING: Could not find or use the Java package/jar checkstyle used by Checkstyle - code checking (looking for package com.puppycrawl.tools.checkstyle.CheckStyleTask)" >&2;}
13358 else 13055 else
13359 as_fn_error "Could not find or use the Java package/jar qdox used by Parses declarations and Javadoc (looking for package com.thoughtworks.qdox.tools.QDoxTester)" "$LINENO" 5 13056 as_fn_error "Could not find or use the Java package/jar checkstyle used by Checkstyle - code checking (looking for package com.puppycrawl.tools.checkstyle.CheckStyleTask)" "$LINENO" 5
13360 fi 13057 fi
13361 fi 13058 fi
13362 13059
13363 QDOX=$PACKAGE_JAR_FILE 13060 CHECKSTYLE=$PACKAGE_JAR_FILE
13364 13061
13365 13062
13366 # bsh (Java scripting environment) - dependency of TestNG 13063 # Commons beanutils (dependency of checkstyle)
13367 13064
13368 { $as_echo "$as_me:${as_lineno-$LINENO}: checking bsh" >&5 13065 { $as_echo "$as_me:${as_lineno-$LINENO}: checking commons-beanutils" >&5
13369$as_echo_n "checking bsh... " >&6; } 13066$as_echo_n "checking commons-beanutils... " >&6; }
13370 PACKAGE_JAR_FILE= 13067 PACKAGE_JAR_FILE=
13371 found_jar=no 13068 found_jar=no
13372 saved_ac_java_classpath=$ac_java_classpath 13069 saved_ac_java_classpath=$ac_java_classpath
13373 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)" 13070 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)"
13374 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do 13071 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
13375 for jar in "$jardir/bsh.jar" "$jardir/libbsh.jar" "$jardir/libbsh-java.jar" "$jardir/bsh*.jar"; do 13072 for jar in "$jardir/commons-beanutils.jar" "$jardir/libcommons-beanutils.jar" "$jardir/libcommons-beanutils-java.jar" "$jardir/commons-beanutils*.jar"; do
13376# jar=`echo $jar|sed -e 's/ /\\ /'` 13073# jar=`echo $jar|sed -e 's/ /\\ /'`
13377# echo "protected $jar" 13074# echo "protected $jar"
13378# jar_resolved=`ls $jar 2>/dev/null` 13075# jar_resolved=`ls $jar 2>/dev/null`
@@ -13384,8 +13081,8 @@ $as_echo_n "checking bsh... " >&6; }
13384 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13081 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13385 13082
13386 cat << \EOF > conftest.java 13083 cat << \EOF > conftest.java
13387// #line 13387 "configure" 13084// #line 13084 "configure"
13388import bsh.Console; 13085import org.apache.commons.beanutils.Converter;
13389 13086
13390public class conftest { 13087public class conftest {
13391 public static void main(String[] argv) { 13088 public static void main(String[] argv) {
@@ -13454,26 +13151,26 @@ $as_echo "$jar_resolved" >&6; }
13454 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 13151 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13455$as_echo "no" >&6; } 13152$as_echo "no" >&6; }
13456 if test ""yes"" = "yes"; then 13153 if test ""yes"" = "yes"; then
13457 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar bsh used by Java scripting environment (looking for package bsh.Console)" >&5 13154 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar commons-beanutils used by Bean utility (looking for package org.apache.commons.beanutils.Converter)" >&5
13458$as_echo "$as_me: WARNING: Could not find or use the Java package/jar bsh used by Java scripting environment (looking for package bsh.Console)" >&2;} 13155$as_echo "$as_me: WARNING: Could not find or use the Java package/jar commons-beanutils used by Bean utility (looking for package org.apache.commons.beanutils.Converter)" >&2;}
13459 else 13156 else
13460 as_fn_error "Could not find or use the Java package/jar bsh used by Java scripting environment (looking for package bsh.Console)" "$LINENO" 5 13157 as_fn_error "Could not find or use the Java package/jar commons-beanutils used by Bean utility (looking for package org.apache.commons.beanutils.Converter)" "$LINENO" 5
13461 fi 13158 fi
13462 fi 13159 fi
13463 13160
13464 BSH=$PACKAGE_JAR_FILE 13161 COMMONS_BEANUTILS=$PACKAGE_JAR_FILE
13465 13162
13466 13163
13467 # Junit - dependency of TestNG 13164 # antlr (dependency of checkstyle)
13468 13165
13469 { $as_echo "$as_me:${as_lineno-$LINENO}: checking junit" >&5 13166 { $as_echo "$as_me:${as_lineno-$LINENO}: checking antlr" >&5
13470$as_echo_n "checking junit... " >&6; } 13167$as_echo_n "checking antlr... " >&6; }
13471 PACKAGE_JAR_FILE= 13168 PACKAGE_JAR_FILE=
13472 found_jar=no 13169 found_jar=no
13473 saved_ac_java_classpath=$ac_java_classpath 13170 saved_ac_java_classpath=$ac_java_classpath
13474 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)" 13171 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)"
13475 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do 13172 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
13476 for jar in "$jardir/junit.jar" "$jardir/libjunit.jar" "$jardir/libjunit-java.jar" "$jardir/junit*.jar"; do 13173 for jar in "$jardir/antlr.jar" "$jardir/libantlr.jar" "$jardir/libantlr-java.jar" "$jardir/antlr*.jar"; do
13477# jar=`echo $jar|sed -e 's/ /\\ /'` 13174# jar=`echo $jar|sed -e 's/ /\\ /'`
13478# echo "protected $jar" 13175# echo "protected $jar"
13479# jar_resolved=`ls $jar 2>/dev/null` 13176# jar_resolved=`ls $jar 2>/dev/null`
@@ -13485,8 +13182,8 @@ $as_echo_n "checking junit... " >&6; }
13485 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13182 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13486 13183
13487 cat << \EOF > conftest.java 13184 cat << \EOF > conftest.java
13488// #line 13488 "configure" 13185// #line 13185 "configure"
13489import junit.framework.Assert; 13186import antlr.TokenStreamException;
13490 13187
13491public class conftest { 13188public class conftest {
13492 public static void main(String[] argv) { 13189 public static void main(String[] argv) {
@@ -13555,15 +13252,14 @@ $as_echo "$jar_resolved" >&6; }
13555 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 13252 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13556$as_echo "no" >&6; } 13253$as_echo "no" >&6; }
13557 if test ""yes"" = "yes"; then 13254 if test ""yes"" = "yes"; then
13558 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar junit used by Unitary tests (looking for package junit.framework.Assert)" >&5 13255 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar antlr used by language tool for constructing recognizers (looking for package antlr.TokenStreamException)" >&5
13559$as_echo "$as_me: WARNING: Could not find or use the Java package/jar junit used by Unitary tests (looking for package junit.framework.Assert)" >&2;} 13256$as_echo "$as_me: WARNING: Could not find or use the Java package/jar antlr used by language tool for constructing recognizers (looking for package antlr.TokenStreamException)" >&2;}
13560 else 13257 else
13561 as_fn_error "Could not find or use the Java package/jar junit used by Unitary tests (looking for package junit.framework.Assert)" "$LINENO" 5 13258 as_fn_error "Could not find or use the Java package/jar antlr used by language tool for constructing recognizers (looking for package antlr.TokenStreamException)" "$LINENO" 5
13562 fi 13259 fi
13563 fi 13260 fi
13564 13261
13565 JUNIT=$PACKAGE_JAR_FILE 13262 ANTLR=$PACKAGE_JAR_FILE
13566
13567 13263
13568 13264
13569 else 13265 else
@@ -14045,10 +13741,145 @@ fi
14045done 13741done
14046 13742
14047 13743
13744
13745# Check of the libm (lib math). Macro provided by libtool.
13746save_LDFLAGS="$LIBS"
13747LIBM=
13748case $host in
13749*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
13750 # These system don't have libm, or don't need it
13751 ;;
13752*-ncr-sysv4.3*)
13753 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _mwvalidcheckl in -lmw" >&5
13754$as_echo_n "checking for _mwvalidcheckl in -lmw... " >&6; }
13755if test "${ac_cv_lib_mw__mwvalidcheckl+set}" = set; then :
13756 $as_echo_n "(cached) " >&6
13757else
13758 ac_check_lib_save_LIBS=$LIBS
13759LIBS="-lmw $LIBS"
13760cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13761/* end confdefs.h. */
13762
13763/* Override any GCC internal prototype to avoid an error.
13764 Use char because int might match the return type of a GCC
13765 builtin and then its argument prototype would still apply. */
13766#ifdef __cplusplus
13767extern "C"
13768#endif
13769char _mwvalidcheckl ();
13770int
13771main ()
13772{
13773return _mwvalidcheckl ();
13774 ;
13775 return 0;
13776}
13777_ACEOF
13778if ac_fn_c_try_link "$LINENO"; then :
13779 ac_cv_lib_mw__mwvalidcheckl=yes
13780else
13781 ac_cv_lib_mw__mwvalidcheckl=no
13782fi
13783rm -f core conftest.err conftest.$ac_objext \
13784 conftest$ac_exeext conftest.$ac_ext
13785LIBS=$ac_check_lib_save_LIBS
13786fi
13787{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mw__mwvalidcheckl" >&5
13788$as_echo "$ac_cv_lib_mw__mwvalidcheckl" >&6; }
13789if test "x$ac_cv_lib_mw__mwvalidcheckl" = x""yes; then :
13790 LIBM="-lmw"
13791fi
13792
13793 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
13794$as_echo_n "checking for cos in -lm... " >&6; }
13795if test "${ac_cv_lib_m_cos+set}" = set; then :
13796 $as_echo_n "(cached) " >&6
13797else
13798 ac_check_lib_save_LIBS=$LIBS
13799LIBS="-lm $LIBS"
13800cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13801/* end confdefs.h. */
13802
13803/* Override any GCC internal prototype to avoid an error.
13804 Use char because int might match the return type of a GCC
13805 builtin and then its argument prototype would still apply. */
13806#ifdef __cplusplus
13807extern "C"
13808#endif
13809char cos ();
13810int
13811main ()
13812{
13813return cos ();
13814 ;
13815 return 0;
13816}
13817_ACEOF
13818if ac_fn_c_try_link "$LINENO"; then :
13819 ac_cv_lib_m_cos=yes
13820else
13821 ac_cv_lib_m_cos=no
13822fi
13823rm -f core conftest.err conftest.$ac_objext \
13824 conftest$ac_exeext conftest.$ac_ext
13825LIBS=$ac_check_lib_save_LIBS
13826fi
13827{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
13828$as_echo "$ac_cv_lib_m_cos" >&6; }
13829if test "x$ac_cv_lib_m_cos" = x""yes; then :
13830 LIBM="$LIBM -lm"
13831fi
13832
13833 ;;
13834*)
13835 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
13836$as_echo_n "checking for cos in -lm... " >&6; }
13837if test "${ac_cv_lib_m_cos+set}" = set; then :
13838 $as_echo_n "(cached) " >&6
13839else
13840 ac_check_lib_save_LIBS=$LIBS
13841LIBS="-lm $LIBS"
13842cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13843/* end confdefs.h. */
13844
13845/* Override any GCC internal prototype to avoid an error.
13846 Use char because int might match the return type of a GCC
13847 builtin and then its argument prototype would still apply. */
13848#ifdef __cplusplus
13849extern "C"
13850#endif
13851char cos ();
13852int
13853main ()
13854{
13855return cos ();
13856 ;
13857 return 0;
13858}
13859_ACEOF
13860if ac_fn_c_try_link "$LINENO"; then :
13861 ac_cv_lib_m_cos=yes
13862else
13863 ac_cv_lib_m_cos=no
13864fi
13865rm -f core conftest.err conftest.$ac_objext \
13866 conftest$ac_exeext conftest.$ac_ext
13867LIBS=$ac_check_lib_save_LIBS
13868fi
13869{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
13870$as_echo "$ac_cv_lib_m_cos" >&6; }
13871if test "x$ac_cv_lib_m_cos" = x""yes; then :
13872 LIBM="-lm"
13873fi
13874
13875 ;;
13876esac
13877
13878
13879
14048# Provided by math.h 13880# Provided by math.h
14049save_LDFLAGS="$LDFLAGS"
14050LDFLAGS="$LDFLAGS -lm"
14051 13881
13882LDFLAGS="$LDFLAGS $LIBM"
14052for ac_func in pow sqrt finite floor 13883for ac_func in pow sqrt finite floor
14053do : 13884do :
14054 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 13885 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -14091,8 +13922,8 @@ $as_echo "#define isinf(x) (!finite(x) && x==x)" >>confdefs.h
14091 13922
14092fi 13923fi
14093 13924
14094 13925LIBS="$LIBS $LIBM"
14095LDFLAGS="$save_LDFLAGS" 13926LDFLAGS="$save_LIBS"
14096 13927
14097# Provided by regex.h 13928# Provided by regex.h
14098for ac_func in re_comp 13929for ac_func in re_comp
@@ -21539,7 +21370,7 @@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_PATH"
21539{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5 21370{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
21540$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; } 21371$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
21541cat > conftest.$ac_ext <<EOF 21372cat > conftest.$ac_ext <<EOF
21542#line 21542 "configure" 21373#line 21373 "configure"
21543#include "confdefs.h" 21374#include "confdefs.h"
21544 21375
21545#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME" 21376#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@ -21851,7 +21682,7 @@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CHK_TK_INCLUDE_PATH $X_CFLAGS"
21851$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; } 21682$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
21852 21683
21853cat > conftest.$ac_ext <<EOF 21684cat > conftest.$ac_ext <<EOF
21854#line 21854 "configure" 21685#line 21685 "configure"
21855#include "confdefs.h" 21686#include "confdefs.h"
21856 21687
21857#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME" 21688#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@ -22433,7 +22264,7 @@ $as_echo_n "checking batik-all... " >&6; }
22433 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 22264 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
22434 22265
22435 cat << \EOF > conftest.java 22266 cat << \EOF > conftest.java
22436// #line 22436 "configure" 22267// #line 22267 "configure"
22437import org.apache.batik.parser.Parser; 22268import org.apache.batik.parser.Parser;
22438 22269
22439public class conftest { 22270public class conftest {
@@ -22534,7 +22365,7 @@ $as_echo_n "checking batik... " >&6; }
22534 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 22365 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
22535 22366
22536 cat << \EOF > conftest.java 22367 cat << \EOF > conftest.java
22537// #line 22537 "configure" 22368// #line 22368 "configure"
22538import org.apache.batik.parser.Parser; 22369import org.apache.batik.parser.Parser;
22539 22370
22540public class conftest { 22371public class conftest {
@@ -22637,7 +22468,7 @@ $as_echo_n "checking saxon... " >&6; }
22637 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 22468 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
22638 22469
22639 cat << \EOF > conftest.java 22470 cat << \EOF > conftest.java
22640// #line 22640 "configure" 22471// #line 22471 "configure"
22641import com.icl.saxon.Loader; 22472import com.icl.saxon.Loader;
22642 22473
22643public class conftest { 22474public class conftest {
@@ -22738,7 +22569,7 @@ $as_echo_n "checking fop... " >&6; }
22738 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 22569 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
22739 22570
22740 cat << \EOF > conftest.java 22571 cat << \EOF > conftest.java
22741// #line 22741 "configure" 22572// #line 22572 "configure"
22742import org.apache.fop.pdf.PDFInfo; 22573import org.apache.fop.pdf.PDFInfo;
22743 22574
22744public class conftest { 22575public class conftest {
@@ -22818,107 +22649,6 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar fop used b
22818 FOP=$PACKAGE_JAR_FILE 22649 FOP=$PACKAGE_JAR_FILE
22819 22650
22820 22651
22821 # MathML rendering solution
22822
22823 { $as_echo "$as_me:${as_lineno-$LINENO}: checking jeuclid-core" >&5
22824$as_echo_n "checking jeuclid-core... " >&6; }
22825 PACKAGE_JAR_FILE=
22826 found_jar=no
22827 saved_ac_java_classpath=$ac_java_classpath
22828 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)"
22829 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
22830 for jar in "$jardir/jeuclid-core.jar" "$jardir/libjeuclid-core.jar" "$jardir/libjeuclid-core-java.jar" "$jardir/jeuclid-core*.jar"; do
22831# jar=`echo $jar|sed -e 's/ /\\ /'`
22832# echo "protected $jar"
22833# jar_resolved=`ls $jar 2>/dev/null`
22834# echo "looking for $jar_resolved"
22835# TODO check the behaviour when spaces
22836 jars_resolved=`ls $jar 2>/dev/null`
22837 for jar_resolved in $jars_resolved; do # If several jars matches
22838 if test -e "$jar_resolved"; then
22839 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
22840
22841 cat << \EOF > conftest.java
22842// #line 22842 "configure"
22843import net.sourceforge.jeuclid.LayoutContext;
22844
22845public class conftest {
22846 public static void main(String[] argv) {
22847
22848 }
22849}
22850EOF
22851
22852 CLASSPATH=$ac_java_classpath
22853 export CLASSPATH
22854 cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
22855 if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
22856 if test ""no"" = "no"; then
22857 echo "yes" >&5
22858
22859 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
22860$as_echo "$jar_resolved" >&6; }
22861 found_jar=yes
22862 PACKAGE_JAR_FILE=$jar_resolved
22863 break
22864
22865 else
22866 cmd="$JAVA conftest"
22867 if (echo $cmd >&5 ; eval $cmd >&5 2>&5); then
22868 echo "yes" >&5
22869
22870 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
22871$as_echo "$jar_resolved" >&6; }
22872 found_jar=yes
22873 PACKAGE_JAR_FILE=$jar_resolved
22874 break
22875
22876 else
22877 echo "configure: failed program was:" >&5
22878 cat conftest.java >&5
22879 echo "configure: CLASSPATH was $CLASSPATH" >&5
22880
22881 ac_java_classpath=$saved_ac_java_classpath
22882
22883
22884 fi
22885 fi
22886 else
22887 echo "configure: failed program was:" >&5
22888 cat conftest.java >&5
22889 echo "configure: CLASSPATH was $CLASSPATH" >&5
22890
22891 ac_java_classpath=$saved_ac_java_classpath
22892
22893
22894 fi
22895
22896 fi
22897 done
22898 # If ls returns several results and the first one is OK, stop the search
22899 if test "$found_jar" = "yes"; then
22900 break
22901 fi
22902 done
22903 # If found, no need to search in other directory
22904 if test "$found_jar" = "yes"; then
22905 break
22906 fi
22907 done
22908 if test "$found_jar" = "no"; then
22909 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
22910$as_echo "no" >&6; }
22911 if test "" = "yes"; then
22912 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jeuclid-core used by MathML rendering solution (at least version 3.1.X) (looking for package net.sourceforge.jeuclid.LayoutContext)" >&5
22913$as_echo "$as_me: WARNING: Could not find or use the Java package/jar jeuclid-core used by MathML rendering solution (at least version 3.1.X) (looking for package net.sourceforge.jeuclid.LayoutContext)" >&2;}
22914 else
22915 as_fn_error "Could not find or use the Java package/jar jeuclid-core used by MathML rendering solution (at least version 3.1.X) (looking for package net.sourceforge.jeuclid.LayoutContext)" "$LINENO" 5
22916 fi
22917 fi
22918
22919 JEUCLID_CORE=$PACKAGE_JAR_FILE
22920
22921
22922 # Commons I/O library 22652 # Commons I/O library
22923 22653
22924 { $as_echo "$as_me:${as_lineno-$LINENO}: checking commons-io" >&5 22654 { $as_echo "$as_me:${as_lineno-$LINENO}: checking commons-io" >&5
@@ -22940,7 +22670,7 @@ $as_echo_n "checking commons-io... " >&6; }
22940 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 22670 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
22941 22671
22942 cat << \EOF > conftest.java 22672 cat << \EOF > conftest.java
22943// #line 22943 "configure" 22673// #line 22673 "configure"
22944import org.apache.commons.io.output.CountingOutputStream; 22674import org.apache.commons.io.output.CountingOutputStream;
22945 22675
22946public class conftest { 22676public class conftest {
@@ -23041,7 +22771,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
23041 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 22771 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
23042 22772
23043 cat << \EOF > conftest.java 22773 cat << \EOF > conftest.java
23044// #line 23044 "configure" 22774// #line 22774 "configure"
23045import org.apache.xmlgraphics.util.Service; 22775import org.apache.xmlgraphics.util.Service;
23046 22776
23047public class conftest { 22777public class conftest {
@@ -23142,7 +22872,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
23142 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 22872 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
23143 22873
23144 cat << \EOF > conftest.java 22874 cat << \EOF > conftest.java
23145// #line 23145 "configure" 22875// #line 22875 "configure"
23146import org.w3c.dom.svg.SVGDocument; 22876import org.w3c.dom.svg.SVGDocument;
23147 22877
23148public class conftest { 22878public class conftest {
@@ -23243,7 +22973,7 @@ $as_echo_n "checking xml-commons-apis-ext... " >&6; }
23243 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 22973 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
23244 22974
23245 cat << \EOF > conftest.java 22975 cat << \EOF > conftest.java
23246// #line 23246 "configure" 22976// #line 22976 "configure"
23247import org.w3c.dom.svg.SVGDocument; 22977import org.w3c.dom.svg.SVGDocument;
23248 22978
23249public class conftest { 22979public class conftest {
@@ -23348,7 +23078,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
23348 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 23078 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
23349 23079
23350 cat << \EOF > conftest.java 23080 cat << \EOF > conftest.java
23351// #line 23351 "configure" 23081// #line 23081 "configure"
23352import org.apache.avalon.framework.configuration.ConfigurationException; 23082import org.apache.avalon.framework.configuration.ConfigurationException;
23353 23083
23354public class conftest { 23084public class conftest {
@@ -29619,7 +29349,7 @@ else
29619 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 29349 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
29620 lt_status=$lt_dlunknown 29350 lt_status=$lt_dlunknown
29621 cat > conftest.$ac_ext <<_LT_EOF 29351 cat > conftest.$ac_ext <<_LT_EOF
29622#line 29622 "configure" 29352#line 29352 "configure"
29623#include "confdefs.h" 29353#include "confdefs.h"
29624 29354
29625#if HAVE_DLFCN_H 29355#if HAVE_DLFCN_H
@@ -29725,7 +29455,7 @@ else
29725 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 29455 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
29726 lt_status=$lt_dlunknown 29456 lt_status=$lt_dlunknown
29727 cat > conftest.$ac_ext <<_LT_EOF 29457 cat > conftest.$ac_ext <<_LT_EOF
29728#line 29728 "configure" 29458#line 29458 "configure"
29729#include "confdefs.h" 29459#include "confdefs.h"
29730 29460
29731#if HAVE_DLFCN_H 29461#if HAVE_DLFCN_H
@@ -39122,7 +38852,6 @@ if test $HELP_ENABLE = yes; then
39122 echo " Batik (SVG) ............ = $BATIK" 38852 echo " Batik (SVG) ............ = $BATIK"
39123 echo " Saxon XSLT ............. = $SAXON" 38853 echo " Saxon XSLT ............. = $SAXON"
39124 echo " FOP (XML => PDF) ....... = $FOP" 38854 echo " FOP (XML => PDF) ....... = $FOP"
39125 echo " Jeuclid (MathML) ....... = $JEUCLID_CORE"
39126 echo " Commons I/O ............ = $COMMONS_IO" 38855 echo " Commons I/O ............ = $COMMONS_IO"
39127 echo " XML graphics commons ... = $XMLGRAPHICS_COMMONS" 38856 echo " XML graphics commons ... = $XMLGRAPHICS_COMMONS"
39128 echo " XML commons external ... = $XML_APIS_EXT" 38857 echo " XML commons external ... = $XML_APIS_EXT"
@@ -39157,6 +38886,7 @@ echo " JOGL ................ = $JOGL"
39157echo " JOGL LIBS (JNI) ..... = $JOGL_LIBS" 38886echo " JOGL LIBS (JNI) ..... = $JOGL_LIBS"
39158echo " Gluegen ............. = $GLUEGEN_RT" 38887echo " Gluegen ............. = $GLUEGEN_RT"
39159echo " Gluegen LIBS (JNI) .. = $GLUEGEN_RT_LIBS" 38888echo " Gluegen LIBS (JNI) .. = $GLUEGEN_RT_LIBS"
38889echo " Jeuclid (MathML) .... = $JEUCLID_CORE"
39160echo " Jhall .............. = $JHALL" 38890echo " Jhall .............. = $JHALL"
39161echo " Jrosetta (API) ...... = $JROSETTA_API" 38891echo " Jrosetta (API) ...... = $JROSETTA_API"
39162echo " Jrosetta (Engine) ... = $JROSETTA_ENGINE" 38892echo " Jrosetta (Engine) ... = $JROSETTA_ENGINE"
@@ -39170,7 +38900,6 @@ echo "Code quality (optional):"
39170echo " Checkstyle .......... = $CHECKSTYLE" 38900echo " Checkstyle .......... = $CHECKSTYLE"
39171echo " Commons-beanutils ... = $COMMONS_BEANUTILS" 38901echo " Commons-beanutils ... = $COMMONS_BEANUTILS"
39172echo " Antlr ............... = $ANTLR" 38902echo " Antlr ............... = $ANTLR"
39173echo " TestNG .............. = $TESTNG"
39174echo " splint .............. = $SPLINT" 38903echo " splint .............. = $SPLINT"
39175 38904
39176echo "" 38905echo ""
diff --git a/scilab/configure.ac b/scilab/configure.ac
index 98d97e8..cfca03e 100644
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -749,6 +749,14 @@ if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no
749 JROSETTA_ENGINE=$PACKAGE_JAR_FILE 749 JROSETTA_ENGINE=$PACKAGE_JAR_FILE
750 AC_SUBST(JROSETTA_ENGINE) 750 AC_SUBST(JROSETTA_ENGINE)
751 751
752
753 # MathML rendering solution
754 # Used in both graphic & help
755 AC_JAVA_CHECK_PACKAGE([jeuclid-core],[net.sourceforge.jeuclid.LayoutContext],[MathML rendering solution (at least version 3.1.X)])
756 JEUCLID_CORE=$PACKAGE_JAR_FILE
757 AC_SUBST(JEUCLID_CORE)
758
759
752 if test $HDF5_ENABLE = yes; then 760 if test $HDF5_ENABLE = yes; then
753 # HDF5 java lib 761 # HDF5 java lib
754 AC_JAVA_CHECK_PACKAGE([jhdf5],[ncsa.hdf.hdf5lib.HDF5Constants],[HDF5 Java library]) 762 AC_JAVA_CHECK_PACKAGE([jhdf5],[ncsa.hdf.hdf5lib.HDF5Constants],[HDF5 Java library])
@@ -911,10 +919,14 @@ AC_CHECK_FUNCS([mkdir])
911# Provided by mman.h 919# Provided by mman.h
912AC_CHECK_FUNCS([munmap]) 920AC_CHECK_FUNCS([munmap])
913 921
922
923# Check of the libm (lib math). Macro provided by libtool.
924save_LDFLAGS="$LIBS"
925LT_LIB_M()
926
914# Provided by math.h 927# Provided by math.h
915save_LDFLAGS="$LDFLAGS"
916LDFLAGS="$LDFLAGS -lm"
917 928
929LDFLAGS="$LDFLAGS $LIBM"
918AC_CHECK_FUNCS([pow] [sqrt] [finite] [floor]) 930AC_CHECK_FUNCS([pow] [sqrt] [finite] [floor])
919 931
920AC_CHECK_FUNC([exp10],,[ 932AC_CHECK_FUNC([exp10],,[
@@ -927,8 +939,8 @@ AC_CHECK_FUNC([exp10],,[
927AC_CHECK_FUNC([isinf],,[ 939AC_CHECK_FUNC([isinf],,[
928 AC_DEFINE([isinf(x)],[(!finite(x) && x==x)],[Provide a macro to do isinf]) 940 AC_DEFINE([isinf(x)],[(!finite(x) && x==x)],[Provide a macro to do isinf])
929]) 941])
930 942LIBS="$LIBS $LIBM"
931LDFLAGS="$save_LDFLAGS" 943LDFLAGS="$save_LIBS"
932 944
933# Provided by regex.h 945# Provided by regex.h
934AC_CHECK_FUNCS([re_comp]) 946AC_CHECK_FUNCS([re_comp])
@@ -1789,7 +1801,6 @@ if test $HELP_ENABLE = yes; then
1789 echo " Batik (SVG) ............ = $BATIK" 1801 echo " Batik (SVG) ............ = $BATIK"
1790 echo " Saxon XSLT ............. = $SAXON" 1802 echo " Saxon XSLT ............. = $SAXON"
1791 echo " FOP (XML => PDF) ....... = $FOP" 1803 echo " FOP (XML => PDF) ....... = $FOP"
1792 echo " Jeuclid (MathML) ....... = $JEUCLID_CORE"
1793 echo " Commons I/O ............ = $COMMONS_IO" 1804 echo " Commons I/O ............ = $COMMONS_IO"
1794 echo " XML graphics commons ... = $XMLGRAPHICS_COMMONS" 1805 echo " XML graphics commons ... = $XMLGRAPHICS_COMMONS"
1795 echo " XML commons external ... = $XML_APIS_EXT" 1806 echo " XML commons external ... = $XML_APIS_EXT"
@@ -1824,6 +1835,7 @@ echo " JOGL ................ = $JOGL"
1824echo " JOGL LIBS (JNI) ..... = $JOGL_LIBS" 1835echo " JOGL LIBS (JNI) ..... = $JOGL_LIBS"
1825echo " Gluegen ............. = $GLUEGEN_RT" 1836echo " Gluegen ............. = $GLUEGEN_RT"
1826echo " Gluegen LIBS (JNI) .. = $GLUEGEN_RT_LIBS" 1837echo " Gluegen LIBS (JNI) .. = $GLUEGEN_RT_LIBS"
1838echo " Jeuclid (MathML) .... = $JEUCLID_CORE"
1827echo " Jhall .............. = $JHALL" 1839echo " Jhall .............. = $JHALL"
1828echo " Jrosetta (API) ...... = $JROSETTA_API" 1840echo " Jrosetta (API) ...... = $JROSETTA_API"
1829echo " Jrosetta (Engine) ... = $JROSETTA_ENGINE" 1841echo " Jrosetta (Engine) ... = $JROSETTA_ENGINE"
diff --git a/scilab/contrib/Makefile.in b/scilab/contrib/Makefile.in
index 2243dd3..b2057be 100644
--- a/scilab/contrib/Makefile.in
+++ b/scilab/contrib/Makefile.in
@@ -158,6 +158,7 @@ LD = @LD@
158LDFLAGS = @LDFLAGS@ 158LDFLAGS = @LDFLAGS@
159LIBICONV = @LIBICONV@ 159LIBICONV = @LIBICONV@
160LIBINTL = @LIBINTL@ 160LIBINTL = @LIBINTL@
161LIBM = @LIBM@
161LIBOBJS = @LIBOBJS@ 162LIBOBJS = @LIBOBJS@
162LIBS = @LIBS@ 163LIBS = @LIBS@
163LIBTOOL = @LIBTOOL@ 164LIBTOOL = @LIBTOOL@
diff --git a/scilab/libs/MALLOC/Makefile.in b/scilab/libs/MALLOC/Makefile.in
index 6b3f5a0..a589263 100644
--- a/scilab/libs/MALLOC/Makefile.in
+++ b/scilab/libs/MALLOC/Makefile.in
@@ -224,6 +224,7 @@ LD = @LD@
224LDFLAGS = @LDFLAGS@ 224LDFLAGS = @LDFLAGS@
225LIBICONV = @LIBICONV@ 225LIBICONV = @LIBICONV@
226LIBINTL = @LIBINTL@ 226LIBINTL = @LIBINTL@
227LIBM = @LIBM@
227LIBOBJS = @LIBOBJS@ 228LIBOBJS = @LIBOBJS@
228LIBS = @LIBS@ 229LIBS = @LIBS@
229LIBTOOL = @LIBTOOL@ 230LIBTOOL = @LIBTOOL@
diff --git a/scilab/libs/Makefile.in b/scilab/libs/Makefile.in
index 6d6f573..b00175a 100644
--- a/scilab/libs/Makefile.in
+++ b/scilab/libs/Makefile.in
@@ -196,6 +196,7 @@ LD = @LD@
196LDFLAGS = @LDFLAGS@ 196LDFLAGS = @LDFLAGS@
197LIBICONV = @LIBICONV@ 197LIBICONV = @LIBICONV@
198LIBINTL = @LIBINTL@ 198LIBINTL = @LIBINTL@
199LIBM = @LIBM@
199LIBOBJS = @LIBOBJS@ 200LIBOBJS = @LIBOBJS@
200LIBS = @LIBS@ 201LIBS = @LIBS@
201LIBTOOL = @LIBTOOL@ 202LIBTOOL = @LIBTOOL@
diff --git a/scilab/libs/doublylinkedlist/Makefile.in b/scilab/libs/doublylinkedlist/Makefile.in
index 0a4cd33..9e32496 100644
--- a/scilab/libs/doublylinkedlist/Makefile.in
+++ b/scilab/libs/doublylinkedlist/Makefile.in
@@ -226,6 +226,7 @@ LD = @LD@
226LDFLAGS = @LDFLAGS@ 226LDFLAGS = @LDFLAGS@
227LIBICONV = @LIBICONV@ 227LIBICONV = @LIBICONV@
228LIBINTL = @LIBINTL@ 228LIBINTL = @LIBINTL@
229LIBM = @LIBM@
229LIBOBJS = @LIBOBJS@ 230LIBOBJS = @LIBOBJS@
230LIBS = @LIBS@ 231LIBS = @LIBS@
231LIBTOOL = @LIBTOOL@ 232LIBTOOL = @LIBTOOL@
diff --git a/scilab/libs/dynamiclibrary/Makefile.in b/scilab/libs/dynamiclibrary/Makefile.in
index 91f15bc0..819b487 100644
--- a/scilab/libs/dynamiclibrary/Makefile.in
+++ b/scilab/libs/dynamiclibrary/Makefile.in
@@ -226,6 +226,7 @@ LD = @LD@
226LDFLAGS = @LDFLAGS@ 226LDFLAGS = @LDFLAGS@
227LIBICONV = @LIBICONV@ 227LIBICONV = @LIBICONV@
228LIBINTL = @LIBINTL@ 228LIBINTL = @LIBINTL@
229LIBM = @LIBM@
229LIBOBJS = @LIBOBJS@ 230LIBOBJS = @LIBOBJS@
230LIBS = @LIBS@ 231LIBS = @LIBS@
231LIBTOOL = @LIBTOOL@ 232LIBTOOL = @LIBTOOL@
diff --git a/scilab/libs/hashtable/Makefile.in b/scilab/libs/hashtable/Makefile.in
index b1c4111..f690778 100644
--- a/scilab/libs/hashtable/Makefile.in
+++ b/scilab/libs/hashtable/Makefile.in
@@ -224,6 +224,7 @@ LD = @LD@
224LDFLAGS = @LDFLAGS@ 224LDFLAGS = @LDFLAGS@
225LIBICONV = @LIBICONV@ 225LIBICONV = @LIBICONV@
226LIBINTL = @LIBINTL@ 226LIBINTL = @LIBINTL@
227LIBM = @LIBM@
227LIBOBJS = @LIBOBJS@ 228LIBOBJS = @LIBOBJS@
228LIBS = @LIBS@ 229LIBS = @LIBS@
229LIBTOOL = @LIBTOOL@ 230LIBTOOL = @LIBTOOL@
diff --git a/scilab/libs/libst/Makefile.in b/scilab/libs/libst/Makefile.in
index 866df66..fc421cb 100644
--- a/scilab/libs/libst/Makefile.in
+++ b/scilab/libs/libst/Makefile.in
@@ -220,6 +220,7 @@ LD = @LD@
220LDFLAGS = @LDFLAGS@ 220LDFLAGS = @LDFLAGS@
221LIBICONV = @LIBICONV@ 221LIBICONV = @LIBICONV@
222LIBINTL = @LIBINTL@ 222LIBINTL = @LIBINTL@
223LIBM = @LIBM@
223LIBOBJS = @LIBOBJS@ 224LIBOBJS = @LIBOBJS@
224LIBS = @LIBS@ 225LIBS = @LIBS@
225LIBTOOL = @LIBTOOL@ 226LIBTOOL = @LIBTOOL@
diff --git a/scilab/m4/docbook.m4 b/scilab/m4/docbook.m4
index e017774..7fbbcca 100644
--- a/scilab/m4/docbook.m4
+++ b/scilab/m4/docbook.m4
@@ -54,11 +54,6 @@ AC_ARG_WITH(docbook,
54 FOP=$PACKAGE_JAR_FILE 54 FOP=$PACKAGE_JAR_FILE
55 AC_SUBST(FOP) 55 AC_SUBST(FOP)
56 56
57 # MathML rendering solution
58 AC_JAVA_CHECK_PACKAGE([jeuclid-core],[net.sourceforge.jeuclid.LayoutContext],[MathML rendering solution (at least version 3.1.X)])
59 JEUCLID_CORE=$PACKAGE_JAR_FILE
60 AC_SUBST(JEUCLID_CORE)
61
62 # Commons I/O library 57 # Commons I/O library
63 AC_JAVA_CHECK_PACKAGE([commons-io],[org.apache.commons.io.output.CountingOutputStream],[Commons I/O library]) 58 AC_JAVA_CHECK_PACKAGE([commons-io],[org.apache.commons.io.output.CountingOutputStream],[Commons I/O library])
64 COMMONS_IO=$PACKAGE_JAR_FILE 59 COMMONS_IO=$PACKAGE_JAR_FILE
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index 67c1d96..92f0882 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -282,6 +282,7 @@ LD = @LD@
282LDFLAGS = @LDFLAGS@ 282LDFLAGS = @LDFLAGS@
283LIBICONV = @LIBICONV@ 283LIBICONV = @LIBICONV@
284LIBINTL = @LIBINTL@ 284LIBINTL = @LIBINTL@
285LIBM = @LIBM@
285LIBOBJS = @LIBOBJS@ 286LIBOBJS = @LIBOBJS@
286LIBS = @LIBS@ 287LIBS = @LIBS@
287LIBTOOL = @LIBTOOL@ 288LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/action_binding/Makefile.in b/scilab/modules/action_binding/Makefile.in
index 1e3da63..163ff0a 100644
--- a/scilab/modules/action_binding/Makefile.in
+++ b/scilab/modules/action_binding/Makefile.in
@@ -247,6 +247,7 @@ LD = @LD@
247LDFLAGS = @LDFLAGS@ 247LDFLAGS = @LDFLAGS@
248LIBICONV = @LIBICONV@ 248LIBICONV = @LIBICONV@
249LIBINTL = @LIBINTL@ 249LIBINTL = @LIBINTL@
250LIBM = @LIBM@
250LIBOBJS = @LIBOBJS@ 251LIBOBJS = @LIBOBJS@
251LIBS = @LIBS@ 252LIBS = @LIBS@
252LIBTOOL = @LIBTOOL@ 253LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/api_scilab/Makefile.in b/scilab/modules/api_scilab/Makefile.in
index c8912dc..e3d3268 100644
--- a/scilab/modules/api_scilab/Makefile.in
+++ b/scilab/modules/api_scilab/Makefile.in
@@ -241,6 +241,7 @@ LD = @LD@
241LDFLAGS = @LDFLAGS@ 241LDFLAGS = @LDFLAGS@
242LIBICONV = @LIBICONV@ 242LIBICONV = @LIBICONV@
243LIBINTL = @LIBINTL@ 243LIBINTL = @LIBINTL@
244LIBM = @LIBM@
244LIBOBJS = @LIBOBJS@ 245LIBOBJS = @LIBOBJS@
245LIBS = @LIBS@ 246LIBS = @LIBS@
246LIBTOOL = @LIBTOOL@ 247LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/arnoldi/Makefile.in b/scilab/modules/arnoldi/Makefile.in
index fc38387..d839ccb 100644
--- a/scilab/modules/arnoldi/Makefile.in
+++ b/scilab/modules/arnoldi/Makefile.in
@@ -263,6 +263,7 @@ LD = @LD@
263LDFLAGS = @LDFLAGS@ 263LDFLAGS = @LDFLAGS@
264LIBICONV = @LIBICONV@ 264LIBICONV = @LIBICONV@
265LIBINTL = @LIBINTL@ 265LIBINTL = @LIBINTL@
266LIBM = @LIBM@
266LIBOBJS = @LIBOBJS@ 267LIBOBJS = @LIBOBJS@
267LIBS = @LIBS@ 268LIBS = @LIBS@
268LIBTOOL = @LIBTOOL@ 269LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/atoms/Makefile.in b/scilab/modules/atoms/Makefile.in
index 51a666c..99de7ef 100644
--- a/scilab/modules/atoms/Makefile.in
+++ b/scilab/modules/atoms/Makefile.in
@@ -203,6 +203,7 @@ LD = @LD@
203LDFLAGS = @LDFLAGS@ 203LDFLAGS = @LDFLAGS@
204LIBICONV = @LIBICONV@ 204LIBICONV = @LIBICONV@
205LIBINTL = @LIBINTL@ 205LIBINTL = @LIBINTL@
206LIBM = @LIBM@
206LIBOBJS = @LIBOBJS@ 207LIBOBJS = @LIBOBJS@
207LIBS = @LIBS@ 208LIBS = @LIBS@
208LIBTOOL = @LIBTOOL@ 209LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/boolean/Makefile.in b/scilab/modules/boolean/Makefile.in
index a1dbb01..6a0dc7e 100644
--- a/scilab/modules/boolean/Makefile.in
+++ b/scilab/modules/boolean/Makefile.in
@@ -242,6 +242,7 @@ LD = @LD@
242LDFLAGS = @LDFLAGS@ 242LDFLAGS = @LDFLAGS@
243LIBICONV = @LIBICONV@ 243LIBICONV = @LIBICONV@
244LIBINTL = @LIBINTL@ 244LIBINTL = @LIBINTL@
245LIBM = @LIBM@
245LIBOBJS = @LIBOBJS@ 246LIBOBJS = @LIBOBJS@
246LIBS = @LIBS@ 247LIBS = @LIBS@
247LIBTOOL = @LIBTOOL@ 248LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/cacsd/Makefile.in b/scilab/modules/cacsd/Makefile.in
index 50c18fa..a15defb 100644
--- a/scilab/modules/cacsd/Makefile.in
+++ b/scilab/modules/cacsd/Makefile.in
@@ -337,6 +337,7 @@ LD = @LD@
337LDFLAGS = @LDFLAGS@ 337LDFLAGS = @LDFLAGS@
338LIBICONV = @LIBICONV@ 338LIBICONV = @LIBICONV@
339LIBINTL = @LIBINTL@ 339LIBINTL = @LIBINTL@
340LIBM = @LIBM@
340LIBOBJS = @LIBOBJS@ 341LIBOBJS = @LIBOBJS@
341LIBS = @LIBS@ 342LIBS = @LIBS@
342LIBTOOL = @LIBTOOL@ 343LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/call_scilab/Makefile.in b/scilab/modules/call_scilab/Makefile.in
index 522d64e..0c62abd 100644
--- a/scilab/modules/call_scilab/Makefile.in
+++ b/scilab/modules/call_scilab/Makefile.in
@@ -238,6 +238,7 @@ LD = @LD@
238LDFLAGS = @LDFLAGS@ 238LDFLAGS = @LDFLAGS@
239LIBICONV = @LIBICONV@ 239LIBICONV = @LIBICONV@
240LIBINTL = @LIBINTL@ 240LIBINTL = @LIBINTL@
241LIBM = @LIBM@
241LIBOBJS = @LIBOBJS@ 242LIBOBJS = @LIBOBJS@
242LIBS = @LIBS@ 243LIBS = @LIBS@
243LIBTOOL = @LIBTOOL@ 244LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/compatibility_functions/Makefile.in b/scilab/modules/compatibility_functions/Makefile.in
index 916059b..11ac5cf 100644
--- a/scilab/modules/compatibility_functions/Makefile.in
+++ b/scilab/modules/compatibility_functions/Makefile.in
@@ -202,6 +202,7 @@ LD = @LD@
202LDFLAGS = @LDFLAGS@ 202LDFLAGS = @LDFLAGS@
203LIBICONV = @LIBICONV@ 203LIBICONV = @LIBICONV@
204LIBINTL = @LIBINTL@ 204LIBINTL = @LIBINTL@
205LIBM = @LIBM@
205LIBOBJS = @LIBOBJS@ 206LIBOBJS = @LIBOBJS@
206LIBS = @LIBS@ 207LIBS = @LIBS@
207LIBTOOL = @LIBTOOL@ 208LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/completion/Makefile.in b/scilab/modules/completion/Makefile.in
index b25d471..94792ce 100644
--- a/scilab/modules/completion/Makefile.in
+++ b/scilab/modules/completion/Makefile.in
@@ -264,6 +264,7 @@ LD = @LD@
264LDFLAGS = @LDFLAGS@ 264LDFLAGS = @LDFLAGS@
265LIBICONV = @LIBICONV@ 265LIBICONV = @LIBICONV@
266LIBINTL = @LIBINTL@ 266LIBINTL = @LIBINTL@
267LIBM = @LIBM@
267LIBOBJS = @LIBOBJS@ 268LIBOBJS = @LIBOBJS@
268LIBS = @LIBS@ 269LIBS = @LIBS@
269LIBTOOL = @LIBTOOL@ 270LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/console/Makefile.in b/scilab/modules/console/Makefile.in
index 2c385d0..4a2e3d4 100644
--- a/scilab/modules/console/Makefile.in
+++ b/scilab/modules/console/Makefile.in
@@ -276,6 +276,7 @@ LD = @LD@
276LDFLAGS = @LDFLAGS@ 276LDFLAGS = @LDFLAGS@
277LIBICONV = @LIBICONV@ 277LIBICONV = @LIBICONV@
278LIBINTL = @LIBINTL@ 278LIBINTL = @LIBINTL@
279LIBM = @LIBM@
279LIBOBJS = @LIBOBJS@ 280LIBOBJS = @LIBOBJS@
280LIBS = @LIBS@ 281LIBS = @LIBS@
281LIBTOOL = @LIBTOOL@ 282LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/core/Makefile.in b/scilab/modules/core/Makefile.in
index e8d515a..c2471ef 100644
--- a/scilab/modules/core/Makefile.in
+++ b/scilab/modules/core/Makefile.in
@@ -475,6 +475,7 @@ LD = @LD@
475LDFLAGS = @LDFLAGS@ 475LDFLAGS = @LDFLAGS@
476LIBICONV = @LIBICONV@ 476LIBICONV = @LIBICONV@
477LIBINTL = @LIBINTL@ 477LIBINTL = @LIBINTL@
478LIBM = @LIBM@
478LIBOBJS = @LIBOBJS@ 479LIBOBJS = @LIBOBJS@
479LIBS = @LIBS@ 480LIBS = @LIBS@
480LIBTOOL = @LIBTOOL@ 481LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/data_structures/Makefile.in b/scilab/modules/data_structures/Makefile.in
index b1eb8e1..53fe905 100644
--- a/scilab/modules/data_structures/Makefile.in
+++ b/scilab/modules/data_structures/Makefile.in
@@ -273,6 +273,7 @@ LD = @LD@
273LDFLAGS = @LDFLAGS@ 273LDFLAGS = @LDFLAGS@
274LIBICONV = @LIBICONV@ 274LIBICONV = @LIBICONV@
275LIBINTL = @LIBINTL@ 275LIBINTL = @LIBINTL@
276LIBM = @LIBM@
276LIBOBJS = @LIBOBJS@ 277LIBOBJS = @LIBOBJS@
277LIBS = @LIBS@ 278LIBS = @LIBS@
278LIBTOOL = @LIBTOOL@ 279LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/demo_tools/Makefile.in b/scilab/modules/demo_tools/Makefile.in
index af7470e..b226ef3 100644
--- a/scilab/modules/demo_tools/Makefile.in
+++ b/scilab/modules/demo_tools/Makefile.in
@@ -201,6 +201,7 @@ LD = @LD@
201LDFLAGS = @LDFLAGS@ 201LDFLAGS = @LDFLAGS@
202LIBICONV = @LIBICONV@ 202LIBICONV = @LIBICONV@
203LIBINTL = @LIBINTL@ 203LIBINTL = @LIBINTL@
204LIBM = @LIBM@
204LIBOBJS = @LIBOBJS@ 205LIBOBJS = @LIBOBJS@
205LIBS = @LIBS@ 206LIBS = @LIBS@
206LIBTOOL = @LIBTOOL@ 207LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/development_tools/Makefile.in b/scilab/modules/development_tools/Makefile.in
index a6c82ef..1eecddc 100644
--- a/scilab/modules/development_tools/Makefile.in
+++ b/scilab/modules/development_tools/Makefile.in
@@ -200,6 +200,7 @@ LD = @LD@
200LDFLAGS = @LDFLAGS@ 200LDFLAGS = @LDFLAGS@
201LIBICONV = @LIBICONV@ 201LIBICONV = @LIBICONV@
202LIBINTL = @LIBINTL@ 202LIBINTL = @LIBINTL@
203LIBM = @LIBM@
203LIBOBJS = @LIBOBJS@ 204LIBOBJS = @LIBOBJS@
204LIBS = @LIBS@ 205LIBS = @LIBS@
205LIBTOOL = @LIBTOOL@ 206LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/development_tools/src/fake/Makefile.in b/scilab/modules/development_tools/src/fake/Makefile.in
index a904129..7e6d748 100644
--- a/scilab/modules/development_tools/src/fake/Makefile.in
+++ b/scilab/modules/development_tools/src/fake/Makefile.in
@@ -151,6 +151,7 @@ LD = @LD@
151LDFLAGS = @LDFLAGS@ 151LDFLAGS = @LDFLAGS@
152LIBICONV = @LIBICONV@ 152LIBICONV = @LIBICONV@
153LIBINTL = @LIBINTL@ 153LIBINTL = @LIBINTL@
154LIBM = @LIBM@
154LIBOBJS = @LIBOBJS@ 155LIBOBJS = @LIBOBJS@
155LIBS = @LIBS@ 156LIBS = @LIBS@
156LIBTOOL = @LIBTOOL@ 157LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/differential_equations/Makefile.in b/scilab/modules/differential_equations/Makefile.in
index 8de7549..10a965b 100644
--- a/scilab/modules/differential_equations/Makefile.in
+++ b/scilab/modules/differential_equations/Makefile.in
@@ -284,6 +284,7 @@ LD = @LD@
284LDFLAGS = @LDFLAGS@ 284LDFLAGS = @LDFLAGS@
285LIBICONV = @LIBICONV@ 285LIBICONV = @LIBICONV@
286LIBINTL = @LIBINTL@ 286LIBINTL = @LIBINTL@
287LIBM = @LIBM@
287LIBOBJS = @LIBOBJS@ 288LIBOBJS = @LIBOBJS@
288LIBS = @LIBS@ 289LIBS = @LIBS@
289LIBTOOL = @LIBTOOL@ 290LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/double/Makefile.in b/scilab/modules/double/Makefile.in
index de4a33d..6a904b4 100644
--- a/scilab/modules/double/Makefile.in
+++ b/scilab/modules/double/Makefile.in
@@ -242,6 +242,7 @@ LD = @LD@
242LDFLAGS = @LDFLAGS@ 242LDFLAGS = @LDFLAGS@
243LIBICONV = @LIBICONV@ 243LIBICONV = @LIBICONV@
244LIBINTL = @LIBINTL@ 244LIBINTL = @LIBINTL@
245LIBM = @LIBM@
245LIBOBJS = @LIBOBJS@ 246LIBOBJS = @LIBOBJS@
246LIBS = @LIBS@ 247LIBS = @LIBS@
247LIBTOOL = @LIBTOOL@ 248LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/dynamic_link/Makefile.in b/scilab/modules/dynamic_link/Makefile.in
index aa17267..25bed5d 100644
--- a/scilab/modules/dynamic_link/Makefile.in
+++ b/scilab/modules/dynamic_link/Makefile.in
@@ -259,6 +259,7 @@ LD = @LD@
259LDFLAGS = @LDFLAGS@ 259LDFLAGS = @LDFLAGS@
260LIBICONV = @LIBICONV@ 260LIBICONV = @LIBICONV@
261LIBINTL = @LIBINTL@ 261LIBINTL = @LIBINTL@
262LIBM = @LIBM@
262LIBOBJS = @LIBOBJS@ 263LIBOBJS = @LIBOBJS@
263LIBS = @LIBS@ 264LIBS = @LIBS@
264LIBTOOL = @LIBTOOL@ 265LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/elementary_functions/Makefile.in b/scilab/modules/elementary_functions/Makefile.in
index 9ad3d0a..d231aab 100644
--- a/scilab/modules/elementary_functions/Makefile.in
+++ b/scilab/modules/elementary_functions/Makefile.in
@@ -611,6 +611,7 @@ LD = @LD@
611LDFLAGS = @LDFLAGS@ 611LDFLAGS = @LDFLAGS@
612LIBICONV = @LIBICONV@ 612LIBICONV = @LIBICONV@
613LIBINTL = @LIBINTL@ 613LIBINTL = @LIBINTL@
614LIBM = @LIBM@
614LIBOBJS = @LIBOBJS@ 615LIBOBJS = @LIBOBJS@
615LIBS = @LIBS@ 616LIBS = @LIBS@
616LIBTOOL = @LIBTOOL@ 617LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/elementary_functions/macros/tand.sci b/scilab/modules/elementary_functions/macros/tand.sci
index 43d0219..2394270 100644
--- a/scilab/modules/elementary_functions/macros/tand.sci
+++ b/scilab/modules/elementary_functions/macros/tand.sci
@@ -1,5 +1,6 @@
1// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab 1// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
2// Copyright (C) INRIA, Serge Steer 2// Copyright (C) INRIA, Serge Steer
3// Copyright (C) 2010 - DIGITEO - Michael Baudin
3// 4//
4// This file must be used under the terms of the CeCILL. 5// This file must be used under the terms of the CeCILL.
5// This source file is licensed as described in the file COPYING, which 6// This source file is licensed as described in the file COPYING, which
@@ -8,19 +9,18 @@
8// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 9// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
9function y = tand(x) 10function y = tand(x)
10// Tangent of x in degrees. 11// Tangent of x in degrees.
11 if ~isreal(x) then 12// tand(x) = tan(x*%pi/180) in the mathematical sense
13// But floating point numbers behave differently.
14// For example, tand(180) = 0 while tan(pi) = -1.225D-16
15 if ( ~isreal(x) ) then
12 error(msprintf(gettext("%s: Wrong type for input argument #%d: Array of reals expected.\n"),"tand",1)); 16 error(msprintf(gettext("%s: Wrong type for input argument #%d: Array of reals expected.\n"),"tand",1));
13 end 17 end
14 18 // Argument reduction toward [-90,90[
15 n = round(x/90); 19 n = round(x/180)
16 x = x - n*90; 20 x = x - n*180
17 z = (x == 0); 21 y = tan(%pi/180*x)
18 m = pmodulo(n,2); 22 // Set all singular points to nan
19 y = x 23 m = pmodulo(x+90,180)
20 y(m==0) = tan(%pi/180*x(m==0)); 24 y(m==0) = %nan
21 if or(m==1) then
22 y(m==1 & ~z) = -1 ./ tan(%pi/180*x(m==1 & ~z));
23 y(m==1 & z & n>=0) = %inf;
24 y(m==1 & z & n<0) = -%inf;
25 end
26endfunction 25endfunction
26
diff --git a/scilab/modules/elementary_functions/tests/unit_tests/tand.dia.ref b/scilab/modules/elementary_functions/tests/unit_tests/tand.dia.ref
index 52d820e..2144325 100644
--- a/scilab/modules/elementary_functions/tests/unit_tests/tand.dia.ref
+++ b/scilab/modules/elementary_functions/tests/unit_tests/tand.dia.ref
@@ -1,394 +1,452 @@
1// ============================================================================= 1// =============================================================================
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab 2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) 2008 - INRIA - Serge Steer 3// Copyright (C) 2008 - INRIA - Serge Steer
4// Copyright (C) 2010 - DIGITEO - Michael Baudin
4// 5//
5// This file is distributed under the same license as the Scilab package. 6// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 7// =============================================================================
7// <-- JVM NOT MANDATORY --> 8// <-- JVM NOT MANDATORY -->
9//
10// assert_close --
11// Returns 1 if the two real matrices computed and expected are close,
12// i.e. if the relative distance between computed and expected is lesser than epsilon.
13// Arguments
14// computed, expected : the two matrices to compare
15// epsilon : a small number
16//
17function flag = assert_close ( computed, expected, epsilon )
18 if expected==0.0 then
19 shift = norm(computed-expected);
20 else
21 shift = norm(computed-expected)/norm(expected);
22 end
23 if shift < epsilon then
24 flag = 1;
25 else
26 flag = 0;
27 end
28 if flag <> 1 then bugmes();quit;end
29endfunction
30//
31// assert_equal --
32// Returns 1 if the two real matrices computed and expected are equal.
33// Arguments
34// computed, expected : the two matrices to compare
35// epsilon : a small number
36//
37function flag = assert_equal ( computed , expected )
38 if computed==expected then
39 flag = 1;
40 else
41 flag = 0;
42 end
43 if flag <> 1 then bugmes();quit;end
44endfunction
8// Maple code used to create reference 45// Maple code used to create reference
9// Digits := 40; 46// Digits := 40;
10// writeto("tand.ref"); interface(prettyprint = 0); 47// writeto("tand.ref"); interface(prettyprint = 0);
11// for i from 0 to 360 do if ((i<>90) and (i<>270) ) then print(-180+i, evalf[30](tan(-Pi+i*Pi/180), 30)) end end do; 48// for i from 0 to 360 do if ((i<>90) and (i<>270) ) then print(-180+i, evalf[30](tan(-Pi+i*Pi/180), 30)) end end do;
12// writeto(terminal); 49// writeto(terminal);
13ieee(2); 50ieee(2);
14pi=%pi;eps=%eps;Inf=%inf;NaN=%nan; //used to make following code runnable under Matlab 51//used to make following code runnable under Matlab
15ref=[-180, 0. 52pi=%pi;
16-179, 0.174550649282175857651288952197e-1 53eps=%eps;
17-178, 0.349207694917477305004026257737e-1 54Inf=%inf;
18-177, 0.524077792830412040388058244741e-1 55NaN=%nan;
19-176, 0.699268119435104136669210603231e-1 56//
20-175, 0.874886635259240052220186694350e-1 57x = (-180:180)';
21-174, .105104235265676462511502380140 58// Remove 90 (index #91) and -90 (index #271),
22-173, .122784560902904591134231136053 59// where the value is %nan
23-172, .140540834702391446838117693433 60x([91 271]) = [];
24-171, .158384440324536293838883092694 61e=[
25-170, .176326980708464973471090386869 620.
26-169, .194380309137718484243194224977 630.174550649282175857651288952197e-1
27-168, .212556561670022125259591660570 640.349207694917477305004026257737e-1
28-167, .230868191125563111748145613474 650.524077792830412040388058244741e-1
29-166, .249328002843180691624039937805 660.699268119435104136669210603231e-1
30-165, .267949192431122706472553658494 670.874886635259240052220186694350e-1
31-164, .286745385758807940042758062732 68.105104235265676462511502380140
32-163, .305730681458660355734541958996 69.122784560902904591134231136053
33-162, .324919696232906326155871412215 70.140540834702391446838117693433
34-161, .344327613289665241957265839384 71.158384440324536293838883092694
35-160, .363970234266202361351047882776 72.176326980708464973471090386869
36-159, .383864035035415795971448408105 73.194380309137718484243194224977
37-158, .404026225835156811322348143579 74.212556561670022125259591660570
38-157, .424474816209604742023532062943 75.230868191125563111748145613474
39-156, .445228685308536163922367030644 76.249328002843180691624039937805
40-155, .466307658154998592830006194801 77.267949192431122706472553658494
41-154, .487732588565861422773111126616 78.286745385758807940042758062732
42-153, .509525449494428810513706911251 79.305730681458660355734541958996
43-152, .531709431661478748075915871842 80.324919696232906326155871412215
44-151, .554309051452768917820763092337 81.344327613289665241957265839384
45-150, .577350269189625764509148780503 82.363970234266202361351047882776
46-149, .600860619027560414878664426354 83.383864035035415795971448408105
47-148, .624869351909327509780510827950 84.404026225835156811322348143579
48-147, .649407593197510576982062911310 85.424474816209604742023532062943
49-146, .674508516842426632142460861996 86.445228685308536163922367030644
50-145, .700207538209709779458522719443 87.466307658154998592830006194801
51-144, .726542528005360885895466757481 88.487732588565861422773111126616
52-143, .753554050102794157073956448623 89.509525449494428810513706911251
53-142, .781285626506717397062949971961 90.531709431661478748075915871842
54-141, .809784033195007148036991374238 91.554309051452768917820763092337
55-140, .839099631177280011763127298122 92.577350269189625764509148780503
56-139, .869286737816226662200095638705 93.600860619027560414878664426354
57-138, .900404044297839945120477203883 94.624869351909327509780510827950
58-137, .932515086137661705612185627428 95.649407593197510576982062911310
59-136, .965688774807074045958027299699 96.674508516842426632142460861996
60-135, 1. 97.700207538209709779458522719443
61-134, 1.03553031379056950695883255125 98.726542528005360885895466757481
62-133, 1.07236871002468253294602774807 99.753554050102794157073956448623
63-132, 1.11061251482919287014348196417 100.781285626506717397062949971961
64-131, 1.15036840722100955587633102557 101.809784033195007148036991374238
65-130, 1.19175359259420995870530807186 102.839099631177280011763127298122
66-129, 1.23489715653505139855617469537 103.869286737816226662200095638705
67-128, 1.27994163219307878031102984757 104.900404044297839945120477203883
68-127, 1.32704482162041003715947257408 105.932515086137661705612185627428
69-126, 1.37638192047117353820720958191 106.965688774807074045958027299699
70-125, 1.42814800674211450216061848500 1071.
71-124, 1.48256096851274025478715714915 1081.03553031379056950695883255125
72-123, 1.53986496381458290482679697261 1091.07236871002468253294602774807
73-122, 1.60033452904105035532673308117 1101.11061251482919287014348196417
74-121, 1.66427948235051791103049617004 1111.15036840722100955587633102557
75-120, 1.73205080756887729352744634151 1121.19175359259420995870530807186
76-119, 1.80404775527142393738178474825 1131.23489715653505139855617469537
77-118, 1.88072646534633201236083759582 1141.27994163219307878031102984757
78-117, 1.96261050550515058230464042622 1151.32704482162041003715947257408
79-116, 2.05030384157929621689901107053 1161.37638192047117353820720958191
80-115, 2.14450692050955861635626079106 1171.42814800674211450216061848500
81-114, 2.24603677390421605416332143840 1181.48256096851274025478715714915
82-113, 2.35585236582375283393958666236 1191.53986496381458290482679697261
83-112, 2.47508685341629582524001324606 1201.60033452904105035532673308117
84-111, 2.60508906469380153625841233646 1211.66427948235051791103049617004
85-110, 2.74747741945462227876166402648 1221.73205080756887729352744634151
86-109, 2.90421087767582280257932553456 1231.80404775527142393738178474825
87-108, 3.07768353717525340257029057602 1241.88072646534633201236083759582
88-107, 3.27085261848414086530885625734 1251.96261050550515058230464042622
89-106, 3.48741444384090865069622422508 1262.05030384157929621689901107053
90-105, 3.73205080756887729352744634156 1272.14450692050955861635626079106
91-104, 4.01078093353584471634571512944 1282.24603677390421605416332143840
92-103, 4.33147587428415554554616775463 1292.35585236582375283393958666236
93-102, 4.70463010947845423358623453738 1302.47508685341629582524001324606
94-101, 5.14455401597031013472322071724 1312.60508906469380153625841233646
95-100, 5.67128181961770953099441843983 1322.74747741945462227876166402648
96-99, 6.31375151467504309897946424494 1332.90421087767582280257932553456
97-98, 7.11536972238420874823056614360 1343.07768353717525340257029057602
98-97, 8.14434642797459402382566139528 1353.27085261848414086530885625734
99-96, 9.51436445422258492968397145491 1363.48741444384090865069622422508
100-95, 11.4300523027613430672108555485 1373.73205080756887729352744634156
101-94, 14.3006662567119279101280533475 1384.01078093353584471634571512944
102-93, 19.0811366877282110634067487325 1394.33147587428415554554616775463
103-92, 28.6362532829156035507565093210 1404.70463010947845423358623453738
104-91, 57.2899616307594246872781475211 1415.14455401597031013472322071724
105-89, -57.2899616307594246872781475211 1425.67128181961770953099441843983
106-88, -28.6362532829156035507565093210 1436.31375151467504309897946424494
107-87, -19.0811366877282110634067487325 1447.11536972238420874823056614360
108-86, -14.3006662567119279101280533475 1458.14434642797459402382566139528
109-85, -11.4300523027613430672108555485 1469.51436445422258492968397145491
110-84, -9.51436445422258492968397145491 14711.4300523027613430672108555485
111-83, -8.14434642797459402382566139528 14814.3006662567119279101280533475
112-82, -7.11536972238420874823056614360 14919.0811366877282110634067487325
113-81, -6.31375151467504309897946424494 15028.6362532829156035507565093210
114-80, -5.67128181961770953099441843983 15157.2899616307594246872781475211
115-79, -5.14455401597031013472322071724 152-57.2899616307594246872781475211
116-78, -4.70463010947845423358623453738 153-28.6362532829156035507565093210
117-77, -4.33147587428415554554616775463 154-19.0811366877282110634067487325
118-76, -4.01078093353584471634571512944 155-14.3006662567119279101280533475
119-75, -3.73205080756887729352744634156 156-11.4300523027613430672108555485
120-74, -3.48741444384090865069622422508 157-9.51436445422258492968397145491
121-73, -3.27085261848414086530885625734 158-8.14434642797459402382566139528
122-72, -3.07768353717525340257029057602 159-7.11536972238420874823056614360
123-71, -2.90421087767582280257932553456 160-6.31375151467504309897946424494
124-70, -2.74747741945462227876166402648 161-5.67128181961770953099441843983
125-69, -2.60508906469380153625841233646 162-5.14455401597031013472322071724
126-68, -2.47508685341629582524001324606 163-4.70463010947845423358623453738
127-67, -2.35585236582375283393958666236 164-4.33147587428415554554616775463
128-66, -2.24603677390421605416332143840 165-4.01078093353584471634571512944
129-65, -2.14450692050955861635626079106 166-3.73205080756887729352744634156
130-64, -2.05030384157929621689901107053 167-3.48741444384090865069622422508
131-63, -1.96261050550515058230464042622 168-3.27085261848414086530885625734
132-62, -1.88072646534633201236083759582 169-3.07768353717525340257029057602
133-61, -1.80404775527142393738178474825 170-2.90421087767582280257932553456
134-60, -1.73205080756887729352744634151 171-2.74747741945462227876166402648
135-59, -1.66427948235051791103049617004 172-2.60508906469380153625841233646
136-58, -1.60033452904105035532673308117 173-2.47508685341629582524001324606
137-57, -1.53986496381458290482679697261 174-2.35585236582375283393958666236
138-56, -1.48256096851274025478715714915 175-2.24603677390421605416332143840
139-55, -1.42814800674211450216061848500 176-2.14450692050955861635626079106
140-54, -1.37638192047117353820720958191 177-2.05030384157929621689901107053
141-53, -1.32704482162041003715947257408 178-1.96261050550515058230464042622
142-52, -1.27994163219307878031102984757 179-1.88072646534633201236083759582
143-51, -1.23489715653505139855617469537 180-1.80404775527142393738178474825
144-50, -1.19175359259420995870530807186 181-1.73205080756887729352744634151
145-49, -1.15036840722100955587633102557 182-1.66427948235051791103049617004
146-48, -1.11061251482919287014348196417 183-1.60033452904105035532673308117
147-47, -1.07236871002468253294602774807 184-1.53986496381458290482679697261
148-46, -1.03553031379056950695883255125 185-1.48256096851274025478715714915
149-45, -1. 186-1.42814800674211450216061848500
150-44, -.965688774807074045958027299699 187-1.37638192047117353820720958191
151-43, -.932515086137661705612185627428 188-1.32704482162041003715947257408
152-42, -.900404044297839945120477203883 189-1.27994163219307878031102984757
153-41, -.869286737816226662200095638705 190-1.23489715653505139855617469537
154-40, -.839099631177280011763127298122 191-1.19175359259420995870530807186
155-39, -.809784033195007148036991374238 192-1.15036840722100955587633102557
156-38, -.781285626506717397062949971961 193-1.11061251482919287014348196417
157-37, -.753554050102794157073956448623 194-1.07236871002468253294602774807
158-36, -.726542528005360885895466757481 195-1.03553031379056950695883255125
159-35, -.700207538209709779458522719443 196-1.
160-34, -.674508516842426632142460861996 197-.965688774807074045958027299699
161-33, -.649407593197510576982062911310 198-.932515086137661705612185627428
162-32, -.624869351909327509780510827950 199-.900404044297839945120477203883
163-31, -.600860619027560414878664426354 200-.869286737816226662200095638705
164-30, -.577350269189625764509148780503 201-.839099631177280011763127298122
165-29, -.554309051452768917820763092337 202-.809784033195007148036991374238
166-28, -.531709431661478748075915871842 203-.781285626506717397062949971961
167-27, -.509525449494428810513706911251 204-.753554050102794157073956448623
168-26, -.487732588565861422773111126616 205-.726542528005360885895466757481
169-25, -.466307658154998592830006194801 206-.700207538209709779458522719443
170-24, -.445228685308536163922367030644 207-.674508516842426632142460861996
171-23, -.424474816209604742023532062943 208-.649407593197510576982062911310
172-22, -.404026225835156811322348143579 209-.624869351909327509780510827950
173-21, -.383864035035415795971448408105 210-.600860619027560414878664426354
174-20, -.363970234266202361351047882776 211-.577350269189625764509148780503
175-19, -.344327613289665241957265839384 212-.554309051452768917820763092337
176-18, -.324919696232906326155871412215 213-.531709431661478748075915871842
177-17, -.305730681458660355734541958996 214-.509525449494428810513706911251
178-16, -.286745385758807940042758062732 215-.487732588565861422773111126616
179-15, -.267949192431122706472553658494 216-.466307658154998592830006194801
180-14, -.249328002843180691624039937805 217-.445228685308536163922367030644
181-13, -.230868191125563111748145613474 218-.424474816209604742023532062943
182-12, -.212556561670022125259591660570 219-.404026225835156811322348143579
183-11, -.194380309137718484243194224977 220-.383864035035415795971448408105
184-10, -.176326980708464973471090386869 221-.363970234266202361351047882776
185-9, -.158384440324536293838883092694 222-.344327613289665241957265839384
186-8, -.140540834702391446838117693433 223-.324919696232906326155871412215
187-7, -.122784560902904591134231136053 224-.305730681458660355734541958996
188-6, -.105104235265676462511502380140 225-.286745385758807940042758062732
189-5, -0.874886635259240052220186694350e-1 226-.267949192431122706472553658494
190-4, -0.699268119435104136669210603231e-1 227-.249328002843180691624039937805
191-3, -0.524077792830412040388058244741e-1 228-.230868191125563111748145613474
192-2, -0.349207694917477305004026257737e-1 229-.212556561670022125259591660570
193-1, -0.174550649282175857651288952197e-1 230-.194380309137718484243194224977
1940, 0. 231-.176326980708464973471090386869
1951, 0.174550649282175857651288952197e-1 232-.158384440324536293838883092694
1962, 0.349207694917477305004026257737e-1 233-.140540834702391446838117693433
1973, 0.524077792830412040388058244741e-1 234-.122784560902904591134231136053
1984, 0.699268119435104136669210603231e-1 235-.105104235265676462511502380140
1995, 0.874886635259240052220186694350e-1 236-0.874886635259240052220186694350e-1
2006, .105104235265676462511502380140 237-0.699268119435104136669210603231e-1
2017, .122784560902904591134231136053 238-0.524077792830412040388058244741e-1
2028, .140540834702391446838117693433 239-0.349207694917477305004026257737e-1
2039, .158384440324536293838883092694 240-0.174550649282175857651288952197e-1
20410, .176326980708464973471090386869 2410.
20511, .194380309137718484243194224977 2420.174550649282175857651288952197e-1
20612, .212556561670022125259591660570 2430.349207694917477305004026257737e-1
20713, .230868191125563111748145613474 2440.524077792830412040388058244741e-1
20814, .249328002843180691624039937805 2450.699268119435104136669210603231e-1
20915, .267949192431122706472553658494 2460.874886635259240052220186694350e-1
21016, .286745385758807940042758062732 247.105104235265676462511502380140
21117, .305730681458660355734541958996 248.122784560902904591134231136053
21218, .324919696232906326155871412215 249.140540834702391446838117693433
21319, .344327613289665241957265839384 250.158384440324536293838883092694
21420, .363970234266202361351047882776 251.176326980708464973471090386869
21521, .383864035035415795971448408105 252.194380309137718484243194224977
21622, .404026225835156811322348143579 253.212556561670022125259591660570
21723, .424474816209604742023532062943 254.230868191125563111748145613474
21824, .445228685308536163922367030644 255.249328002843180691624039937805
21925, .466307658154998592830006194801 256.267949192431122706472553658494
22026, .487732588565861422773111126616 257.286745385758807940042758062732
22127, .509525449494428810513706911251 258.305730681458660355734541958996
22228, .531709431661478748075915871842 259.324919696232906326155871412215
22329, .554309051452768917820763092337 260.344327613289665241957265839384
22430, .577350269189625764509148780503 261.363970234266202361351047882776
22531, .600860619027560414878664426354 262.383864035035415795971448408105
22632, .624869351909327509780510827950 263.404026225835156811322348143579
22733, .649407593197510576982062911310 264.424474816209604742023532062943
22834, .674508516842426632142460861996 265.445228685308536163922367030644
22935, .700207538209709779458522719443 266.466307658154998592830006194801
23036, .726542528005360885895466757481 267.487732588565861422773111126616
23137, .753554050102794157073956448623 268.509525449494428810513706911251
23238, .781285626506717397062949971961 269.531709431661478748075915871842
23339, .809784033195007148036991374238 270.554309051452768917820763092337
23440, .839099631177280011763127298122 271.577350269189625764509148780503
23541, .869286737816226662200095638705 272.600860619027560414878664426354
23642, .900404044297839945120477203883 273.624869351909327509780510827950
23743, .932515086137661705612185627428 274.649407593197510576982062911310
23844, .965688774807074045958027299699 275.674508516842426632142460861996
23945, 1. 276.700207538209709779458522719443
24046, 1.03553031379056950695883255125 277.726542528005360885895466757481
24147, 1.07236871002468253294602774807 278.753554050102794157073956448623
24248, 1.11061251482919287014348196417 279.781285626506717397062949971961
24349, 1.15036840722100955587633102557 280.809784033195007148036991374238
24450, 1.19175359259420995870530807186 281.839099631177280011763127298122
24551, 1.23489715653505139855617469537 282.869286737816226662200095638705
24652, 1.27994163219307878031102984757 283.900404044297839945120477203883
24753, 1.32704482162041003715947257408 284.932515086137661705612185627428
24854, 1.37638192047117353820720958191 285.965688774807074045958027299699
24955, 1.42814800674211450216061848500 2861.
25056, 1.48256096851274025478715714915 2871.03553031379056950695883255125
25157, 1.53986496381458290482679697261 2881.07236871002468253294602774807
25258, 1.60033452904105035532673308117 2891.11061251482919287014348196417
25359, 1.66427948235051791103049617004 2901.15036840722100955587633102557
25460, 1.73205080756887729352744634151 2911.19175359259420995870530807186
25561, 1.80404775527142393738178474825 2921.23489715653505139855617469537
25662, 1.88072646534633201236083759582 2931.27994163219307878031102984757
25763, 1.96261050550515058230464042622 2941.32704482162041003715947257408
25864, 2.05030384157929621689901107053 2951.37638192047117353820720958191
25965, 2.14450692050955861635626079106 2961.42814800674211450216061848500
26066, 2.24603677390421605416332143840 2971.48256096851274025478715714915
26167, 2.35585236582375283393958666236 2981.53986496381458290482679697261
26268, 2.47508685341629582524001324606 2991.60033452904105035532673308117
26369, 2.60508906469380153625841233646 3001.66427948235051791103049617004
26470, 2.74747741945462227876166402648 3011.73205080756887729352744634151
26571, 2.90421087767582280257932553456 3021.80404775527142393738178474825
26672, 3.07768353717525340257029057602 3031.88072646534633201236083759582
26773, 3.27085261848414086530885625734 3041.96261050550515058230464042622
26874, 3.48741444384090865069622422508 3052.05030384157929621689901107053
26975, 3.73205080756887729352744634156 3062.14450692050955861635626079106
27076, 4.01078093353584471634571512944 3072.24603677390421605416332143840
27177, 4.33147587428415554554616775463 3082.35585236582375283393958666236
27278, 4.70463010947845423358623453738 3092.47508685341629582524001324606
27379, 5.14455401597031013472322071724 3102.60508906469380153625841233646
27480, 5.67128181961770953099441843983 3112.74747741945462227876166402648
27581, 6.31375151467504309897946424494 3122.90421087767582280257932553456
27682, 7.11536972238420874823056614360 3133.07768353717525340257029057602
27783, 8.14434642797459402382566139528 3143.27085261848414086530885625734
27884, 9.51436445422258492968397145491 3153.48741444384090865069622422508
27985, 11.4300523027613430672108555485 3163.73205080756887729352744634156
28086, 14.3006662567119279101280533475 3174.01078093353584471634571512944
28187, 19.0811366877282110634067487325 3184.33147587428415554554616775463
28288, 28.6362532829156035507565093210 3194.70463010947845423358623453738
28389, 57.2899616307594246872781475211 3205.14455401597031013472322071724
28491, -57.2899616307594246872781475211 3215.67128181961770953099441843983
28592, -28.6362532829156035507565093210 3226.31375151467504309897946424494
28693, -19.0811366877282110634067487325 3237.11536972238420874823056614360
28794, -14.3006662567119279101280533475 3248.14434642797459402382566139528
28895, -11.4300523027613430672108555485 3259.51436445422258492968397145491
28996, -9.51436445422258492968397145491 32611.4300523027613430672108555485
29097, -8.14434642797459402382566139528 32714.3006662567119279101280533475
29198, -7.11536972238420874823056614360 32819.0811366877282110634067487325
29299, -6.31375151467504309897946424494 32928.6362532829156035507565093210
293100, -5.67128181961770953099441843983 33057.2899616307594246872781475211
294101, -5.14455401597031013472322071724 331-57.2899616307594246872781475211
295102, -4.70463010947845423358623453738 332-28.6362532829156035507565093210
296103, -4.33147587428415554554616775463 333-19.0811366877282110634067487325
297104, -4.01078093353584471634571512944 334-14.3006662567119279101280533475
298105, -3.73205080756887729352744634156 335-11.4300523027613430672108555485
299106, -3.48741444384090865069622422508 336-9.51436445422258492968397145491
300107, -3.27085261848414086530885625734 337-8.14434642797459402382566139528
301108, -3.07768353717525340257029057602 338-7.11536972238420874823056614360
302109, -2.90421087767582280257932553456 339-6.31375151467504309897946424494
303110, -2.74747741945462227876166402648 340-5.67128181961770953099441843983
304111, -2.60508906469380153625841233646 341-5.14455401597031013472322071724
305112, -2.47508685341629582524001324606 342-4.70463010947845423358623453738
306113, -2.35585236582375283393958666236 343-4.33147587428415554554616775463
307114, -2.24603677390421605416332143840 344-4.01078093353584471634571512944
308115, -2.14450692050955861635626079106 345-3.73205080756887729352744634156
309116, -2.05030384157929621689901107053 346-3.48741444384090865069622422508
310117, -1.96261050550515058230464042622 347-3.27085261848414086530885625734
311118, -1.88072646534633201236083759582 348-3.07768353717525340257029057602
312119, -1.80404775527142393738178474825 349-2.90421087767582280257932553456
313120, -1.73205080756887729352744634151 350-2.74747741945462227876166402648
314121, -1.66427948235051791103049617004 351-2.60508906469380153625841233646
315122, -1.60033452904105035532673308117 352-2.47508685341629582524001324606
316123, -1.53986496381458290482679697261 353-2.35585236582375283393958666236
317124, -1.48256096851274025478715714915 354-2.24603677390421605416332143840
318125, -1.42814800674211450216061848500 355-2.14450692050955861635626079106
319126, -1.37638192047117353820720958191 356-2.05030384157929621689901107053
320127, -1.32704482162041003715947257408 357-1.96261050550515058230464042622
321128, -1.27994163219307878031102984757 358-1.88072646534633201236083759582
322129, -1.23489715653505139855617469537 359-1.80404775527142393738178474825
323130, -1.19175359259420995870530807186 360-1.73205080756887729352744634151
324131, -1.15036840722100955587633102557 361-1.66427948235051791103049617004
325132, -1.11061251482919287014348196417 362-1.60033452904105035532673308117
326133, -1.07236871002468253294602774807 363-1.53986496381458290482679697261
327134, -1.03553031379056950695883255125 364-1.48256096851274025478715714915
328135, -1. 365-1.42814800674211450216061848500
329136, -.965688774807074045958027299699 366-1.37638192047117353820720958191
330137, -.932515086137661705612185627428 367-1.32704482162041003715947257408
331138, -.900404044297839945120477203883 368-1.27994163219307878031102984757
332139, -.869286737816226662200095638705 369-1.23489715653505139855617469537
333140, -.839099631177280011763127298122 370-1.19175359259420995870530807186
334141, -.809784033195007148036991374238 371-1.15036840722100955587633102557
335142, -.781285626506717397062949971961 372-1.11061251482919287014348196417
336143, -.753554050102794157073956448623 373-1.07236871002468253294602774807
337144, -.726542528005360885895466757481 374-1.03553031379056950695883255125
338145, -.700207538209709779458522719443 375-1.
339146, -.674508516842426632142460861996 376-.965688774807074045958027299699
340147, -.649407593197510576982062911310 377-.932515086137661705612185627428
341148, -.624869351909327509780510827950 378-.900404044297839945120477203883
342149, -.600860619027560414878664426354 379-.869286737816226662200095638705
343150, -.577350269189625764509148780503 380-.839099631177280011763127298122
344151, -.554309051452768917820763092337 381-.809784033195007148036991374238
345152, -.531709431661478748075915871842 382-.781285626506717397062949971961
346153, -.509525449494428810513706911251 383-.753554050102794157073956448623
347154, -.487732588565861422773111126616 384-.726542528005360885895466757481
348155, -.466307658154998592830006194801 385-.700207538209709779458522719443
349156, -.445228685308536163922367030644 386-.674508516842426632142460861996
350157, -.424474816209604742023532062943 387-.649407593197510576982062911310
351158, -.404026225835156811322348143579 388-.624869351909327509780510827950
352159, -.383864035035415795971448408105 389-.600860619027560414878664426354
353160, -.363970234266202361351047882776 390-.577350269189625764509148780503
354161, -.344327613289665241957265839384 391-.554309051452768917820763092337
355162, -.324919696232906326155871412215 392-.531709431661478748075915871842
356163, -.305730681458660355734541958996 393-.509525449494428810513706911251
357164, -.286745385758807940042758062732 394-.487732588565861422773111126616
358165, -.267949192431122706472553658494 395-.466307658154998592830006194801
359166, -.249328002843180691624039937805 396-.445228685308536163922367030644
360167, -.230868191125563111748145613474 397-.424474816209604742023532062943
361168, -.212556561670022125259591660570 398-.404026225835156811322348143579
362169, -.194380309137718484243194224977 399-.383864035035415795971448408105
363170, -.176326980708464973471090386869 400-.363970234266202361351047882776
364171, -.158384440324536293838883092694 401-.344327613289665241957265839384
365172, -.140540834702391446838117693433 402-.324919696232906326155871412215
366173, -.122784560902904591134231136053 403-.305730681458660355734541958996
367174, -.105104235265676462511502380140 404-.286745385758807940042758062732
368175, -0.874886635259240052220186694350e-1 405-.267949192431122706472553658494
369176, -0.699268119435104136669210603231e-1 406-.249328002843180691624039937805
370177, -0.524077792830412040388058244741e-1 407-.230868191125563111748145613474
371178, -0.349207694917477305004026257737e-1 408-.212556561670022125259591660570
372179, -0.174550649282175857651288952197e-1 409-.194380309137718484243194224977
373180, 0. 410-.176326980708464973471090386869
411-.158384440324536293838883092694
412-.140540834702391446838117693433
413-.122784560902904591134231136053
414-.105104235265676462511502380140
415-0.874886635259240052220186694350e-1
416-0.699268119435104136669210603231e-1
417-0.524077792830412040388058244741e-1
418-0.349207694917477305004026257737e-1
419-0.174550649282175857651288952197e-1
4200.
374]; 421];
375x=ref(:,1);e=max(abs((ref(:,2)-tand(x)))); 422c = tand(x);
376if e>40*eps then bugmes();quit;end 423assert_close ( c , e , 40 * %eps );
377x=ref(:,1)+2^6*360; e=max(abs((ref(:,2)-tand(x)))); 424// Turn a lot around the circle
378if e>40*eps then bugmes();quit;end 425x1 = x + 2^6*360;
379x=ref(:,1)+2^10*360; e=max(abs((ref(:,2)-tand(x)))); 426c = tand(x1);
380if e>40*eps then bugmes();quit;end 427assert_close ( c , e , 40 * %eps );
381if tand(0)<>0 then bugmes();quit;end 428// Turn a lot around the circle, the other side
382if tand(360)<>0 then bugmes();quit;end 429x2 = x - 2^6*360;
383if tand(-360)<>0 then bugmes();quit;end 430c = tand(x2);
384if tand(90)<>%inf then bugmes();quit;end 431assert_close ( c , e , 40 * %eps );
385if tand(-90)<>-%inf then bugmes();quit;end 432assert_equal ( tand(0) , 0 );
386if tand(180)<>0 then bugmes();quit;end 433assert_equal ( tand(360) , 0 );
387if tand(-180)<>0 then bugmes();quit;end 434assert_equal ( tand(-360) , 0 );
388if tand(270)<>%inf then bugmes();quit;end 435assert_equal ( tand(180) , 0 );
389if tand(-270)<>-%inf then bugmes();quit;end 436assert_equal ( tand(-180) , 0 );
390if or(abs(tand([30 45 60])-[1/sqrt(3) 1 sqrt(3) ])>2*%eps) then bugmes();quit;end 437assert_close ( tand(30) , 1/sqrt(3) , %eps );
391if ~isnan(tand(-Inf)) then bugmes();quit;end 438assert_close ( tand(45) , 1 , 2 * %eps );
392if ~isnan(tand(Inf)) then bugmes();quit;end 439assert_close ( tand(60) , sqrt(3) , 2*%eps );
393if ~isnan(tand(NaN)) then bugmes();quit;end 440assert_equal ( isnan(tand(90)) , %t );
394if tand([])<>[] then bugmes();quit;end 441assert_equal ( isnan(tand(-90)) , %t );
442assert_equal ( isnan(tand(270)) , %t );
443assert_equal ( isnan(tand(-270)) , %t );
444assert_equal ( isnan(tand(-%inf)) , %t );
445assert_equal ( isnan(tand(%inf)) , %t );
446assert_equal ( isnan(tand(%nan)) , %t );
447assert_equal ( tand([]) , [] );
448ieee(0)
449assert_equal ( tand(0) , 0 );
450assert_close ( tand(30) , 1/sqrt(3) , %eps );
451assert_close ( tand(45) , 1 , 2 * %eps );
452assert_close ( tand(60) , sqrt(3) , 2*%eps );
diff --git a/scilab/modules/elementary_functions/tests/unit_tests/tand.tst b/scilab/modules/elementary_functions/tests/unit_tests/tand.tst
index 30f01af..1b88df3 100644
--- a/scilab/modules/elementary_functions/tests/unit_tests/tand.tst
+++ b/scilab/modules/elementary_functions/tests/unit_tests/tand.tst
@@ -1,402 +1,467 @@
1// ============================================================================= 1// =============================================================================
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab 2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) 2008 - INRIA - Serge Steer 3// Copyright (C) 2008 - INRIA - Serge Steer
4// Copyright (C) 2010 - DIGITEO - Michael Baudin
4// 5//
5// This file is distributed under the same license as the Scilab package. 6// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 7// =============================================================================
7 8
8// <-- JVM NOT MANDATORY --> 9// <-- JVM NOT MANDATORY -->
9 10
11//
12// assert_close --
13// Returns 1 if the two real matrices computed and expected are close,
14// i.e. if the relative distance between computed and expected is lesser than epsilon.
15// Arguments
16// computed, expected : the two matrices to compare
17// epsilon : a small number
18//
19function flag = assert_close ( computed, expected, epsilon )
20 if expected==0.0 then
21 shift = norm(computed-expected);
22 else
23 shift = norm(computed-expected)/norm(expected);
24 end
25 if shift < epsilon then
26 flag = 1;
27 else
28 flag = 0;
29 end
30 if flag <> 1 then pause,end
31endfunction
32//
33// assert_equal --
34// Returns 1 if the two real matrices computed and expected are equal.
35// Arguments
36// computed, expected : the two matrices to compare
37// epsilon : a small number
38//
39function flag = assert_equal ( computed , expected )
40 if computed==expected then
41 flag = 1;
42 else
43 flag = 0;
44 end
45 if flag <> 1 then pause,end
46endfunction
47
10// Maple code used to create reference 48// Maple code used to create reference
11// Digits := 40; 49// Digits := 40;
12// writeto("tand.ref"); interface(prettyprint = 0); 50// writeto("tand.ref"); interface(prettyprint = 0);
13// for i from 0 to 360 do if ((i<>90) and (i<>270) ) then print(-180+i, evalf[30](tan(-Pi+i*Pi/180), 30)) end end do; 51// for i from 0 to 360 do if ((i<>90) and (i<>270) ) then print(-180+i, evalf[30](tan(-Pi+i*Pi/180), 30)) end end do;
14// writeto(terminal); 52// writeto(terminal);
15ieee(2); 53ieee(2);
16pi=%pi;eps=%eps;Inf=%inf;NaN=%nan; //used to make following code runnable under Matlab 54//used to make following code runnable under Matlab
55pi=%pi;
56eps=%eps;
57Inf=%inf;
58NaN=%nan;
59
60//
61x = (-180:180)';
62// Remove 90 (index #91) and -90 (index #271),
63// where the value is %nan
64x([91 271]) = [];
17 65
18ref=[-180, 0. 66e=[
19-179, 0.174550649282175857651288952197e-1 670.
20-178, 0.349207694917477305004026257737e-1 680.174550649282175857651288952197e-1
21-177, 0.524077792830412040388058244741e-1 690.349207694917477305004026257737e-1
22-176, 0.699268119435104136669210603231e-1 700.524077792830412040388058244741e-1
23-175, 0.874886635259240052220186694350e-1 710.699268119435104136669210603231e-1
24-174, .105104235265676462511502380140 720.874886635259240052220186694350e-1
25-173, .122784560902904591134231136053 73.105104235265676462511502380140
26-172, .140540834702391446838117693433 74.122784560902904591134231136053
27-171, .158384440324536293838883092694 75.140540834702391446838117693433
28-170, .176326980708464973471090386869 76.158384440324536293838883092694
29-169, .194380309137718484243194224977 77.176326980708464973471090386869
30-168, .212556561670022125259591660570 78.194380309137718484243194224977
31-167, .230868191125563111748145613474 79.212556561670022125259591660570
32-166, .249328002843180691624039937805 80.230868191125563111748145613474
33-165, .267949192431122706472553658494 81.249328002843180691624039937805
34-164, .286745385758807940042758062732 82.267949192431122706472553658494
35-163, .305730681458660355734541958996 83.286745385758807940042758062732
36-162, .324919696232906326155871412215 84.305730681458660355734541958996
37-161, .344327613289665241957265839384 85.324919696232906326155871412215
38-160, .363970234266202361351047882776 86.344327613289665241957265839384
39-159, .383864035035415795971448408105 87.363970234266202361351047882776
40-158, .404026225835156811322348143579 88.383864035035415795971448408105
41-157, .424474816209604742023532062943 89.404026225835156811322348143579
42-156, .445228685308536163922367030644 90.424474816209604742023532062943
43-155, .466307658154998592830006194801 91.445228685308536163922367030644
44-154, .487732588565861422773111126616 92.466307658154998592830006194801
45-153, .509525449494428810513706911251 93.487732588565861422773111126616
46-152, .531709431661478748075915871842 94.509525449494428810513706911251
47-151, .554309051452768917820763092337 95.531709431661478748075915871842
48-150, .577350269189625764509148780503 96.554309051452768917820763092337
49-149, .600860619027560414878664426354 97.577350269189625764509148780503
50-148, .624869351909327509780510827950 98.600860619027560414878664426354
51-147, .649407593197510576982062911310 99.624869351909327509780510827950
52-146, .674508516842426632142460861996 100.649407593197510576982062911310
53-145, .700207538209709779458522719443 101.674508516842426632142460861996
54-144, .726542528005360885895466757481 102.700207538209709779458522719443
55-143, .753554050102794157073956448623 103.726542528005360885895466757481
56-142, .781285626506717397062949971961 104.753554050102794157073956448623
57-141, .809784033195007148036991374238 105.781285626506717397062949971961
58-140, .839099631177280011763127298122 106.809784033195007148036991374238
59-139, .869286737816226662200095638705 107.839099631177280011763127298122
60-138, .900404044297839945120477203883 108.869286737816226662200095638705
61-137, .932515086137661705612185627428 109.900404044297839945120477203883
62-136, .965688774807074045958027299699 110.932515086137661705612185627428
63-135, 1. 111.965688774807074045958027299699
64-134, 1.03553031379056950695883255125 1121.
65-133, 1.07236871002468253294602774807 1131.03553031379056950695883255125
66-132, 1.11061251482919287014348196417 1141.07236871002468253294602774807
67-131, 1.15036840722100955587633102557 1151.11061251482919287014348196417
68-130, 1.19175359259420995870530807186 1161.15036840722100955587633102557
69-129, 1.23489715653505139855617469537 1171.19175359259420995870530807186
70-128, 1.27994163219307878031102984757 1181.23489715653505139855617469537
71-127, 1.32704482162041003715947257408 1191.27994163219307878031102984757
72-126, 1.37638192047117353820720958191 1201.32704482162041003715947257408
73-125, 1.42814800674211450216061848500 1211.37638192047117353820720958191
74-124, 1.48256096851274025478715714915 1221.42814800674211450216061848500
75-123, 1.53986496381458290482679697261 1231.48256096851274025478715714915
76-122, 1.60033452904105035532673308117 1241.53986496381458290482679697261
77-121, 1.66427948235051791103049617004 1251.60033452904105035532673308117
78-120, 1.73205080756887729352744634151 1261.66427948235051791103049617004
79-119, 1.80404775527142393738178474825 1271.73205080756887729352744634151
80-118, 1.88072646534633201236083759582 1281.80404775527142393738178474825
81-117, 1.96261050550515058230464042622 1291.88072646534633201236083759582
82-116, 2.05030384157929621689901107053 1301.96261050550515058230464042622
83-115, 2.14450692050955861635626079106 1312.05030384157929621689901107053
84-114, 2.24603677390421605416332143840 1322.14450692050955861635626079106
85-113, 2.35585236582375283393958666236 1332.24603677390421605416332143840
86-112, 2.47508685341629582524001324606 1342.35585236582375283393958666236
87-111, 2.60508906469380153625841233646 1352.47508685341629582524001324606
88-110, 2.74747741945462227876166402648 1362.60508906469380153625841233646
89-109, 2.90421087767582280257932553456 1372.74747741945462227876166402648
90-108, 3.07768353717525340257029057602 1382.90421087767582280257932553456
91-107, 3.27085261848414086530885625734 1393.07768353717525340257029057602
92-106, 3.48741444384090865069622422508 1403.27085261848414086530885625734
93-105, 3.73205080756887729352744634156 1413.48741444384090865069622422508
94-104, 4.01078093353584471634571512944 1423.73205080756887729352744634156
95-103, 4.33147587428415554554616775463 1434.01078093353584471634571512944
96-102, 4.70463010947845423358623453738 1444.33147587428415554554616775463
97-101, 5.14455401597031013472322071724 1454.70463010947845423358623453738
98-100, 5.67128181961770953099441843983 1465.14455401597031013472322071724
99-99, 6.31375151467504309897946424494 1475.67128181961770953099441843983
100-98, 7.11536972238420874823056614360 1486.31375151467504309897946424494
101-97, 8.14434642797459402382566139528 1497.11536972238420874823056614360
102-96, 9.51436445422258492968397145491 1508.14434642797459402382566139528
103-95, 11.4300523027613430672108555485 1519.51436445422258492968397145491
104-94, 14.3006662567119279101280533475 15211.4300523027613430672108555485
105-93, 19.0811366877282110634067487325 15314.3006662567119279101280533475
106-92, 28.6362532829156035507565093210 15419.0811366877282110634067487325
107-91, 57.2899616307594246872781475211 15528.6362532829156035507565093210
108-89, -57.2899616307594246872781475211 15657.2899616307594246872781475211
109-88, -28.6362532829156035507565093210 157-57.2899616307594246872781475211
110-87, -19.0811366877282110634067487325 158-28.6362532829156035507565093210
111-86, -14.3006662567119279101280533475 159-19.0811366877282110634067487325
112-85, -11.4300523027613430672108555485 160-14.3006662567119279101280533475
113-84, -9.51436445422258492968397145491 161-11.4300523027613430672108555485
114-83, -8.14434642797459402382566139528 162-9.51436445422258492968397145491
115-82, -7.11536972238420874823056614360 163-8.14434642797459402382566139528
116-81, -6.31375151467504309897946424494 164-7.11536972238420874823056614360
117-80, -5.67128181961770953099441843983 165-6.31375151467504309897946424494
118-79, -5.14455401597031013472322071724 166-5.67128181961770953099441843983
119-78, -4.70463010947845423358623453738 167-5.14455401597031013472322071724
120-77, -4.33147587428415554554616775463 168-4.70463010947845423358623453738
121-76, -4.01078093353584471634571512944 169-4.33147587428415554554616775463
122-75, -3.73205080756887729352744634156 170-4.01078093353584471634571512944
123-74, -3.48741444384090865069622422508 171-3.73205080756887729352744634156
124-73, -3.27085261848414086530885625734 172-3.48741444384090865069622422508
125-72, -3.07768353717525340257029057602 173-3.27085261848414086530885625734
126-71, -2.90421087767582280257932553456 174-3.07768353717525340257029057602
127-70, -2.74747741945462227876166402648 175-2.90421087767582280257932553456
128-69, -2.60508906469380153625841233646 176-2.74747741945462227876166402648
129-68, -2.47508685341629582524001324606 177-2.60508906469380153625841233646
130-67, -2.35585236582375283393958666236 178-2.47508685341629582524001324606
131-66, -2.24603677390421605416332143840 179-2.35585236582375283393958666236
132-65, -2.14450692050955861635626079106 180-2.24603677390421605416332143840
133-64, -2.05030384157929621689901107053 181-2.14450692050955861635626079106
134-63, -1.96261050550515058230464042622 182-2.05030384157929621689901107053
135-62, -1.88072646534633201236083759582 183-1.96261050550515058230464042622
136-61, -1.80404775527142393738178474825 184-1.88072646534633201236083759582
137-60, -1.73205080756887729352744634151 185-1.80404775527142393738178474825
138-59, -1.66427948235051791103049617004 186-1.73205080756887729352744634151
139-58, -1.60033452904105035532673308117 187-1.66427948235051791103049617004
140-57, -1.53986496381458290482679697261 188-1.60033452904105035532673308117
141-56, -1.48256096851274025478715714915 189-1.53986496381458290482679697261
142-55, -1.42814800674211450216061848500 190-1.48256096851274025478715714915
143-54, -1.37638192047117353820720958191 191-1.42814800674211450216061848500
144-53, -1.32704482162041003715947257408 192-1.37638192047117353820720958191
145-52, -1.27994163219307878031102984757 193-1.32704482162041003715947257408
146-51, -1.23489715653505139855617469537 194-1.27994163219307878031102984757
147-50, -1.19175359259420995870530807186 195-1.23489715653505139855617469537
148-49, -1.15036840722100955587633102557 196-1.19175359259420995870530807186
149-48, -1.11061251482919287014348196417 197-1.15036840722100955587633102557
150-47, -1.07236871002468253294602774807 198-1.11061251482919287014348196417
151-46, -1.03553031379056950695883255125 199-1.07236871002468253294602774807
152-45, -1. 200-1.03553031379056950695883255125
153-44, -.965688774807074045958027299699 201-1.
154-43, -.932515086137661705612185627428 202-.965688774807074045958027299699
155-42, -.900404044297839945120477203883 203-.932515086137661705612185627428
156-41, -.869286737816226662200095638705 204-.900404044297839945120477203883
157-40, -.839099631177280011763127298122 205-.869286737816226662200095638705
158-39, -.809784033195007148036991374238 206-.839099631177280011763127298122
159-38, -.781285626506717397062949971961 207-.809784033195007148036991374238
160-37, -.753554050102794157073956448623 208-.781285626506717397062949971961
161-36, -.726542528005360885895466757481 209-.753554050102794157073956448623
162-35, -.700207538209709779458522719443 210-.726542528005360885895466757481
163-34, -.674508516842426632142460861996 211-.700207538209709779458522719443
164-33, -.649407593197510576982062911310 212-.674508516842426632142460861996
165-32, -.624869351909327509780510827950 213-.649407593197510576982062911310
166-31, -.600860619027560414878664426354 214-.624869351909327509780510827950
167-30, -.577350269189625764509148780503 215-.600860619027560414878664426354
168-29, -.554309051452768917820763092337 216-.577350269189625764509148780503
169-28, -.531709431661478748075915871842 217-.554309051452768917820763092337
170-27, -.509525449494428810513706911251 218-.531709431661478748075915871842
171-26, -.487732588565861422773111126616 219-.509525449494428810513706911251
172-25, -.466307658154998592830006194801 220-.487732588565861422773111126616
173-24, -.445228685308536163922367030644 221-.466307658154998592830006194801
174-23, -.424474816209604742023532062943 222-.445228685308536163922367030644
175-22, -.404026225835156811322348143579 223-.424474816209604742023532062943
176-21, -.383864035035415795971448408105 224-.404026225835156811322348143579
177-20, -.363970234266202361351047882776 225-.383864035035415795971448408105
178-19, -.344327613289665241957265839384 226-.363970234266202361351047882776
179-18, -.324919696232906326155871412215 227-.344327613289665241957265839384
180-17, -.305730681458660355734541958996 228-.324919696232906326155871412215
181-16, -.286745385758807940042758062732 229-.305730681458660355734541958996
182-15, -.267949192431122706472553658494 230-.286745385758807940042758062732
183-14, -.249328002843180691624039937805 231-.267949192431122706472553658494
184-13, -.230868191125563111748145613474 232-.249328002843180691624039937805
185-12, -.212556561670022125259591660570 233-.230868191125563111748145613474
186-11, -.194380309137718484243194224977 234-.212556561670022125259591660570
187-10, -.176326980708464973471090386869 235-.194380309137718484243194224977
188-9, -.158384440324536293838883092694 236-.176326980708464973471090386869
189-8, -.140540834702391446838117693433 237-.158384440324536293838883092694
190-7, -.122784560902904591134231136053 238-.140540834702391446838117693433
191-6, -.105104235265676462511502380140 239-.122784560902904591134231136053
192-5, -0.874886635259240052220186694350e-1 240-.105104235265676462511502380140
193-4, -0.699268119435104136669210603231e-1 241-0.874886635259240052220186694350e-1
194-3, -0.524077792830412040388058244741e-1 242-0.699268119435104136669210603231e-1
195-2, -0.349207694917477305004026257737e-1 243-0.524077792830412040388058244741e-1
196-1, -0.174550649282175857651288952197e-1 244-0.349207694917477305004026257737e-1
1970, 0. 245-0.174550649282175857651288952197e-1
1981, 0.174550649282175857651288952197e-1 2460.
1992, 0.349207694917477305004026257737e-1 2470.174550649282175857651288952197e-1
2003, 0.524077792830412040388058244741e-1 2480.349207694917477305004026257737e-1
2014, 0.699268119435104136669210603231e-1 2490.524077792830412040388058244741e-1
2025, 0.874886635259240052220186694350e-1 2500.699268119435104136669210603231e-1
2036, .105104235265676462511502380140 2510.874886635259240052220186694350e-1
2047, .122784560902904591134231136053 252.105104235265676462511502380140
2058, .140540834702391446838117693433 253.122784560902904591134231136053
2069, .158384440324536293838883092694 254.140540834702391446838117693433
20710, .176326980708464973471090386869 255.158384440324536293838883092694
20811, .194380309137718484243194224977 256.176326980708464973471090386869
20912, .212556561670022125259591660570 257.194380309137718484243194224977
21013, .230868191125563111748145613474 258.212556561670022125259591660570
21114, .249328002843180691624039937805 259.230868191125563111748145613474
21215, .267949192431122706472553658494 260.249328002843180691624039937805
21316, .286745385758807940042758062732 261.267949192431122706472553658494
21417, .305730681458660355734541958996 262.286745385758807940042758062732
21518, .324919696232906326155871412215 263.305730681458660355734541958996
21619, .344327613289665241957265839384 264.324919696232906326155871412215
21720, .363970234266202361351047882776 265.344327613289665241957265839384
21821, .383864035035415795971448408105 266.363970234266202361351047882776
21922, .404026225835156811322348143579 267.383864035035415795971448408105
22023, .424474816209604742023532062943 268.404026225835156811322348143579
22124, .445228685308536163922367030644 269.424474816209604742023532062943
22225, .466307658154998592830006194801 270.445228685308536163922367030644
22326, .487732588565861422773111126616 271.466307658154998592830006194801
22427, .509525449494428810513706911251 272.487732588565861422773111126616
22528, .531709431661478748075915871842 273.509525449494428810513706911251
22629, .554309051452768917820763092337 274.531709431661478748075915871842
22730, .577350269189625764509148780503 275.554309051452768917820763092337
22831, .600860619027560414878664426354 276.577350269189625764509148780503
22932, .624869351909327509780510827950 277.600860619027560414878664426354
23033, .649407593197510576982062911310 278.624869351909327509780510827950
23134, .674508516842426632142460861996 279.649407593197510576982062911310
23235, .700207538209709779458522719443 280.674508516842426632142460861996
23336, .726542528005360885895466757481 281.700207538209709779458522719443
23437, .753554050102794157073956448623 282.726542528005360885895466757481
23538, .781285626506717397062949971961 283.753554050102794157073956448623
23639, .809784033195007148036991374238 284.781285626506717397062949971961
23740, .839099631177280011763127298122 285.809784033195007148036991374238
23841, .869286737816226662200095638705 286.839099631177280011763127298122
23942, .900404044297839945120477203883 287.869286737816226662200095638705
24043, .932515086137661705612185627428 288.900404044297839945120477203883
24144, .965688774807074045958027299699 289.932515086137661705612185627428
24245, 1. 290.965688774807074045958027299699
24346, 1.03553031379056950695883255125 2911.
24447, 1.07236871002468253294602774807 2921.03553031379056950695883255125
24548, 1.11061251482919287014348196417 2931.07236871002468253294602774807
24649, 1.15036840722100955587633102557 2941.11061251482919287014348196417
24750, 1.19175359259420995870530807186 2951.15036840722100955587633102557
24851, 1.23489715653505139855617469537 2961.19175359259420995870530807186
24952, 1.27994163219307878031102984757 2971.23489715653505139855617469537
25053, 1.32704482162041003715947257408 2981.27994163219307878031102984757
25154, 1.37638192047117353820720958191 2991.32704482162041003715947257408
25255, 1.42814800674211450216061848500 3001.37638192047117353820720958191
25356, 1.48256096851274025478715714915 3011.42814800674211450216061848500
25457, 1.53986496381458290482679697261 3021.48256096851274025478715714915
25558, 1.60033452904105035532673308117 3031.53986496381458290482679697261
25659, 1.66427948235051791103049617004 3041.60033452904105035532673308117
25760, 1.73205080756887729352744634151 3051.66427948235051791103049617004
25861, 1.80404775527142393738178474825 3061.73205080756887729352744634151
25962, 1.88072646534633201236083759582 3071.80404775527142393738178474825
26063, 1.96261050550515058230464042622 3081.88072646534633201236083759582
26164, 2.05030384157929621689901107053 3091.96261050550515058230464042622
26265, 2.14450692050955861635626079106 3102.05030384157929621689901107053
26366, 2.24603677390421605416332143840 3112.14450692050955861635626079106
26467, 2.35585236582375283393958666236 3122.24603677390421605416332143840
26568, 2.47508685341629582524001324606 3132.35585236582375283393958666236
26669, 2.60508906469380153625841233646 3142.47508685341629582524001324606
26770, 2.74747741945462227876166402648 3152.60508906469380153625841233646
26871, 2.90421087767582280257932553456 3162.74747741945462227876166402648
26972, 3.07768353717525340257029057602 3172.90421087767582280257932553456
27073, 3.27085261848414086530885625734 3183.07768353717525340257029057602
27174, 3.48741444384090865069622422508 3193.27085261848414086530885625734
27275, 3.73205080756887729352744634156 3203.48741444384090865069622422508
27376, 4.01078093353584471634571512944 3213.73205080756887729352744634156
27477, 4.33147587428415554554616775463 3224.01078093353584471634571512944
27578, 4.70463010947845423358623453738 3234.33147587428415554554616775463
27679, 5.14455401597031013472322071724 3244.70463010947845423358623453738
27780, 5.67128181961770953099441843983 3255.14455401597031013472322071724
27881, 6.31375151467504309897946424494 3265.67128181961770953099441843983
27982, 7.11536972238420874823056614360 3276.31375151467504309897946424494
28083, 8.14434642797459402382566139528 3287.11536972238420874823056614360
28184, 9.51436445422258492968397145491 3298.14434642797459402382566139528
28285, 11.4300523027613430672108555485 3309.51436445422258492968397145491
28386, 14.3006662567119279101280533475 33111.4300523027613430672108555485
28487, 19.0811366877282110634067487325 33214.3006662567119279101280533475
28588, 28.6362532829156035507565093210 33319.0811366877282110634067487325
28689, 57.2899616307594246872781475211 33428.6362532829156035507565093210
28791, -57.2899616307594246872781475211 33557.2899616307594246872781475211
28892, -28.6362532829156035507565093210 336-57.2899616307594246872781475211
28993, -19.0811366877282110634067487325 337-28.6362532829156035507565093210
29094, -14.3006662567119279101280533475 338-19.0811366877282110634067487325
29195, -11.4300523027613430672108555485 339-14.3006662567119279101280533475
29296, -9.51436445422258492968397145491 340-11.4300523027613430672108555485
29397, -8.14434642797459402382566139528 341-9.51436445422258492968397145491
29498, -7.11536972238420874823056614360 342-8.14434642797459402382566139528
29599, -6.31375151467504309897946424494 343-7.11536972238420874823056614360
296100, -5.67128181961770953099441843983 344-6.31375151467504309897946424494
297101, -5.14455401597031013472322071724 345-5.67128181961770953099441843983
298102, -4.70463010947845423358623453738 346-5.14455401597031013472322071724
299103, -4.33147587428415554554616775463 347-4.70463010947845423358623453738
300104, -4.01078093353584471634571512944 348-4.33147587428415554554616775463
301105, -3.73205080756887729352744634156 349-4.01078093353584471634571512944
302106, -3.48741444384090865069622422508 350-3.73205080756887729352744634156
303107, -3.27085261848414086530885625734 351-3.48741444384090865069622422508
304108, -3.07768353717525340257029057602 352-3.27085261848414086530885625734
305109, -2.90421087767582280257932553456 353-3.07768353717525340257029057602
306110, -2.74747741945462227876166402648 354-2.90421087767582280257932553456
307111, -2.60508906469380153625841233646 355-2.74747741945462227876166402648
308112, -2.47508685341629582524001324606 356-2.60508906469380153625841233646
309113, -2.35585236582375283393958666236 357-2.47508685341629582524001324606
310114, -2.24603677390421605416332143840 358-2.35585236582375283393958666236
311115, -2.14450692050955861635626079106 359-2.24603677390421605416332143840
312116, -2.05030384157929621689901107053 360-2.14450692050955861635626079106
313117, -1.96261050550515058230464042622 361-2.05030384157929621689901107053
314118, -1.88072646534633201236083759582 362-1.96261050550515058230464042622
315119, -1.80404775527142393738178474825 363-1.88072646534633201236083759582
316120, -1.73205080756887729352744634151 364-1.80404775527142393738178474825
317121, -1.66427948235051791103049617004 365-1.73205080756887729352744634151
318122, -1.60033452904105035532673308117 366-1.66427948235051791103049617004
319123, -1.53986496381458290482679697261 367-1.60033452904105035532673308117
320124, -1.48256096851274025478715714915 368-1.53986496381458290482679697261
321125, -1.42814800674211450216061848500 369-1.48256096851274025478715714915
322126, -1.37638192047117353820720958191 370-1.42814800674211450216061848500
323127, -1.32704482162041003715947257408 371-1.37638192047117353820720958191
324128, -1.27994163219307878031102984757 372-1.32704482162041003715947257408
325129, -1.23489715653505139855617469537 373-1.27994163219307878031102984757
326130, -1.19175359259420995870530807186 374-1.23489715653505139855617469537
327131, -1.15036840722100955587633102557 375-1.19175359259420995870530807186
328132, -1.11061251482919287014348196417 376-1.15036840722100955587633102557
329133, -1.07236871002468253294602774807 377-1.11061251482919287014348196417
330134, -1.03553031379056950695883255125 378-1.07236871002468253294602774807
331135, -1. 379-1.03553031379056950695883255125
332136, -.965688774807074045958027299699 380-1.
333137, -.932515086137661705612185627428 381-.965688774807074045958027299699
334138, -.900404044297839945120477203883 382-.932515086137661705612185627428
335139, -.869286737816226662200095638705 383-.900404044297839945120477203883
336140, -.839099631177280011763127298122 384-.869286737816226662200095638705
337141, -.809784033195007148036991374238 385-.839099631177280011763127298122
338142, -.781285626506717397062949971961 386-.809784033195007148036991374238
339143, -.753554050102794157073956448623 387-.781285626506717397062949971961
340144, -.726542528005360885895466757481 388-.753554050102794157073956448623
341145, -.700207538209709779458522719443 389-.726542528005360885895466757481
342146, -.674508516842426632142460861996 390-.700207538209709779458522719443
343147, -.649407593197510576982062911310 391-.674508516842426632142460861996
344148, -.624869351909327509780510827950 392-.649407593197510576982062911310
345149, -.600860619027560414878664426354 393-.624869351909327509780510827950
346150, -.577350269189625764509148780503 394-.600860619027560414878664426354
347151, -.554309051452768917820763092337 395-.577350269189625764509148780503
348152, -.531709431661478748075915871842 396-.554309051452768917820763092337
349153, -.509525449494428810513706911251 397-.531709431661478748075915871842
350154, -.487732588565861422773111126616 398-.509525449494428810513706911251
351155, -.466307658154998592830006194801 399-.487732588565861422773111126616
352156, -.445228685308536163922367030644 400-.466307658154998592830006194801
353157, -.424474816209604742023532062943 401-.445228685308536163922367030644
354158, -.404026225835156811322348143579 402-.424474816209604742023532062943
355159, -.383864035035415795971448408105 403-.404026225835156811322348143579
356160, -.363970234266202361351047882776 404-.383864035035415795971448408105
357161, -.344327613289665241957265839384 405-.363970234266202361351047882776
358162, -.324919696232906326155871412215 406-.344327613289665241957265839384
359163, -.305730681458660355734541958996 407-.324919696232906326155871412215
360164, -.286745385758807940042758062732 408-.305730681458660355734541958996
361165, -.267949192431122706472553658494 409-.286745385758807940042758062732
362166, -.249328002843180691624039937805 410-.267949192431122706472553658494
363167, -.230868191125563111748145613474 411-.249328002843180691624039937805
364168, -.212556561670022125259591660570 412-.230868191125563111748145613474
365169, -.194380309137718484243194224977 413-.212556561670022125259591660570
366170, -.176326980708464973471090386869 414-.194380309137718484243194224977
367171, -.158384440324536293838883092694 415-.176326980708464973471090386869
368172, -.140540834702391446838117693433 416-.158384440324536293838883092694
369173, -.122784560902904591134231136053 417-.140540834702391446838117693433
370174, -.105104235265676462511502380140 418-.122784560902904591134231136053
371175, -0.874886635259240052220186694350e-1 419-.105104235265676462511502380140
372176, -0.699268119435104136669210603231e-1 420-0.874886635259240052220186694350e-1
373177, -0.524077792830412040388058244741e-1 421-0.699268119435104136669210603231e-1
374178, -0.349207694917477305004026257737e-1 422-0.524077792830412040388058244741e-1
375179, -0.174550649282175857651288952197e-1 423-0.349207694917477305004026257737e-1
376180, 0. 424-0.174550649282175857651288952197e-1
4250.
377]; 426];
427c = tand(x);
428assert_close ( c , e , 40 * %eps );
429
430// Turn a lot around the circle
431x1 = x + 2^6*360;
432c = tand(x1);
433assert_close ( c , e , 40 * %eps );
434// Turn a lot around the circle, the other side
435x2 = x - 2^6*360;
436c = tand(x2);
437assert_close ( c , e , 40 * %eps );
438
439assert_equal ( tand(0) , 0 );
440assert_equal ( tand(360) , 0 );
441assert_equal ( tand(-360) , 0 );
442
443assert_equal ( tand(180) , 0 );
444assert_equal ( tand(-180) , 0 );
445
446assert_close ( tand(30) , 1/sqrt(3) , %eps );
447assert_close ( tand(45) , 1 , 2 * %eps );
448assert_close ( tand(60) , sqrt(3) , 2*%eps );
449
450assert_equal ( isnan(tand(90)) , %t );
451assert_equal ( isnan(tand(-90)) , %t );
452assert_equal ( isnan(tand(270)) , %t );
453assert_equal ( isnan(tand(-270)) , %t );
378 454
379x=ref(:,1);e=max(abs((ref(:,2)-tand(x)))); 455assert_equal ( isnan(tand(-%inf)) , %t );
380if e>40*eps then pause,end 456assert_equal ( isnan(tand(%inf)) , %t );
381x=ref(:,1)+2^6*360; e=max(abs((ref(:,2)-tand(x)))); 457assert_equal ( isnan(tand(%nan)) , %t );
382if e>40*eps then pause,end
383 458
384x=ref(:,1)+2^10*360; e=max(abs((ref(:,2)-tand(x)))); 459assert_equal ( tand([]) , [] );
385if e>40*eps then pause,end
386 460
387if tand(0)<>0 then pause,end 461ieee(0)
388if tand(360)<>0 then pause,end 462assert_equal ( tand(0) , 0 );
389if tand(-360)<>0 then pause,end 463assert_close ( tand(30) , 1/sqrt(3) , %eps );
390if tand(90)<>%inf then pause,end 464assert_close ( tand(45) , 1 , 2 * %eps );
391if tand(-90)<>-%inf then pause,end 465assert_close ( tand(60) , sqrt(3) , 2*%eps );
392if tand(180)<>0 then pause,end
393if tand(-180)<>0 then pause,end
394if tand(270)<>%inf then pause,end
395if tand(-270)<>-%inf then pause,end
396if or(abs(tand([30 45 60])-[1/sqrt(3) 1 sqrt(3) ])>2*%eps) then pause,end
397 466
398if ~isnan(tand(-Inf)) then pause,end
399if ~isnan(tand(Inf)) then pause,end
400if ~isnan(tand(NaN)) then pause,end
401 467
402if tand([])<>[] then pause,end
diff --git a/scilab/modules/fftw/Makefile.in b/scilab/modules/fftw/Makefile.in
index 8a10f5b..232bda6 100644
--- a/scilab/modules/fftw/Makefile.in
+++ b/scilab/modules/fftw/Makefile.in
@@ -261,6 +261,7 @@ LD = @LD@
261LDFLAGS = @LDFLAGS@ 261LDFLAGS = @LDFLAGS@
262LIBICONV = @LIBICONV@ 262LIBICONV = @LIBICONV@
263LIBINTL = @LIBINTL@ 263LIBINTL = @LIBINTL@
264LIBM = @LIBM@
264LIBOBJS = @LIBOBJS@ 265LIBOBJS = @LIBOBJS@
265LIBS = @LIBS@ 266LIBS = @LIBS@
266LIBTOOL = @LIBTOOL@ 267LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/fileio/Makefile.in b/scilab/modules/fileio/Makefile.in
index 350fb23..22ccc9f 100644
--- a/scilab/modules/fileio/Makefile.in
+++ b/scilab/modules/fileio/Makefile.in
@@ -291,6 +291,7 @@ LD = @LD@
291LDFLAGS = @LDFLAGS@ 291LDFLAGS = @LDFLAGS@
292LIBICONV = @LIBICONV@ 292LIBICONV = @LIBICONV@
293LIBINTL = @LIBINTL@ 293LIBINTL = @LIBINTL@
294LIBM = @LIBM@
294LIBOBJS = @LIBOBJS@ 295LIBOBJS = @LIBOBJS@
295LIBS = @LIBS@ 296LIBS = @LIBS@
296LIBTOOL = @LIBTOOL@ 297LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/functions/Makefile.in b/scilab/modules/functions/Makefile.in
index 7291e50..c2f90e6 100644
--- a/scilab/modules/functions/Makefile.in
+++ b/scilab/modules/functions/Makefile.in
@@ -253,6 +253,7 @@ LD = @LD@
253LDFLAGS = @LDFLAGS@ 253LDFLAGS = @LDFLAGS@
254LIBICONV = @LIBICONV@ 254LIBICONV = @LIBICONV@
255LIBINTL = @LIBINTL@ 255LIBINTL = @LIBINTL@
256LIBM = @LIBM@
256LIBOBJS = @LIBOBJS@ 257LIBOBJS = @LIBOBJS@
257LIBS = @LIBS@ 258LIBS = @LIBS@
258LIBTOOL = @LIBTOOL@ 259LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/genetic_algorithms/Makefile.in b/scilab/modules/genetic_algorithms/Makefile.in
index b260fb2..df93152 100644
--- a/scilab/modules/genetic_algorithms/Makefile.in
+++ b/scilab/modules/genetic_algorithms/Makefile.in
@@ -204,6 +204,7 @@ LD = @LD@
204LDFLAGS = @LDFLAGS@ 204LDFLAGS = @LDFLAGS@
205LIBICONV = @LIBICONV@ 205LIBICONV = @LIBICONV@
206LIBINTL = @LIBINTL@ 206LIBINTL = @LIBINTL@
207LIBM = @LIBM@
207LIBOBJS = @LIBOBJS@ 208LIBOBJS = @LIBOBJS@
208LIBS = @LIBS@ 209LIBS = @LIBS@
209LIBTOOL = @LIBTOOL@ 210LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/graphic_export/Makefile.in b/scilab/modules/graphic_export/Makefile.in
index f34ed68..14798e2 100644
--- a/scilab/modules/graphic_export/Makefile.in
+++ b/scilab/modules/graphic_export/Makefile.in
@@ -278,6 +278,7 @@ LD = @LD@
278LDFLAGS = @LDFLAGS@ 278LDFLAGS = @LDFLAGS@
279LIBICONV = @LIBICONV@ 279LIBICONV = @LIBICONV@
280LIBINTL = @LIBINTL@ 280LIBINTL = @LIBINTL@
281LIBM = @LIBM@
281LIBOBJS = @LIBOBJS@ 282LIBOBJS = @LIBOBJS@
282LIBS = @LIBS@ 283LIBS = @LIBS@
283LIBTOOL = @LIBTOOL@ 284LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/graphics/Makefile.in b/scilab/modules/graphics/Makefile.in
index 2474334..ca2e8ec 100644
--- a/scilab/modules/graphics/Makefile.in
+++ b/scilab/modules/graphics/Makefile.in
@@ -613,6 +613,7 @@ LD = @LD@
613LDFLAGS = @LDFLAGS@ 613LDFLAGS = @LDFLAGS@
614LIBICONV = @LIBICONV@ 614LIBICONV = @LIBICONV@
615LIBINTL = @LIBINTL@ 615LIBINTL = @LIBINTL@
616LIBM = @LIBM@
616LIBOBJS = @LIBOBJS@ 617LIBOBJS = @LIBOBJS@
617LIBS = @LIBS@ 618LIBS = @LIBS@
618LIBTOOL = @LIBTOOL@ 619LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/gui/Makefile.in b/scilab/modules/gui/Makefile.in
index ab72ed9..841338b 100644
--- a/scilab/modules/gui/Makefile.in
+++ b/scilab/modules/gui/Makefile.in
@@ -366,6 +366,7 @@ LD = @LD@
366LDFLAGS = @LDFLAGS@ 366LDFLAGS = @LDFLAGS@
367LIBICONV = @LIBICONV@ 367LIBICONV = @LIBICONV@
368LIBINTL = @LIBINTL@ 368LIBINTL = @LIBINTL@
369LIBM = @LIBM@
369LIBOBJS = @LIBOBJS@ 370LIBOBJS = @LIBOBJS@
370LIBS = @LIBS@ 371LIBS = @LIBS@
371LIBTOOL = @LIBTOOL@ 372LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/hdf5/Makefile.in b/scilab/modules/hdf5/Makefile.in
index babbf34..6e4cfc0 100644
--- a/scilab/modules/hdf5/Makefile.in
+++ b/scilab/modules/hdf5/Makefile.in
@@ -292,6 +292,7 @@ LD = @LD@
292LDFLAGS = @LDFLAGS@ 292LDFLAGS = @LDFLAGS@
293LIBICONV = @LIBICONV@ 293LIBICONV = @LIBICONV@
294LIBINTL = @LIBINTL@ 294LIBINTL = @LIBINTL@
295LIBM = @LIBM@
295LIBOBJS = @LIBOBJS@ 296LIBOBJS = @LIBOBJS@
296LIBS = @LIBS@ 297LIBS = @LIBS@
297LIBTOOL = @LIBTOOL@ 298LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/helptools/Makefile.in b/scilab/modules/helptools/Makefile.in
index dfda34d..2e80b76 100644
--- a/scilab/modules/helptools/Makefile.in
+++ b/scilab/modules/helptools/Makefile.in
@@ -266,6 +266,7 @@ LD = @LD@
266LDFLAGS = @LDFLAGS@ 266LDFLAGS = @LDFLAGS@
267LIBICONV = @LIBICONV@ 267LIBICONV = @LIBICONV@
268LIBINTL = @LIBINTL@ 268LIBINTL = @LIBINTL@
269LIBM = @LIBM@
269LIBOBJS = @LIBOBJS@ 270LIBOBJS = @LIBOBJS@
270LIBS = @LIBS@ 271LIBS = @LIBS@
271LIBTOOL = @LIBTOOL@ 272LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/history_manager/Makefile.in b/scilab/modules/history_manager/Makefile.in
index 97856f4..b581876 100644
--- a/scilab/modules/history_manager/Makefile.in
+++ b/scilab/modules/history_manager/Makefile.in
@@ -289,6 +289,7 @@ LD = @LD@
289LDFLAGS = @LDFLAGS@ 289LDFLAGS = @LDFLAGS@
290LIBICONV = @LIBICONV@ 290LIBICONV = @LIBICONV@
291LIBINTL = @LIBINTL@ 291LIBINTL = @LIBINTL@
292LIBM = @LIBM@
292LIBOBJS = @LIBOBJS@ 293LIBOBJS = @LIBOBJS@
293LIBS = @LIBS@ 294LIBS = @LIBS@
294LIBTOOL = @LIBTOOL@ 295LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/integer/Makefile.in b/scilab/modules/integer/Makefile.in
index 21e59bd..d05cb05 100644
--- a/scilab/modules/integer/Makefile.in
+++ b/scilab/modules/integer/Makefile.in
@@ -277,6 +277,7 @@ LD = @LD@
277LDFLAGS = @LDFLAGS@ 277LDFLAGS = @LDFLAGS@
278LIBICONV = @LIBICONV@ 278LIBICONV = @LIBICONV@
279LIBINTL = @LIBINTL@ 279LIBINTL = @LIBINTL@
280LIBM = @LIBM@
280LIBOBJS = @LIBOBJS@ 281LIBOBJS = @LIBOBJS@
281LIBS = @LIBS@ 282LIBS = @LIBS@
282LIBTOOL = @LIBTOOL@ 283LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/interpolation/Makefile.in b/scilab/modules/interpolation/Makefile.in
index b2113fb..4f8aadf 100644
--- a/scilab/modules/interpolation/Makefile.in
+++ b/scilab/modules/interpolation/Makefile.in
@@ -259,6 +259,7 @@ LD = @LD@
259LDFLAGS = @LDFLAGS@